From 49ca301a382cbd7fe807ebe290c5b518090bf328 Mon Sep 17 00:00:00 2001
From: unclebill <billbill290@gmail.com>
Date: Thu, 2 Nov 2023 18:45:09 +0800
Subject: [PATCH 1/2] fix: mf-5575 show startup if no wallet exists

---
 .../popups/pages/Wallet/WalletGuard/index.tsx          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/mask/src/extension/popups/pages/Wallet/WalletGuard/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/WalletGuard/index.tsx
index 5e0466945d68..c7347c1266fd 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/WalletGuard/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/WalletGuard/index.tsx
@@ -21,6 +21,14 @@ export const WalletGuard = memo(function WalletGuard() {
     const hitPaymentPasswordGuard = usePaymentPasswordGuard()
     const hitMessageGuard = useMessageGuard()
 
+    if (!wallet || !wallets.length) {
+        return (
+            <>
+                <WalletHeader />
+                <WalletStartUp />
+            </>
+        )
+    }
     if (hitPaymentPasswordGuard) {
         params.set('from', location.pathname)
         return <Navigate to={{ pathname: PopupRoutes.SetPaymentPassword, search: params.toString() }} />
@@ -38,7 +46,7 @@ export const WalletGuard = memo(function WalletGuard() {
     return (
         <>
             <WalletHeader />
-            {!wallet || !wallets.length ? <WalletStartUp /> : <Outlet context={outletContext} />}
+            <Outlet context={outletContext} />
         </>
     )
 })

From 989bcc50e749b82d077c2e2e9576e24e3f973794 Mon Sep 17 00:00:00 2001
From: UncleBill <UncleBill@users.noreply.github.com>
Date: Thu, 2 Nov 2023 10:52:52 +0000
Subject: [PATCH 2/2] fix: prettier

---
 packages/mask/.webpack/config.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/mask/.webpack/config.ts b/packages/mask/.webpack/config.ts
index e66319d98120..755182cdc4e5 100644
--- a/packages/mask/.webpack/config.ts
+++ b/packages/mask/.webpack/config.ts
@@ -329,7 +329,6 @@ export async function createConfiguration(_inputFlags: BuildFlags): Promise<webp
     }
 }
 
-
 async function addHTMLEntry(
     options: HTMLPlugin.Options & {
         gun?: boolean