fix: handle duplicated wallet name (#10459)

* fix: handle duplicated wallet name * fix: enable * chore: add test * fix: handle duplicated wallet name * fix: add test * fix: add test * fix: naming * fix: add test * fix: add test * fix: add test * fix: add test * fix: add test * chore: rename * fix: no disconect when own proof change * fix: naming * fix: persona setting link * chore: reply code review
DimensionDev · Aug 18, 2023 · 8ab78c9 · 8ab78c9
1 parent 852632a
commit 8ab78c9
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 51 deletions.
diff --git a/packages/dashboard/src/pages/CreateMaskWallet/AddDeriveWallet/index.tsx b/packages/dashboard/src/pages/CreateMaskWallet/AddDeriveWallet/index.tsx
@@ -6,8 +6,8 @@ import { Box } from '@mui/system'
 import { Typography } from '@mui/material'
 import { makeStyles } from '@masknet/theme'
 import { WalletServiceRef } from '@masknet/plugin-infra/dom'
-import { DashboardRoutes, EMPTY_LIST, generateNewWalletName } from '@masknet/shared-base'
-import { HD_PATH_WITHOUT_INDEX_ETHEREUM, currySameAddress } from '@masknet/web3-shared-base'
+import { DashboardRoutes, EMPTY_LIST } from '@masknet/shared-base'
+import { HD_PATH_WITHOUT_INDEX_ETHEREUM, currySameAddress, generateNewWalletName } from '@masknet/web3-shared-base'
 import { useWallets } from '@masknet/web3-hooks-base'
 import { DeriveWalletTable } from '@masknet/shared'
 import { SetupFrameController } from '../../../components/SetupFrame/index.js'

diff --git a/packages/dashboard/src/pages/CreateMaskWallet/CreateMnemonic/index.tsx b/packages/dashboard/src/pages/CreateMaskWallet/CreateMnemonic/index.tsx
@@ -6,7 +6,8 @@ import { Alert, alpha, Box, Button, Stack, Typography, useTheme } from '@mui/mat
 import { makeStyles } from '@masknet/theme'
 import { Icons } from '@masknet/icons'
 import { CopyButton } from '@masknet/shared'
-import { DashboardRoutes, generateNewWalletName } from '@masknet/shared-base'
+import { DashboardRoutes } from '@masknet/shared-base'
+import { generateNewWalletName } from '@masknet/web3-shared-base'
 import { WalletServiceRef } from '@masknet/plugin-infra/dom'
 import { MnemonicReveal } from '../../../components/Mnemonic/index.js'
 import { PrimaryButton } from '../../../components/PrimaryButton/index.js'

diff --git a/packages/dashboard/src/pages/CreateMaskWallet/Recovery/index.tsx b/packages/dashboard/src/pages/CreateMaskWallet/Recovery/index.tsx
@@ -1,7 +1,8 @@
 import { memo, useCallback, useMemo, useState } from 'react'
 import type { UseFormSetError } from 'react-hook-form'
 import { useLocation, useNavigate } from 'react-router-dom'
-import { DashboardRoutes, generateNewWalletName } from '@masknet/shared-base'
+import { DashboardRoutes } from '@masknet/shared-base'
+import { generateNewWalletName } from '@masknet/web3-shared-base'
 import { MaskTabList, makeStyles, useTabs } from '@masknet/theme'
 import { TabContext, TabPanel } from '@mui/lab'
 import { Tab, Typography } from '@mui/material'

diff --git a/packages/mask/background/services/backup/internal_wallet_restore.ts b/packages/mask/background/services/backup/internal_wallet_restore.ts
@@ -1,15 +1,13 @@
 import { ec as EC } from 'elliptic'
 import { concatArrayBuffer } from '@masknet/kit'
 import type { NormalizedBackup } from '@masknet/backup-format'
-import { currySameAddress, HD_PATH_WITHOUT_INDEX_ETHEREUM } from '@masknet/web3-shared-base'
 import {
-    fromBase64URL,
-    type EC_JsonWebKey,
-    isK256Point,
-    isK256PrivateKey,
+    currySameAddress,
+    HD_PATH_WITHOUT_INDEX_ETHEREUM,
     generateNewWalletName,
-    handleDuplicatedWalletName,
-} from '@masknet/shared-base'
+    generateUniqueWalletName,
+} from '@masknet/web3-shared-base'
+import { fromBase64URL, type EC_JsonWebKey, isK256Point, isK256PrivateKey } from '@masknet/shared-base'
 import {
     getDerivableAccounts,
     getWallets,
@@ -21,7 +19,16 @@ export async function internal_wallet_restore(backup: NormalizedBackup.WalletBac
     for (const wallet of backup) {
         try {
             const wallets = await getWallets()
-            const name = wallet.name ? handleDuplicatedWalletName(wallets, wallet.name) : generateNewWalletName(wallets)
+            const matchedDefaultNameFormat = wallet.name.match(/Wallet (\d+)/)
+            const index = matchedDefaultNameFormat?.[1]
+            const name =
+                wallet.name && !index
+                    ? generateUniqueWalletName(wallets, wallet.name)
+                    : generateNewWalletName(
+                          wallets,
+                          undefined,
+                          index && !Number.isNaN(index) ? Number(index) : undefined,
+                      )
             if (wallet.privateKey.some)
                 await recoverWalletFromPrivateKey(name, await JWKToKey(wallet.privateKey.val, 'private'))
             else if (wallet.mnemonic.some) {

diff --git a/packages/mask/src/extension/popups/components/Navigator/index.tsx b/packages/mask/src/extension/popups/components/Navigator/index.tsx
@@ -10,6 +10,7 @@ import { useMessages, useWallet } from '@masknet/web3-hooks-base'
 import { useHasPassword } from '../../hook/useHasPassword.js'
 import { useWalletLockStatus } from '../../pages/Wallet/hooks/useWalletLockStatus.js'
 import Services from '../../../service.js'
+import { useCurrentPersona } from '../../../../components/DataSource/useCurrentPersona.js'
 
 const useStyle = makeStyles()((theme) => ({
     navigation: {
@@ -57,6 +58,8 @@ export const Navigator = memo(function Navigator({ className, ...rest }: BoxProp
 
     const { hasPassword, loading: hasPasswordLoading } = useHasPassword()
 
+    const currentPersona = useCurrentPersona()
+
     const walletPageLoading = lockStatusLoading || hasPasswordLoading
 
     const walletLink = useMemo(() => {
@@ -72,13 +75,15 @@ export const Navigator = memo(function Navigator({ className, ...rest }: BoxProp
     const onOpenDashboardSettings = useCallback(async () => {
         await browser.tabs.create({
             active: true,
-            url: browser.runtime.getURL(`/dashboard.html#${DashboardRoutes.Settings}`),
+            url: browser.runtime.getURL(
+                `/dashboard.html#${currentPersona ? DashboardRoutes.Settings : DashboardRoutes.SignUpPersona}`,
+            ),
         })
         if (navigator.userAgent.includes('Firefox')) {
             window.close()
         }
         await Services.Helper.removePopupWindow()
-    }, [])
+    }, [currentPersona])
 
     return (
         <Box className={cx(classes.container, className)} {...rest}>

diff --git a/packages/mask/src/extension/popups/pages/Personas/ConnectWallet/index.tsx b/packages/mask/src/extension/popups/pages/Personas/ConnectWallet/index.tsx
@@ -214,7 +214,7 @@ const ConnectWalletPage = memo(function ConnectWalletPage() {
     }, [modalNavigate])
 
     const handleDone = useCallback(async () => {
-        await Web3.disconnect({ providerType })
+        if (providerType !== ProviderType.MaskWallet) await Web3.disconnect({ providerType })
         if (providerType === ProviderType.MaskWallet || providerType === ProviderType.WalletConnect) {
             navigate(-1)
             return

diff --git a/packages/mask/src/extension/popups/pages/Wallet/TransactionDetail/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/TransactionDetail/index.tsx
@@ -161,7 +161,8 @@ export const TransactionDetail = memo(function TransactionDetail() {
     })
 
     const { data: txInput, isLoading: loadingTxInput } = useQuery({
-        enabled: !!transaction && !loadingTx && !tx?.input && transactionState?.type === 'transfer',
+        enabled:
+            !!transaction && !loadingTx && !tx?.input && transactionState?.type === 'transfer' && !candidateState.data,
         queryKey: [transaction?.chainId, transactionId],
         queryFn: async () => {
             if (!chainId || !transactionId) return

diff --git a/packages/mask/src/extension/popups/pages/Wallet/hooks/useSetWalletNameForm.ts b/packages/mask/src/extension/popups/pages/Wallet/hooks/useSetWalletNameForm.ts
@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import { useForm } from 'react-hook-form'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { useContacts, useWallets } from '@masknet/web3-hooks-base'
-import { generateNewWalletName } from '@masknet/shared-base'
+import { generateNewWalletName } from '@masknet/web3-shared-base'
 import { useI18N } from '../../../../../utils/i18n-next-ui.js'
 
 export function useSetWalletNameForm(defaultName?: string) {

diff --git a/packages/shared-base/src/helpers/generateNewWalletName.ts b/packages/shared-base/src/helpers/generateNewWalletName.ts
diff --git a/packages/shared-base/src/helpers/handleDuplicatedWalletName.ts b/packages/shared-base/src/helpers/handleDuplicatedWalletName.ts
diff --git a/packages/shared-base/src/helpers/index.ts b/packages/shared-base/src/helpers/index.ts
@@ -7,11 +7,9 @@ export * from './getLocalImplementation.js'
 export * from './getDefaultWalletPassword.js'
 export * from './markdown.js'
 export * from './mixin.js'
-export * from './handleDuplicatedWalletName.js'
 export * from './personas.js'
 export * from './resolve.js'
 export * from './subscription.js'
-export * from './generateNewWalletName.js'
 export * from './getDomainSystem.js'
 export * from './parseURL.js'
 export * from './purify.js'

diff --git a/packages/web3-shared/base/src/helpers/generateNewWalletName.ts b/packages/web3-shared/base/src/helpers/generateNewWalletName.ts
@@ -0,0 +1,10 @@
+import { max } from 'lodash-es'
+import type { Wallet } from '@masknet/shared-base'
+
+export function generateNewWalletName(wallets: Wallet[], index = 0, preIndex?: number) {
+    const indexList = wallets.filter((x) => !x.owner).map((x) => x.name.split('Wallet ')[1])
+    const maxIndex = max(indexList.filter((x) => x && !Number.isNaN(x)).map(Number)) ?? 0
+    const preIndexNotExists = !indexList.some((x) => Number(x) === preIndex)
+    const finalIndex = preIndex && (preIndex > maxIndex || preIndexNotExists) ? preIndex : maxIndex + index + 1
+    return `Wallet ${finalIndex}`
+}
diff --git a/packages/web3-shared/base/src/helpers/generateUniqueWalletName.ts b/packages/web3-shared/base/src/helpers/generateUniqueWalletName.ts
@@ -0,0 +1,21 @@
+import { isUndefined, max } from 'lodash-es'
+import type { Wallet } from '@masknet/shared-base'
+
+export function generateUniqueWalletName(wallets: Wallet[], name: string) {
+    const num = name.match(/\((\d+)\)/)?.[1]
+    const _name = num ? name.split(` (${num})`)?.[0] : name
+
+    const maxIndex =
+        max([
+            ...wallets
+                .filter((x) => !x.owner)
+                .map((x) => x.name.split(`${_name} `)[1]?.match(/\((\d+)\)/)?.[1])
+                .filter((x) => x && !Number.isNaN(x))
+                .map(Number),
+            ...(num && !Number.isNaN(num) ? [Number(num) - 1] : []),
+        ]) ?? (wallets.some((wallet) => wallet.name === _name) ? 0 : undefined)
+
+    if (isUndefined(maxIndex)) return name
+
+    return `${_name} (${maxIndex + 1})`
+}
diff --git a/packages/web3-shared/base/src/helpers/index.ts b/packages/web3-shared/base/src/helpers/index.ts
@@ -13,6 +13,8 @@ export * from './formatSupply.js'
 export * from './formatURL.js'
 export * from './getLocale.js'
 export * from './getTokenUSDValue.js'
+export * from './generateNewWalletName.js'
+export * from './generateUniqueWalletName.js'
 export * from './isSameAddress.js'
 export * from './isValidTimestamp.js'
 export * from './isSameURL.js'

diff --git a/packages/web3-shared/base/tests/helpers/generateNewWalletName.ts b/packages/web3-shared/base/tests/helpers/generateNewWalletName.ts
@@ -0,0 +1,15 @@
+import { describe, test, expect } from 'vitest'
+import type { Wallet } from '@masknet/shared-base'
+import { generateNewWalletName } from '../../src/helpers/generateNewWalletName.js'
+
+describe('generateNewWalletName util test', () => {
+    test.each([
+        { wallets: [{ name: 'Wallet 1' }] as Wallet[], index: 0, expected: 'Wallet 2' },
+        { wallets: [{ name: 'Wallet 3' }] as Wallet[], index: 0, expected: 'Wallet 4' },
+        { wallets: [{ name: 'Wallet 2' }, { name: 'Wallet 3' }] as Wallet[], index: 1, expected: 'Wallet 5' },
+        { wallets: [{ name: 'Wallet 3' }] as Wallet[], index: 0, preIndex: 1, expected: 'Wallet 1' },
+        { wallets: [{ name: 'Wallet 5' }] as Wallet[], index: 1, preIndex: 10, expected: 'Wallet 10' },
+    ])('.format($wallets $index $preIndex)', ({ wallets, index, preIndex, expected }) => {
+        expect(generateNewWalletName(wallets, index, preIndex)).toBe(expected)
+    })
+})
diff --git a/packages/web3-shared/base/tests/helpers/generateUniqueWalletName.ts b/packages/web3-shared/base/tests/helpers/generateUniqueWalletName.ts
@@ -0,0 +1,16 @@
+import { describe, test, expect } from 'vitest'
+import type { Wallet } from '@masknet/shared-base'
+import { generateUniqueWalletName } from '../../src/helpers/generateUniqueWalletName.js'
+
+describe('generateUniqueWalletName util test', () => {
+    test.each([
+        { wallets: [{ name: 'a' }] as Wallet[], name: 'a', expected: 'a (1)' },
+        { wallets: [{ name: 'b' }] as Wallet[], name: 'a', expected: 'a' },
+        { wallets: [{ name: 'b' }] as Wallet[], name: 'a', expected: 'a' },
+        { wallets: [{ name: 'a (1)' }, { name: 'a (5)' }] as Wallet[], name: 'a', expected: 'a (6)' },
+        { wallets: [{ name: 'a (3)' }] as Wallet[], name: 'a (1)', expected: 'a (4)' },
+        { wallets: [{ name: 'a (3)' }] as Wallet[], name: 'a (11)', expected: 'a (11)' },
+    ])('.format($wallets $name)', ({ wallets, name, expected }) => {
+        expect(generateUniqueWalletName(wallets, name)).toBe(expected)
+    })
+})