From 6e6991aae9ddbe7f1b9748e79612f626f41858b6 Mon Sep 17 00:00:00 2001
From: nuanyang233 <528944303@qq.com>
Date: Mon, 21 Feb 2022 17:57:29 +0800
Subject: [PATCH 1/4] feat: add limit about create wallet and persona

---
 .../Personas/components/PersonaDrawer/index.tsx  |  7 ++++++-
 .../popups/pages/Personas/Home/index.tsx         | 16 +++++++++++-----
 .../popups/pages/Wallet/SwitchWallet/index.tsx   | 13 ++++++++++---
 packages/shared/src/constants.tsx                |  3 +++
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/packages/dashboard/src/pages/Personas/components/PersonaDrawer/index.tsx b/packages/dashboard/src/pages/Personas/components/PersonaDrawer/index.tsx
index d81ebe3293ae..b49032d79ab5 100644
--- a/packages/dashboard/src/pages/Personas/components/PersonaDrawer/index.tsx
+++ b/packages/dashboard/src/pages/Personas/components/PersonaDrawer/index.tsx
@@ -6,6 +6,7 @@ import { PersonaCard } from '../PersonaCard'
 import { useDashboardI18N } from '../../../../locales'
 import { PersonaIdentifier, PersonaInformation, DashboardRoutes } from '@masknet/shared-base'
 import { useNavigate } from 'react-router-dom'
