fix(Setup): fix organization setup.

client/src/containers/Setup/SetupRightSection.js

@@ -1,13 +1,9 @@
 import React from 'react';
 
-import { Wizard } from 'react-albus';
-import { useHistory } from 'react-router-dom';
-
-import withSubscriptions from 'containers/Subscriptions/withSubscriptions';
-
 import SetupDialogs from './SetupDialogs';
 import SetupWizardContent from './SetupWizardContent';
 
+import withSubscriptions from 'containers/Subscriptions/withSubscriptions';
 import withOrganization from 'containers/Organization/withOrganization';
 import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
 import withSetupWizard from '../../store/organizations/withSetupWizard';
@@ -24,37 +20,17 @@ function SetupRightSection({
   isOrganizationSetupCompleted,
 
   // #withSetupWizard
-  isCongratsStep,
-  isSubscriptionStep,
-  isInitializingStep,
-  isOrganizationStep,
+  setupStepId,
+  setupStepIndex,
 
   // #withSubscriptions
   isSubscriptionActive,
 }) {
-  const history = useHistory();
-
-  const handleSkip = ({ step, push }) => {
-    const scenarios = [
-      { condition: isCongratsStep, redirectTo: 'congrats' },
-      { condition: isSubscriptionStep, redirectTo: 'subscription' },
-      { condition: isInitializingStep, redirectTo: 'initializing' },
-      { condition: isOrganizationStep, redirectTo: 'organization' },
-    ];
-    const scenario = scenarios.find((scenario) => scenario.condition);
-
-    if (scenario) {
-      push(scenario.redirectTo);
-    }
-  };
-
   return (
     <section className={'setup-page__right-section'}>
-      <Wizard
-        onNext={handleSkip}
-        basename={'/setup'}
-        history={history}
-        render={SetupWizardContent}
+      <SetupWizardContent
+        setupStepId={setupStepId}
+        setupStepIndex={setupStepIndex}
       />
       <SetupDialogs />
     </section>
@@ -84,17 +60,8 @@ export default compose(
     }),
     'main',
   ),
-  withSetupWizard(
-    ({
-      isCongratsStep,
-      isSubscriptionStep,
-      isInitializingStep,
-      isOrganizationStep,
-    }) => ({
-      isCongratsStep,
-      isSubscriptionStep,
-      isInitializingStep,
-      isOrganizationStep,
-    }),
-  ),
+  withSetupWizard(({ setupStepId, setupStepIndex }) => ({
+    setupStepId,
+    setupStepIndex,
+  })),
 )(SetupRightSection);