diff --git a/src/lib/layout/wizard.svelte b/src/lib/layout/wizard.svelte index 56bc565d6..283a0aafc 100644 --- a/src/lib/layout/wizard.svelte +++ b/src/lib/layout/wizard.svelte @@ -62,6 +62,7 @@ async function submit() { if ($wizard.interceptor) { + $wizard.nextDisabled = true; try { await $wizard.interceptor(); } catch (error) { @@ -71,18 +72,15 @@ type: 'error' }); return; + } finally { + $wizard.nextDisabled = false; } } wizard.setInterceptor(null); if (isLastStep) { - $wizard.nextDisabled = true; trackEvent('wizard_finish'); dispatch('finish'); - //Reactivate button in case there are errors - setTimeout(() => { - $wizard.nextDisabled = false; - }, 2000); } else { if (steps.get($wizard.step + 1)?.disabled) { $wizard.step++; diff --git a/src/routes/console/changeOrganizationTierCloud.svelte b/src/routes/console/changeOrganizationTierCloud.svelte index 7b6fd9a2c..e0321dcbd 100644 --- a/src/routes/console/changeOrganizationTierCloud.svelte +++ b/src/routes/console/changeOrganizationTierCloud.svelte @@ -33,6 +33,8 @@ } async function changeTier() { + $wizard.nextDisabled = true; + //Downgrade if ($changeOrganizationTier.billingPlan === 'tier-0') { try { await sdk.forConsole.billing.updatePlan( @@ -70,6 +72,8 @@ e, $isUpgrade ? Submit.OrganizationUpgrade : Submit.OrganizationDowngrade ); + } finally { + $wizard.nextDisabled = false; } } else { try { @@ -174,6 +178,8 @@ e, $isUpgrade ? Submit.OrganizationUpgrade : Submit.OrganizationDowngrade ); + } finally { + $wizard.nextDisabled = false; } } } diff --git a/src/routes/console/createOrganizationCloud.svelte b/src/routes/console/createOrganizationCloud.svelte index 4163c54b9..b2b9b2cee 100644 --- a/src/routes/console/createOrganizationCloud.svelte +++ b/src/routes/console/createOrganizationCloud.svelte @@ -1,7 +1,7 @@