Merge pull request #18323 from mozilla/inactive-active-banner-fix

LZoog · web-flow · commit a9317749165f · 2025-02-05T14:55:49.000-06:00
fix(inactives): Don't hard navigate when redirectTo is 'settings'
diff --git a/packages/fxa-settings/src/pages/Signin/utils.ts b/packages/fxa-settings/src/pages/Signin/utils.ts
@@ -249,7 +249,9 @@ const getNonOAuthNavigationTarget = async (
       ),
     };
   }
-  if (redirectTo) {
+  // We don't want a hard navigate to `/settings` as it
+  // clears out the initially created integration.
+  if (redirectTo && redirectTo !== '/settings') {
     return { to: redirectTo, shouldHardNavigate: true };
   }
   return { to: '/settings' };

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,9 @@ const getNonOAuthNavigationTarget = async (`
`249`	`249`	`),`
`250`	`250`	`};`
`251`	`251`	`}`
`252`		`- if (redirectTo) {`
	`252`	+ // We don't want a hard navigate to `/settings` as it
	`253`	`+ // clears out the initially created integration.`
	`254`	`+ if (redirectTo && redirectTo !== '/settings') {`
`253`	`255`	`return { to: redirectTo, shouldHardNavigate: true };`
`254`	`256`	`}`
`255`	`257`	`return { to: '/settings' };`