Skip to content

Fix initial wizard always redirecting to vpn overview #2358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-aleksander merged 1 commit into from
Mar 16, 2026
Merged

Fix initial wizard always redirecting to vpn overview #2358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions web/src/pages/SetupPage/initial/SetupPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,13 @@ export const SetupPage = () => {
[],
);

const isFinishing = useSetupWizardStore((s) => s.isFinishing);

useEffect(() => {
if (sessionInfo?.active_wizard === null) {
if (!isFinishing && sessionInfo?.active_wizard === null) {
navigate({ to: '/vpn-overview', replace: true });
}
}, [navigate, sessionInfo?.active_wizard]);
}, [isFinishing, navigate, sessionInfo?.active_wizard]);

return (
<WizardPage
Expand Down
4 changes: 4 additions & 0 deletions web/src/pages/SetupPage/initial/steps/SetupConfirmationStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const SetupConfirmationStep = () => {
const handleFinish = async () => {
try {
setIsSubmitting(true);
useSetupWizardStore.setState({ isFinishing: true });
await finishSetup();
await waitForSettingsEssentials({});
await navigate({ to: '/add-location', replace: true });
Expand All @@ -57,6 +58,7 @@ export const SetupConfirmationStep = () => {
}, 100);
} catch (error) {
console.error('Failed to finish setup flow:', error);
useSetupWizardStore.setState({ isFinishing: false });
Snackbar.error(m.initial_setup_confirmation_error_finish_failed());
} finally {
setIsSubmitting(false);
Expand All @@ -66,6 +68,7 @@ export const SetupConfirmationStep = () => {
const handleExit = async () => {
try {
setIsSubmitting(true);
useSetupWizardStore.setState({ isFinishing: true });
await finishSetup();
await waitForSettingsEssentials({});
await navigate({ to: '/vpn-overview', replace: true });
Expand All @@ -74,6 +77,7 @@ export const SetupConfirmationStep = () => {
}, 100);
} catch (error) {
console.error('Failed to finish setup flow:', error);
useSetupWizardStore.setState({ isFinishing: false });
Snackbar.error(m.initial_setup_confirmation_error_finish_failed());
} finally {
setIsSubmitting(false);
Expand Down
3 changes: 3 additions & 0 deletions web/src/pages/SetupPage/initial/useSetupWizardStore.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const edgeAdoptionStateDefaults: EdgeAdoptionState = {

type StoreValues = {
isOnWelcomePage: boolean;
isFinishing: boolean;
activeStep: SetupPageStepValue;
// Admin config
admin_first_name: string;
Expand Down Expand Up @@ -51,6 +52,7 @@ type StoreMethods = {

const defaults: StoreValues = {
isOnWelcomePage: true,
isFinishing: false,
activeStep: SetupPageStep.AdminUser,
// Admin config
admin_first_name: '',
Expand Down Expand Up @@ -108,6 +110,7 @@ export const useSetupWizardStore = create<StoreMethods & StoreValues>()(
storage: createJSONStorage(() => sessionStorage),
partialize: (state) =>
omit(state, [
'isFinishing',
'reset',
'start',
'setActiveStep',
Expand Down
Loading