fix:bugfix for create wallet with lock (#10651)

* fix: bugfix for create wallet when is locked * refactor: await --------- Co-authored-by: guanbinrui <52657989+guanbinrui@users.noreply.github.com>
DimensionDev · Aug 28, 2023 · 5ac3c42 · 5ac3c42
1 parent f08ef67
commit 5ac3c42
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/packages/dashboard/src/pages/CreateMaskWallet/CreateMnemonic/index.tsx b/packages/dashboard/src/pages/CreateMaskWallet/CreateMnemonic/index.tsx
@@ -196,8 +196,8 @@ const CreateMnemonic = memo(function CreateMnemonic() {
     }, [words.join(' '), walletName, hasPassword])
 
     const [{ loading }, onSubmit] = useAsyncFn(async () => {
-        await handlePasswordAndWallets(location.state?.password, location.state?.isReset)
-
+        const result = await handlePasswordAndWallets(location.state?.password, location.state?.isReset)
+        if (!result) return
         const address = await WalletServiceRef.value.createWalletFromMnemonicWords(walletName, words.join(' '))
         await WalletServiceRef.value.resolveMaskAccount([
             {

diff --git a/packages/dashboard/src/pages/CreateMaskWallet/context.ts b/packages/dashboard/src/pages/CreateMaskWallet/context.ts
@@ -1,10 +1,11 @@
 import { useCallback } from 'react'
 import { createContainer } from 'unstated-next'
 import { useWallets } from '@masknet/web3-hooks-base'
-import { getDefaultWalletPassword, CrossIsolationMessages } from '@masknet/shared-base'
+import { getDefaultWalletPassword, CrossIsolationMessages, PopupRoutes } from '@masknet/shared-base'
 import { Web3 } from '@masknet/web3-providers'
 import { ProviderType } from '@masknet/web3-shared-evm'
 import { WalletServiceRef } from '@masknet/plugin-infra/dom'
+import { Services } from '../../API.js'
 
 function useContext() {
     const wallets = useWallets()
@@ -24,13 +25,20 @@ function useContext() {
     const handlePasswordAndWallets = useCallback(
         async (password: string | undefined, isReset: boolean | undefined) => {
             const hasPassword = await WalletServiceRef.value.hasPassword()
+
             if (!hasPassword) await WalletServiceRef.value.setDefaultPassword()
+            const isLocked = await WalletServiceRef.value.isLocked()
 
+            if (hasPassword && isLocked) {
+                await Services.Helper.openPopupWindow(PopupRoutes.Unlock, { toBeClose: true })
+                return false
+            }
             if (isReset) {
                 await resetWallets(password, isReset)
             } else if (password && !hasPassword) {
                 await WalletServiceRef.value.changePassword(getDefaultWalletPassword(), password)
             }
+            return true
         },
         [resetWallets],
     )

diff --git a/packages/mask/src/extension/popups/pages/Wallet/Unlock/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/Unlock/index.tsx
@@ -59,18 +59,23 @@ const Unlock = memo(() => {
 
     const [{ value: verified, loading }, handleUnlock] = useAsyncFn(async () => {
         const from = params.get('from')
-
+        const toBeClose = params.get('toBeClose')
         const verified = await Services.Wallet.unlockWallet(password)
 
-        if (verified)
-            navigate(
-                from
-                    ? urlcat(from, {
-                          tab: from === PopupRoutes.Personas ? PopupHomeTabType.ConnectedWallets : undefined,
-                      })
-                    : PopupRoutes.Wallet,
-                { replace: true },
-            )
+        if (verified) {
+            if (toBeClose) {
+                await Services.Helper.removePopupWindow()
+            } else {
+                navigate(
+                    from
+                        ? urlcat(from, {
+                              tab: from === PopupRoutes.Personas ? PopupHomeTabType.ConnectedWallets : undefined,
+                          })
+                        : PopupRoutes.Wallet,
+                    { replace: true },
+                )
+            }
+        }
         return verified
     }, [password, params])
 

diff --git a/packages/mask/src/initialization/WalletRef.ts b/packages/mask/src/initialization/WalletRef.ts
@@ -19,6 +19,7 @@ WalletServiceRef.value = {
     resetPassword: Services.Wallet.resetPassword,
     resolveMaskAccount: Services.Wallet.resolveMaskAccount,
     setDefaultPassword: Services.Wallet.setDefaultPassword,
+    isLocked: Services.Wallet.isLocked,
     setPassword: Services.Wallet.setPassword,
     verifyPassword: Services.Wallet.verifyPassword,
     exportPrivateKey: Services.Wallet.exportPrivateKey,

diff --git a/packages/plugin-infra/src/dom/useWalletService.ts b/packages/plugin-infra/src/dom/useWalletService.ts
@@ -28,7 +28,7 @@ export interface WalletBackupProvider {
     hasPasswordWithDefaultOne(): Promise<boolean>
     resetPassword(newPassword: string): Promise<void>
     setDefaultPassword(): Promise<void>
-
+    isLocked(): Promise<boolean>
     createMnemonicWords(): Promise<string[]>
     exportMnemonicWords(address: string): Promise<string>
     exportPrivateKey(address: string): Promise<string>