diff options
author | 2019-10-24 15:15:42 +0200 | |
---|---|---|
committer | 2019-10-24 15:15:42 +0200 | |
commit | 54f8b191a94bd78a85b046bbf21dd2245d3a6f3e (patch) | |
tree | ada5876f0e8a697ba4693bba07f5e0f31fea1fc9 /src/features/delayApp | |
parent | Update submodules (diff) | |
parent | bump version to 5.4.0 (diff) | |
download | ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.gz ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.zst ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.zip |
Merge https://github.com/meetfranz/franz into franz-5.4.0-release
Diffstat (limited to 'src/features/delayApp')
-rw-r--r-- | src/features/delayApp/Component.js | 2 | ||||
-rw-r--r-- | src/features/delayApp/index.js | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js index c61cb06c9..81f89bc52 100644 --- a/src/features/delayApp/Component.js +++ b/src/features/delayApp/Component.js | |||
@@ -21,7 +21,7 @@ const messages = defineMessages({ | |||
21 | }, | 21 | }, |
22 | action: { | 22 | action: { |
23 | id: 'feature.delayApp.upgrade.action', | 23 | id: 'feature.delayApp.upgrade.action', |
24 | defaultMessage: '!!!Get a Franz Supporter License', | 24 | defaultMessage: '!!!Upgrade Franz', |
25 | }, | 25 | }, |
26 | actionTrial: { | 26 | actionTrial: { |
27 | id: 'feature.delayApp.trial.action', | 27 | id: 'feature.delayApp.trial.action', |
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js index 5cc6c9506..51bd887a2 100644 --- a/src/features/delayApp/index.js +++ b/src/features/delayApp/index.js | |||
@@ -3,6 +3,7 @@ import moment from 'moment'; | |||
3 | import DelayAppComponent from './Component'; | 3 | import DelayAppComponent from './Component'; |
4 | 4 | ||
5 | import { DEFAULT_FEATURES_CONFIG } from '../../config'; | 5 | import { DEFAULT_FEATURES_CONFIG } from '../../config'; |
6 | import { getUserWorkspacesRequest } from '../workspaces/api'; | ||
6 | 7 | ||
7 | const debug = require('debug')('Ferdi:feature:delayApp'); | 8 | const debug = require('debug')('Ferdi:feature:delayApp'); |
8 | 9 | ||
@@ -32,7 +33,13 @@ export default function init(stores) { | |||
32 | }; | 33 | }; |
33 | 34 | ||
34 | reaction( | 35 | reaction( |
35 | () => stores.user.isLoggedIn && stores.services.allServicesRequest.wasExecuted && stores.features.features.needToWaitToProceed && !stores.user.data.isPremium, | 36 | () => ( |
37 | stores.user.isLoggedIn | ||
38 | && stores.services.allServicesRequest.wasExecuted | ||
39 | && getUserWorkspacesRequest.wasExecuted | ||
40 | && stores.features.features.needToWaitToProceed | ||
41 | && !stores.user.data.isPremium | ||
42 | ), | ||
36 | (isEnabled) => { | 43 | (isEnabled) => { |
37 | if (isEnabled) { | 44 | if (isEnabled) { |
38 | debug('Enabling `delayApp` feature'); | 45 | debug('Enabling `delayApp` feature'); |