diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-26 15:38:20 +0100 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-02-26 15:38:20 +0100 |
commit | b5ad31e316c1074cfa6f57f83e262a607eda9d44 (patch) | |
tree | affcfbc28b8892388ab23d97415902edfc682cab /src/features/delayApp/index.js | |
parent | finish basic workspace settings (diff) | |
parent | remove unused packages (diff) | |
download | ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.gz ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.zst ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.zip |
fixes merge conflicts with latest develop
Diffstat (limited to 'src/features/delayApp/index.js')
-rw-r--r-- | src/features/delayApp/index.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js index 48aac34b6..abc8274cf 100644 --- a/src/features/delayApp/index.js +++ b/src/features/delayApp/index.js | |||
@@ -28,8 +28,12 @@ export default function init(stores) { | |||
28 | let shownAfterLaunch = false; | 28 | let shownAfterLaunch = false; |
29 | let timeLastDelay = moment(); | 29 | let timeLastDelay = moment(); |
30 | 30 | ||
31 | window.franz.features.delayApp = { | ||
32 | state, | ||
33 | }; | ||
34 | |||
31 | reaction( | 35 | reaction( |
32 | () => stores.features.features.needToWaitToProceed && !stores.user.data.isPremium, | 36 | () => stores.user.isLoggedIn && stores.features.features.needToWaitToProceed && !stores.user.data.isPremium, |
33 | (isEnabled) => { | 37 | (isEnabled) => { |
34 | if (isEnabled) { | 38 | if (isEnabled) { |
35 | debug('Enabling `delayApp` feature'); | 39 | debug('Enabling `delayApp` feature'); |