fix: switch account of notifiation detail (#6246)

OneKeyHQ · Nov 20, 2024 · 5437134 · 5437134
1 parent fa4589f
commit 5437134
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 13 deletions.
diff --git a/packages/kit-bg/src/dbs/local/LocalDbBase.ts b/packages/kit-bg/src/dbs/local/LocalDbBase.ts
@@ -2166,7 +2166,11 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
     address: string;
     normalizedAddress: string;
   }): Promise<
-    Array<{ walletName: string; accountName: string; accountId: string }>
+    Array<{
+      walletName: string;
+      accountName: string;
+      accountId: string; // accountId or indexedAccountId
+    }>
   > {
     try {
       const db = await this.readyDb;

diff --git a/packages/kit-bg/src/services/ServiceAccountProfile.ts b/packages/kit-bg/src/services/ServiceAccountProfile.ts
@@ -332,6 +332,7 @@ class ServiceAccountProfile extends ServiceBase {
         }
 
         result.walletAccountName = `${item.walletName} / ${item.accountName}`;
+        result.walletAccountId = item.accountId;
       }
     }
     if (

diff --git a/packages/kit/src/components/AddressInfo/index.tsx b/packages/kit/src/components/AddressInfo/index.tsx
@@ -1,6 +1,10 @@
 import { useIntl } from 'react-intl';
 
 import { Badge, Dialog, Stack, XStack } from '@onekeyhq/components';
+import type {
+  IDBAccount,
+  IDBIndexedAccount,
+} from '@onekeyhq/kit-bg/src/dbs/local/types';
 import { ETranslations } from '@onekeyhq/shared/src/locale/enum/translations';
 import { ERootRoutes, ETabRoutes } from '@onekeyhq/shared/src/routes';
 import { EAccountSelectorSceneName } from '@onekeyhq/shared/types';
@@ -45,17 +49,28 @@ function SwitchHomeAccountButton({
             },
           ), // `Switch primary account to ${walletAccountName}`,
           onConfirm: async () => {
-            const account =
-              await backgroundApiProxy.serviceAccount.getDBAccountSafe({
-                accountId: accountId || '',
-              });
+            let account: IDBAccount | undefined;
+            let indexedAccount: IDBIndexedAccount | undefined;
+
+            // eslint-disable-next-line prefer-const
+            account = await backgroundApiProxy.serviceAccount.getDBAccountSafe({
+              accountId: accountId || '',
+            });
 
-            const indexedAccount =
-              await backgroundApiProxy.serviceAccount.getIndexedAccountByAccount(
-                {
-                  account,
-                },
-              );
+            if (account) {
+              indexedAccount =
+                await backgroundApiProxy.serviceAccount.getIndexedAccountByAccount(
+                  {
+                    account,
+                  },
+                );
+            } else {
+              // may be indexedAccountId
+              indexedAccount =
+                await backgroundApiProxy.serviceAccount.getIndexedAccountSafe({
+                  id: accountId || '',
+                });
+            }
 
             if (!indexedAccount && !account) {
               return;
@@ -134,7 +149,7 @@ function AddressInfo(props: IProps) {
       {addressQueryResult.walletAccountName ? (
         <AccountNameContainer
           walletAccountName={addressQueryResult.walletAccountName}
-          accountId={accountId}
+          accountId={addressQueryResult.walletAccountId}
         >
           <Badge badgeType="success" badgeSize="sm">
             {addressQueryResult.walletAccountName}

diff --git a/packages/kit/src/components/AddressInput/index.tsx b/packages/kit/src/components/AddressInput/index.tsx
@@ -238,6 +238,7 @@ export type IAddressQueryResult = {
   input?: string;
   validStatus?: IAddressValidateStatus;
   walletAccountName?: string;
+  walletAccountId?: string; // accountId or indexedAccountId
   addressBookName?: string;
   resolveAddress?: string;
   resolveOptions?: string[];

diff --git a/packages/shared/src/locale/json/zh_TW.json b/packages/shared/src/locale/json/zh_TW.json
@@ -1670,7 +1670,7 @@
   "settings.sign_text": "簽名內容",
   "settings.signature_record": "簽名記錄",
   "settings.spend_dust_utxo": "花費塵埃 UTXO",
-  "settings.spend_dust_utxo_desc": "使用塵埃UTXO會增加交易費用並降低隱私，建議禁用此功能以避免惡意追蹤。",
+  "settings.spend_dust_utxo_desc": "使用塵埃 UTXO 會增加交易費用並降低隱私，建議禁用此功能以避免惡意追蹤。",
   "settings.step1_get_bip39_dotmap": "步驟1：獲取 BIP39 點陣圖",
   "settings.step1_get_bip39_dotmap_desc": "請訪問線上的{dotmap}，或參考您購買 KeyTag 附帶的入門指南。",
   "settings.step2_match_recovery_phrase_dots": "步驟 2：匹配助記詞與點陣",
-Original file line number
+Diff line change
@@ Expand Up / @@ -332,6 +332,7 @@ class ServiceAccountProfile extends ServiceBase { @@
             }
             result.walletAccountName = `${item.walletName} / ${item.accountName}`;
+            result.walletAccountId = item.accountId;
           }
         }
         if (
@@ Expand Down @@