From 4034cdd398f5c6e6ca7a0335a9264c3d95ba9261 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Mon, 20 Sep 2021 13:24:16 +0200 Subject: [PATCH] feat: wizard organization step depends on organization ready. --- client/src/containers/Setup/SetupRightSection.js | 4 ++-- client/src/store/organizations/withSetupWizard.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/containers/Setup/SetupRightSection.js b/client/src/containers/Setup/SetupRightSection.js index ec873205c..fdb169f46 100644 --- a/client/src/containers/Setup/SetupRightSection.js +++ b/client/src/containers/Setup/SetupRightSection.js @@ -44,13 +44,13 @@ export default compose( withOrganization( ({ organization, - isOrganizationInitialized, + isOrganizationReady, isOrganizationSeeded, isOrganizationSetupCompleted, isOrganizationBuildRunning, }) => ({ organization, - isOrganizationInitialized, + isOrganizationReady, isOrganizationSeeded, isOrganizationSetupCompleted, isOrganizationBuildRunning, diff --git a/client/src/store/organizations/withSetupWizard.js b/client/src/store/organizations/withSetupWizard.js index 203a200f7..fba1ec4e7 100644 --- a/client/src/store/organizations/withSetupWizard.js +++ b/client/src/store/organizations/withSetupWizard.js @@ -4,7 +4,7 @@ export default (mapState) => { const mapStateToProps = (state, props) => { const { isOrganizationSetupCompleted, - isOrganizationInitialized, + isOrganizationReady, isSubscriptionActive, isOrganizationBuildRunning } = props; @@ -13,7 +13,7 @@ export default (mapState) => { isCongratsStep: isOrganizationSetupCompleted, isSubscriptionStep: !isSubscriptionActive, isInitializingStep: isOrganizationBuildRunning, - isOrganizationStep: !isOrganizationInitialized && !isOrganizationBuildRunning, + isOrganizationStep: !isOrganizationReady && !isOrganizationBuildRunning, }; const scenarios = [ { condition: condits.isSubscriptionStep, step: 'subscription' },