fix: fix bugs during multiple mnemonics processing (#587)

onbloc · Sep 26, 2024 · 5ab7148 · 5ab7148
1 parent eeb5a43
commit 5ab7148
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/...s/adena-extension/src/components/molecules/select-account-box/select-account-box-item.tsx b/...s/adena-extension/src/components/molecules/select-account-box/select-account-box-item.tsx
@@ -1,4 +1,3 @@
-import { formatAddress } from '@common/utils/client-utils';
 import { Row, WebCheckBox, WebText } from '@components/atoms';
 import React from 'react';
 import { useTheme } from 'styled-components';
@@ -15,7 +14,7 @@ const SelectAccountBoxItem: React.FC<{
   return (
     <StyledSelectAccountBoxItem key={index}>
       <Row style={{ columnGap: 8 }}>
-        <WebText type='body5'>{formatAddress(address)}</WebText>
+        <WebText type='body5'>{address}</WebText>
         <WebText type='body5' color={theme.webNeutral._700}>{`m/44'/118'/0'/0/${hdPath}`}</WebText>
       </Row>
       {stored ? (

diff --git a/packages/adena-extension/src/hooks/web/use-account-add-screen.ts b/packages/adena-extension/src/hooks/web/use-account-add-screen.ts
@@ -30,7 +30,7 @@ export type UseAccountAddScreenReturn = {
 export type AccountAddStateType = 'INIT' | 'SELECT_SEED_PHRASE' | 'CREATE_ACCOUNT';
 
 const useAccountAddScreen = (): UseAccountAddScreenReturn => {
-  const { navigate, params } = useAppNavigate<RoutePath.WebAccountAdd>();
+  const { navigate } = useAppNavigate<RoutePath.WebAccountAdd>();
   const { ableToSkipQuestionnaire } = useQuestionnaire();
   const { wallet, updateWallet } = useWalletContext();
   const { changeCurrentAccount } = useCurrentAccount();
@@ -42,13 +42,19 @@ const useAccountAddScreen = (): UseAccountAddScreenReturn => {
     return wallet.keyrings.filter(isHDWalletKeyring).length > 1;
   }, [wallet]);
 
-  const [step, setStep] = useState<AccountAddStateType>(
-    params?.doneQuestionnaire
-      ? hasMultiSeedPhrase
-        ? 'CREATE_ACCOUNT'
-        : 'SELECT_SEED_PHRASE'
-      : 'INIT',
-  );
+  const getInitializeStep = (): AccountAddStateType => {
+    if (!wallet) {
+      return 'INIT';
+    }
+
+    if (hasMultiSeedPhrase) {
+      return 'SELECT_SEED_PHRASE';
+    }
+
+    return 'CREATE_ACCOUNT';
+  };
+
+  const [step, setStep] = useState<AccountAddStateType>(getInitializeStep());
 
   const accountAddStepNo = hasMultiSeedPhrase
     ? {
@@ -87,6 +93,10 @@ const useAccountAddScreen = (): UseAccountAddScreenReturn => {
         break;
       case 'SELECT_SEED_PHRASE':
       case 'CREATE_ACCOUNT':
+        if (wallet) {
+          navigate(RoutePath.WebAdvancedOption);
+          break;
+        }
         setStep('INIT');
         break;
       default:

diff --git a/packages/adena-extension/src/hooks/web/use-account-import-screen.ts b/packages/adena-extension/src/hooks/web/use-account-import-screen.ts
@@ -221,9 +221,11 @@ const useAccountImportScreen = ({ wallet }: { wallet: Wallet }): UseAccountImpor
     }
   }, [
     step,
+    wallet,
     inputType,
     inputValue,
     selectedAddresses,
+    loadedAccounts,
     ableToSkipQuestionnaire,
     makePrivateKeyAccountAndKeyring,
   ]);

diff --git a/packages/adena-extension/src/pages/web/account-add-screen/index.tsx b/packages/adena-extension/src/pages/web/account-add-screen/index.tsx
@@ -5,7 +5,7 @@ import { WebMainHeader } from '@components/pages/web/main-header';
 import useAccountAddScreen from '@hooks/web/use-account-add-screen';
 
 import { ADENA_DOCS_PAGE } from '@common/constants/resource.constant';
-import { WEB_TOP_SPACING, WEB_TOP_SPACING_RESPONSIVE } from '@common/constants/ui.constant';
+import { WEB_TOP_SPACING } from '@common/constants/ui.constant';
 import SensitiveInfoStep from '@components/pages/web/sensitive-info-step';
 import CreateAccountStep from './create-account-step';
 import SelectSeedPhraseStep from './select-seed-phrase-step';
@@ -20,7 +20,7 @@ const AccountAddScreen = (): ReactElement => {
     if (step === 'INIT') {
       return {
         default: WEB_TOP_SPACING,
-        responsive: WEB_TOP_SPACING_RESPONSIVE,
+        responsive: WEB_TOP_SPACING,
       };
     }
     return null;