Fix: Added backward navigation in setup wizard registration form

Author: Subhooo5

apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx

@@ -11,6 +11,7 @@ import {
 	useToastMessageDispatch,
 	useAssetWithDarkModePath,
 	useAccountsCustomFields,
+	useRouter, // ✅ ADDED
 } from '@rocket.chat/ui-contexts';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { useEffect, useId } from 'react';
@@ -26,6 +27,7 @@ const RegisterUsername = () => {
 	const t = useTranslation();
 	const uid = useUserId();
 	const logout = useLogout();
+	const router = useRouter(); // ✅ ADDED
 	const formLabelId = useId();
 	const hideLogo = useSetting('Layout_Login_Hide_Logo', false);
 	const customLogo = useAssetWithDarkModePath('logo');
@@ -125,6 +127,9 @@ const RegisterUsername = () => {
 				</Form.Container>
 				<Form.Footer>
 					<ButtonGroup stretch vertical>
+						<Button onClick={() => router.navigate(-1)}> {/* ✅ BACK BUTTON ADDED */}
+							Back
+						</Button>
 						<Button disabled={isLoading} type='submit' primary>
 							{t('Use_this_username')}
 						</Button>

apps/meteor/client/views/root/hooks/useRedirectToSetupWizard.ts

@@ -5,12 +5,16 @@ export const useRedirectToSetupWizard = (): void => {
 	const userId = useUserId();
 	const setupWizardState = useSetting('Show_Setup_Wizard');
 	const router = useRouter();
+
 	const isAdmin = useRole('admin');
 
 	const isWizardInProgress = userId && isAdmin && setupWizardState === 'in_progress';
 	const mustRedirect = (!userId && setupWizardState === 'pending') || isWizardInProgress;
+
 	useEffect(() => {
-		if (mustRedirect) {
+		const currentPath = router.getLocationPathname();
+		//DO NOT Redirect if already inside setup wizard (Fixes navigation)
+		if (mustRedirect && !currentPath?.startsWith('/setup-wizard')) {
 			router.navigate('/setup-wizard');
 		}
 	}, [mustRedirect, router]);