fix: sign out and close all tabs on create wallet, closes #4517

leather-io · Nov 22, 2023 · 0b47dea · 0b47dea
1 parent 0742719
commit 0b47dea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/app/pages/onboarding/welcome/welcome.layout.tsx b/src/app/pages/onboarding/welcome/welcome.layout.tsx
@@ -14,16 +14,14 @@ interface WelcomeLayoutProps {
   onStartOnboarding(): void;
   onRestoreWallet(): void;
 }
-export function WelcomeLayout(props: WelcomeLayoutProps): React.JSX.Element {
-  const {
-    tagline,
-    subheader,
-    isGeneratingWallet,
-    onStartOnboarding,
-    onSelectConnectLedger,
-    onRestoreWallet,
-  } = props;
-
+export function WelcomeLayout({
+  tagline,
+  subheader,
+  isGeneratingWallet,
+  onStartOnboarding,
+  onSelectConnectLedger,
+  onRestoreWallet,
+}: WelcomeLayoutProps): React.JSX.Element {
   const isAtleastBreakpointMd = useViewportMinWidth('md');
 
   return (

diff --git a/src/app/pages/onboarding/welcome/welcome.tsx b/src/app/pages/onboarding/welcome/welcome.tsx
@@ -24,14 +24,15 @@ export function WelcomePage() {
   const [isGeneratingWallet, setIsGeneratingWallet] = useState(false);
 
   useRouteHeader(<></>);
-
   const startOnboarding = useCallback(async () => {
     if (isPopupMode()) {
       openIndexPageInNewTab(RouteUrls.Onboarding);
       closeWindow();
       return;
     }
     setIsGeneratingWallet(true);
+    // #4517 signout other tabs on wallet create
+    await keyActions.signOut();
     keyActions.generateWalletKey();
     void analytics.track('generate_new_secret_key');
     if (decodedAuthRequest) {