AP: Fix the back button on the Fallback Credentials step (#97039)

* Fix the back button for Fallback Credentials step * Remove duplicated back redirect
Automattic · Dec 5, 2024 · 0c61d33 · 0c61d33
1 parent f392ac3
commit 0c61d33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...ow/internals/steps-repository/site-migration-application-password-authorization/index.tsx b/...ow/internals/steps-repository/site-migration-application-password-authorization/index.tsx
@@ -89,7 +89,7 @@ const SiteMigrationApplicationPasswordsAuthorization: Step = function ( { naviga
 		);
 	}
 
-	const sourceDomain = new URL( source ).host;
+	const sourceDomain = new URL( source || '' ).host;
 
 	// translators: %(sourceDomain)s is the source domain that is being migrated.
 	const subHeaderText = translate(

diff --git a/client/landing/stepper/declarative-flow/site-migration-flow.ts b/client/landing/stepper/declarative-flow/site-migration-flow.ts
@@ -649,6 +649,15 @@ const siteMigration: Flow = {
 				}
 
 				case STEPS.SITE_MIGRATION_FALLBACK_CREDENTIALS.slug: {
+					if (
+						urlQueryParams.get( 'backTo' ) ===
+						STEPS.SITE_MIGRATION_APPLICATION_PASSWORD_AUTHORIZATION.slug
+					) {
+						return navigate(
+							`${ STEPS.SITE_MIGRATION_APPLICATION_PASSWORD_AUTHORIZATION.slug }?${ urlQueryParams }`
+						);
+					}
+
 					return navigate( `${ STEPS.SITE_MIGRATION_CREDENTIALS.slug }?${ urlQueryParams }` );
 				}