diff options
author | 2019-08-05 19:06:51 +0700 | |
---|---|---|
committer | 2019-08-05 19:06:51 +0700 | |
commit | 19ff9d112fda59d114df1079622a3d365a51c14a (patch) | |
tree | 90e3e09e051a96a78ec80cd34363a062eac089a3 /src/features/delayApp/index.js | |
parent | Mention releases in README (diff) | |
parent | bump version to 5.2.1-beta.1 (diff) | |
download | ferdium-app-19ff9d112fda59d114df1079622a3d365a51c14a.tar.gz ferdium-app-19ff9d112fda59d114df1079622a3d365a51c14a.tar.zst ferdium-app-19ff9d112fda59d114df1079622a3d365a51c14a.zip |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/components/layout/AppLayout.js
Diffstat (limited to 'src/features/delayApp/index.js')
-rw-r--r-- | src/features/delayApp/index.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js index 67f0fc5e6..39fae3b20 100644 --- a/src/features/delayApp/index.js +++ b/src/features/delayApp/index.js | |||
@@ -33,7 +33,7 @@ export default function init(stores) { | |||
33 | }; | 33 | }; |
34 | 34 | ||
35 | reaction( | 35 | reaction( |
36 | () => stores.user.isLoggedIn && stores.features.features.needToWaitToProceed && !stores.user.data.isPremium, | 36 | () => stores.user.isLoggedIn && stores.services.allServicesRequest.wasExecuted && stores.features.features.needToWaitToProceed && !stores.user.data.isPremium, |
37 | (isEnabled) => { | 37 | (isEnabled) => { |
38 | if (isEnabled) { | 38 | if (isEnabled) { |
39 | debug('Enabling `delayApp` feature'); | 39 | debug('Enabling `delayApp` feature'); |
@@ -45,6 +45,7 @@ export default function init(stores) { | |||
45 | 45 | ||
46 | autorun(() => { | 46 | autorun(() => { |
47 | if (stores.services.all.length === 0) { | 47 | if (stores.services.all.length === 0) { |
48 | debug('seas', stores.services.all.length); | ||
48 | shownAfterLaunch = true; | 49 | shownAfterLaunch = true; |
49 | return; | 50 | return; |
50 | } | 51 | } |
@@ -64,7 +65,7 @@ export default function init(stores) { | |||
64 | debug('Resetting app delay'); | 65 | debug('Resetting app delay'); |
65 | 66 | ||
66 | setVisibility(false); | 67 | setVisibility(false); |
67 | }, DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait + 1000); // timer needs to be able to hit 0 | 68 | }, config.delayDuration + 1000); // timer needs to be able to hit 0 |
68 | } | 69 | } |
69 | }); | 70 | }); |
70 | } else { | 71 | } else { |