fix(Wallet): select wallet after creating or importing (#10614)

* fix: mf-5143 unset title text width * fix: mf-5144 select wallet after creating * fix: mf-5150 add space between text and emoji
DimensionDev · Aug 25, 2023 · 5684974 · 5684974
1 parent 53ab129
commit 5684974
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/packages/dashboard/src/locales/en-US.json b/packages/dashboard/src/locales/en-US.json
@@ -12,6 +12,8 @@
     "public_key": "Public Key",
     "refresh": "Refresh",
     "next": "Next",
+    "previous_page": "Previous",
+    "next_page": "Next",
     "cancel": "Cancel",
     "back": "Back",
     "agree": "Agree",
@@ -35,7 +37,7 @@
     "identity": "identity",
     "accounts": "accounts",
     "data": "data",
-    "ready": "ready🚀",
+    "ready": "ready 🚀",
     "print_preview": "Print Preview",
     "download_preview": "Download Preview",
     "confirm_password": "Confirm Password",

diff --git a/packages/dashboard/src/pages/CreateMaskWallet/AddDeriveWallet/index.tsx b/packages/dashboard/src/pages/CreateMaskWallet/AddDeriveWallet/index.tsx
@@ -15,6 +15,8 @@ import { useDashboardI18N } from '../../../locales/i18n_generated.js'
 import { SecondaryButton } from '../../../components/SecondaryButton/index.js'
 import { PrimaryButton } from '../../../components/PrimaryButton/index.js'
 import { ResetWalletContext } from '../context.js'
+import { Web3 } from '@masknet/web3-providers'
+import { ProviderType } from '@masknet/web3-shared-evm'
 
 const useStyles = makeStyles()((theme) => ({
     header: {
@@ -130,6 +132,10 @@ const AddDeriveWallet = memo(function AddDeriveWallet() {
                 ),
         )
 
+        await Web3.connect({
+            account: firstWallet,
+            providerType: ProviderType.MaskWallet,
+        })
         await WalletServiceRef.value.resolveMaskAccount([{ address: firstWallet }])
 
         navigate(DashboardRoutes.SignUpMaskWalletOnboarding, { replace: true })
@@ -177,13 +183,13 @@ const AddDeriveWallet = memo(function AddDeriveWallet() {
                         className={classes.paginationButton}
                         disabled={page === 0 || confirmLoading}
                         onClick={() => setPage((prev) => prev - 1)}>
-                        <Typography fontWeight={700}>{t.previous()}</Typography>
+                        <Typography fontWeight={700}>{t.previous_page()}</Typography>
                     </SecondaryButton>
                     <SecondaryButton
                         className={classes.paginationButton}
                         disabled={confirmLoading}
                         onClick={() => setPage((prev) => prev + 1)}>
-                        <Typography fontWeight={700}>{t.next()}</Typography>
+                        <Typography fontWeight={700}>{t.next_page()}</Typography>
                     </SecondaryButton>
                 </div>
             ) : null}

diff --git a/packages/dashboard/src/pages/CreateMaskWallet/Recovery/index.tsx b/packages/dashboard/src/pages/CreateMaskWallet/Recovery/index.tsx
@@ -1,22 +1,24 @@
-import { memo, useCallback, useMemo, useState } from 'react'
-import type { UseFormSetError } from 'react-hook-form'
-import { useLocation, useNavigate } from 'react-router-dom'
+import { WalletServiceRef } from '@masknet/plugin-infra/dom'
 import { DashboardRoutes } from '@masknet/shared-base'
-import { generateNewWalletName } from '@masknet/web3-shared-base'
 import { MaskTabList, makeStyles, useTabs } from '@masknet/theme'
+import { useWallets } from '@masknet/web3-hooks-base'
+import { Web3 } from '@masknet/web3-providers'
+import { generateNewWalletName } from '@masknet/web3-shared-base'
+import { ProviderType } from '@masknet/web3-shared-evm'
 import { TabContext, TabPanel } from '@mui/lab'
 import { Tab, Typography } from '@mui/material'
 import { Box } from '@mui/system'
-import { WalletServiceRef } from '@masknet/plugin-infra/dom'
-import { SetupFrameController } from '../../../components/SetupFrame/index.js'
-import { useDashboardI18N } from '../../../locales/i18n_generated.js'
-import { RestoreFromPrivateKey, type FormInputs } from '../../../components/Restore/RestoreFromPrivateKey.js'
-import { RecoveryContext, RecoveryProvider } from '../../../contexts/index.js'
+import { memo, useCallback, useMemo, useState } from 'react'
+import type { UseFormSetError } from 'react-hook-form'
+import { useLocation, useNavigate } from 'react-router-dom'
+import { useAsync } from 'react-use'
 import { RestoreFromMnemonic } from '../../../components/Restore/RestoreFromMnemonic.js'
+import { RestoreFromPrivateKey, type FormInputs } from '../../../components/Restore/RestoreFromPrivateKey.js'
 import { RestoreWalletFromLocal } from '../../../components/Restore/RestoreWalletFromLocal.js'
+import { SetupFrameController } from '../../../components/SetupFrame/index.js'
+import { RecoveryContext, RecoveryProvider } from '../../../contexts/index.js'
+import { useDashboardI18N } from '../../../locales/i18n_generated.js'
 import { ResetWalletContext } from '../context.js'
-import { useAsync } from 'react-use'
-import { useWallets } from '@masknet/web3-hooks-base'
 
 const useStyles = makeStyles()((theme) => ({
     header: {
@@ -126,7 +128,11 @@ const Recovery = memo(function Recovery() {
         async (data: FormInputs, onError: UseFormSetError<FormInputs>) => {
             try {
                 await handlePasswordAndWallets(location.state?.password, location.state?.isReset)
-                await WalletServiceRef.value.recoverWalletFromPrivateKey(newWalletName, data.privateKey)
+                const account = await WalletServiceRef.value.recoverWalletFromPrivateKey(newWalletName, data.privateKey)
+                await Web3.connect({
+                    account,
+                    providerType: ProviderType.MaskWallet,
+                })
                 navigate(DashboardRoutes.SignUpMaskWalletOnboarding, { replace: true })
             } catch (error) {
                 const errorMsg = (error as Error).message

diff --git a/packages/mask/src/extension/popups/pages/Wallet/CreateWallet/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/CreateWallet/index.tsx
@@ -55,6 +55,7 @@ const CreateWallet = memo(function CreateWallet() {
             await pollResult(address)
             await Web3.connect({
                 account: address,
+                providerType: ProviderType.MaskWallet,
             })
             navigate(PopupRoutes.Wallet, { replace: true })
         } catch (error) {

diff --git a/packages/mask/src/extension/popups/pages/Wallet/components/StartUp/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/components/StartUp/index.tsx
@@ -21,7 +21,7 @@ const useStyles = makeStyles()((theme) => ({
         flexDirection: 'column',
     },
     titleWrapper: {
-        padding: 16,
+        padding: theme.spacing(2, 0),
         display: 'flex',
         marginBottom: 12,
         flexDirection: 'column',
@@ -60,7 +60,6 @@ const useStyles = makeStyles()((theme) => ({
         lineHeight: '18px',
         fontWeight: 700,
         color: theme.palette.maskColor.third,
-        width: 270,
         marginTop: theme.spacing(1.5),
         textAlign: 'center',
     },