+import { PersonaLimit } from '@masknet/shared'
 
 const useStyles = makeStyles()((theme) => ({
     paper: {
@@ -97,7 +98,11 @@ export const PersonaDrawerUI = memo<PersonaDrawerUIProps>(
                             )
                         })}
                         <Box className={classes.buttons}>
-                            <Button onClick={() => navigate(DashboardRoutes.SignUp)}>{t.personas_add_persona()}</Button>
+                            <Button
+                                onClick={() => navigate(DashboardRoutes.SignUp)}
+                                disabled={personas.length >= PersonaLimit}>
+                                {t.personas_add_persona()}
+                            </Button>
                             <Button
                                 color="warning"
                                 onClick={() =>
diff --git a/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx b/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx
index 63167387b8ae..3ebc44455149 100644
--- a/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx
@@ -4,7 +4,7 @@ import { PersonaContext } from '../hooks/usePersonaContext'
 import { useHistory } from 'react-router-dom'
 import { DeleteIcon, MasksIcon, EditIcon } from '@masknet/icons'
 import { Button, Typography } from '@mui/material'
-import { formatFingerprint } from '@masknet/shared'
+import { formatFingerprint, PersonaLimit } from '@masknet/shared'
 import { PopupRoutes } from '@masknet/shared-base'
 import { ChevronDown, ChevronUp } from 'react-feather'
 import { ProfileList } from '../components/ProfileList'
@@ -12,6 +12,7 @@ import { EnterDashboard } from '../../../components/EnterDashboard'
 import { PersonaList } from '../components/PersonaList'
 import { useI18N } from '../../../../../utils'
 import urlcat from 'urlcat'
+import classNames from 'classnames'
 
 const useStyles = makeStyles()({
     content: {
@@ -83,13 +84,17 @@ const useStyles = makeStyles()({
         marginLeft: 10,
         cursor: 'pointer',
     },
+    secondaryButton: {
+        backgroundColor: '#F7F9FA',
+        color: '#1C68F3',
+    },
 })
 
 const PersonaHome = memo(() => {
     const { t } = useI18N()
     const { classes } = useStyles()
     const [isExpand, setExpand] = useState(true)
-    const { currentPersona, setDeletingPersona } = PersonaContext.useContainer()
+    const { currentPersona, setDeletingPersona, personas } = PersonaContext.useContainer()
     const history = useHistory()
 
     return (
@@ -136,19 +141,20 @@ const PersonaHome = memo(() => {
                 <div className={classes.controller}>
                     <Button
                         variant="contained"
-                        className={classes.button}
+                        className={classNames(classes.button, classes.secondaryButton)}
+                        disabled={personas && personas.length >= PersonaLimit}
                         onClick={() => {
                             browser.tabs.create({
                                 active: true,
                                 url: browser.runtime.getURL('/dashboard.html#/sign-up'),
                             })
-                        }}
-                        style={{ backgroundColor: '#F7F9FA', color: '#1C68F3' }}>
+                        }}>
                         {t('create')}
                     </Button>
                     <Button
                         variant="contained"
                         className={classes.button}
+                        disabled={personas && personas.length >= PersonaLimit}
                         onClick={() => {
                             browser.tabs.create({
                                 active: true,
diff --git a/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx
index 9187a8c5acee..f32084e0535b 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx
@@ -10,6 +10,8 @@ import { useCopyToClipboard } from 'react-use'
 import { NetworkSelector } from '../../../components/NetworkSelector'
 import { currentProviderSettings } from '../../../../../plugins/Wallet/settings'
 import { WalletItem } from './WalletItem'
+import { WalletLimit } from '@masknet/shared'
+import classNames from 'classnames'
 
 const useStyles = makeStyles()({
     header: {
@@ -72,6 +74,10 @@ const useStyles = makeStyles()({
         fontSize: 14,
         lineHeight: '20px',
     },
+    secondaryButton: {
+        backgroundColor: '#F7F9FA',
+        color: '#1C68F3',
+    },
 })
 
 const SwitchWallet = memo(() => {
@@ -137,13 +143,14 @@ const SwitchWallet = memo(() => {
             <div className={classes.controller}>
                 <Button
                     variant="contained"
-                    className={classes.button}
-                    onClick={handleClickCreate}
-                    style={{ backgroundColor: '#F7F9FA', color: '#1C68F3' }}>
+                    className={classNames(classes.button, classes.secondaryButton)}
+                    disabled={wallets.length >= WalletLimit}
+                    onClick={handleClickCreate}>
                     {t('create')}
                 </Button>
                 <Button
                     variant="contained"
+                    disabled={wallets.length >= WalletLimit}
                     className={classes.button}
                     onClick={() => history.push(PopupRoutes.ImportWallet)}>
                     {t('import')}
diff --git a/packages/shared/src/constants.tsx b/packages/shared/src/constants.tsx
index e32e1e6bb0a0..94b5685a0abd 100644
--- a/packages/shared/src/constants.tsx
+++ b/packages/shared/src/constants.tsx
@@ -9,3 +9,6 @@ export const SOCIAL_MEDIA_ICON_MAPPING: Record<string, ReactNode> = {
 }
 
 export const mediaViewerUrl = 'https://media-viewer.r2d2.to/index.html'
+
+export const WalletLimit = 100
+export const PersonaLimit = 10

From 722c48100ddf940eb2a4a7988e6c8b468c8ba012 Mon Sep 17 00:00:00 2001
From: nuanyang233 <528944303@qq.com>
Date: Tue, 22 Feb 2022 15:04:45 +0800
Subject: [PATCH 2/4] chore: reply review

---
 .../src/pages/Personas/components/PersonaDrawer/index.tsx   | 4 ++--
 .../mask/src/extension/popups/pages/Personas/Home/index.tsx | 6 +++---
 .../extension/popups/pages/Wallet/SwitchWallet/index.tsx    | 6 +++---
 packages/shared/src/constants.tsx                           | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/dashboard/src/pages/Personas/components/PersonaDrawer/index.tsx b/packages/dashboard/src/pages/Personas/components/PersonaDrawer/index.tsx
index b49032d79ab5..3804da3758dc 100644
--- a/packages/dashboard/src/pages/Personas/components/PersonaDrawer/index.tsx
+++ b/packages/dashboard/src/pages/Personas/components/PersonaDrawer/index.tsx
@@ -6,7 +6,7 @@ import { PersonaCard } from '../PersonaCard'
 import { useDashboardI18N } from '../../../../locales'
 import { PersonaIdentifier, PersonaInformation, DashboardRoutes } from '@masknet/shared-base'
 import { useNavigate } from 'react-router-dom'
-import { PersonaLimit } from '@masknet/shared'
+import { MAX_PERSONA_LIMIT } from '@masknet/shared'
 
 const useStyles = makeStyles()((theme) => ({
     paper: {
@@ -100,7 +100,7 @@ export const PersonaDrawerUI = memo<PersonaDrawerUIProps>(
                         <Box className={classes.buttons}>
                             <Button
                                 onClick={() => navigate(DashboardRoutes.SignUp)}
-                                disabled={personas.length >= PersonaLimit}>
+                                disabled={personas.length >= MAX_PERSONA_LIMIT}>
                                 {t.personas_add_persona()}
                             </Button>
                             <Button
diff --git a/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx b/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx
index 3ebc44455149..b68d4f13398b 100644
--- a/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx
@@ -4,7 +4,7 @@ import { PersonaContext } from '../hooks/usePersonaContext'
 import { useHistory } from 'react-router-dom'
 import { DeleteIcon, MasksIcon, EditIcon } from '@masknet/icons'
 import { Button, Typography } from '@mui/material'
-import { formatFingerprint, PersonaLimit } from '@masknet/shared'
+import { formatFingerprint, MAX_PERSONA_LIMIT } from '@masknet/shared'
 import { PopupRoutes } from '@masknet/shared-base'
 import { ChevronDown, ChevronUp } from 'react-feather'
 import { ProfileList } from '../components/ProfileList'
@@ -142,7 +142,7 @@ const PersonaHome = memo(() => {
                     <Button
                         variant="contained"
                         className={classNames(classes.button, classes.secondaryButton)}
-                        disabled={personas && personas.length >= PersonaLimit}
+                        disabled={personas && personas.length >= MAX_PERSONA_LIMIT}
                         onClick={() => {
                             browser.tabs.create({
                                 active: true,
@@ -154,7 +154,7 @@ const PersonaHome = memo(() => {
                     <Button
                         variant="contained"
                         className={classes.button}
-                        disabled={personas && personas.length >= PersonaLimit}
+                        disabled={personas && personas.length >= MAX_PERSONA_LIMIT}
                         onClick={() => {
                             browser.tabs.create({
                                 active: true,
diff --git a/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx
index f32084e0535b..a15cf7fbdd07 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/SwitchWallet/index.tsx
@@ -10,7 +10,7 @@ import { useCopyToClipboard } from 'react-use'
 import { NetworkSelector } from '../../../components/NetworkSelector'
 import { currentProviderSettings } from '../../../../../plugins/Wallet/settings'
 import { WalletItem } from './WalletItem'
-import { WalletLimit } from '@masknet/shared'
+import { MAX_WALLET_LIMIT } from '@masknet/shared'
 import classNames from 'classnames'
 
 const useStyles = makeStyles()({
@@ -144,13 +144,13 @@ const SwitchWallet = memo(() => {
                 <Button
                     variant="contained"
                     className={classNames(classes.button, classes.secondaryButton)}
-                    disabled={wallets.length >= WalletLimit}
+                    disabled={wallets.length >= MAX_WALLET_LIMIT}
                     onClick={handleClickCreate}>
                     {t('create')}
                 </Button>
                 <Button
                     variant="contained"
-                    disabled={wallets.length >= WalletLimit}
+                    disabled={wallets.length >= MAX_WALLET_LIMIT}
                     className={classes.button}
                     onClick={() => history.push(PopupRoutes.ImportWallet)}>
                     {t('import')}
diff --git a/packages/shared/src/constants.tsx b/packages/shared/src/constants.tsx
index 94b5685a0abd..990e846b7a32 100644
--- a/packages/shared/src/constants.tsx
+++ b/packages/shared/src/constants.tsx
@@ -10,5 +10,5 @@ export const SOCIAL_MEDIA_ICON_MAPPING: Record<string, ReactNode> = {
 
 export const mediaViewerUrl = 'https://media-viewer.r2d2.to/index.html'
 
-export const WalletLimit = 100
-export const PersonaLimit = 10
+export const MAX_WALLET_LIMIT = 100
+export const MAX_PERSONA_LIMIT = 10

From f69b96358e65cfa9a9af8ceb17c51587b6826362 Mon Sep 17 00:00:00 2001
From: nuanyang233 <528944303@qq.com>
Date: Thu, 24 Feb 2022 22:05:52 +0800
Subject: [PATCH 3/4] fix: bugfix

---
 .../mask/src/extension/popups/pages/Personas/Home/index.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx b/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx
index b68d4f13398b..03bdb8a180bb 100644
--- a/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Personas/Home/index.tsx
@@ -97,6 +97,7 @@ const PersonaHome = memo(() => {
     const { currentPersona, setDeletingPersona, personas } = PersonaContext.useContainer()
     const history = useHistory()
 
+    console.log(personas)
     return (
         <>
             <div className={classes.content}>
@@ -142,7 +143,7 @@ const PersonaHome = memo(() => {
                     <Button
                         variant="contained"
                         className={classNames(classes.button, classes.secondaryButton)}
-                        disabled={personas && personas.length >= MAX_PERSONA_LIMIT}
+                        disabled={personas && personas.length >= MAX_PERSONA_LIMIT - 1}
                         onClick={() => {
                             browser.tabs.create({
                                 active: true,
@@ -154,7 +155,6 @@ const PersonaHome = memo(() => {
                     <Button
                         variant="contained"
                         className={classes.button}
-                        disabled={personas && personas.length >= MAX_PERSONA_LIMIT}
                         onClick={() => {
                             browser.tabs.create({
                                 active: true,

From e71edf8263953c99620a89b296a5d296a799d40d Mon Sep 17 00:00:00 2001
From: nuanyang233 <528944303@qq.com>
Date: Fri, 25 Feb 2022 15:06:15 +0800
Subject: [PATCH 4/4] fix: bugfix

---
 .../background-script/WelcomeServices/restoreBackup.ts      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/mask/src/extension/background-script/WelcomeServices/restoreBackup.ts b/packages/mask/src/extension/background-script/WelcomeServices/restoreBackup.ts
index a65d02c986ba..1117c89495d6 100644
--- a/packages/mask/src/extension/background-script/WelcomeServices/restoreBackup.ts
+++ b/packages/mask/src/extension/background-script/WelcomeServices/restoreBackup.ts
@@ -55,9 +55,10 @@ export async function restoreBackup(json: object, whoAmI?: ProfileIdentifier) {
     }
 
     for (const [_, x] of data.wallets.entries()) {
-        const record = WalletRecordFromJSONFormat(x)
-        const name = record.name
         try {
+            const record = WalletRecordFromJSONFormat(x)
+            const name = record.name
+
             if (record.storedKeyInfo && record.derivationPath)
                 await addWallet(record.address, name, record.derivationPath, record.storedKeyInfo)
             else if (record.privateKey) await recoverWalletFromPrivateKey(name, record.privateKey)
@@ -73,6 +74,7 @@ export async function restoreBackup(json: object, whoAmI?: ProfileIdentifier) {
             }
         } catch (error) {
             console.error(error)
+            continue
         }
     }
     {