OK-36500, OK-36508: Improve device filtering in Device Management & Revert QR wallet reset logic

* chore: i18n

* refactor: Remove QR wallet badge and improve device filtering in Device Management

* fix: Prevent qr wallet from changing deviceId

* Revert "fix: Update QR Wallet device info (#6851)"

This reverts commit 8bf500f.

Author: originalix

packages/kit-bg/src/dbs/local/LocalDbBase.ts

@@ -1494,37 +1494,10 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
     };
   }
 
-  private async getQrWalletExistingDevice({
-    rawDeviceId,
-    xfp,
-  }: {
-    rawDeviceId: string;
-    xfp: string;
-  }): Promise<IDBDevice | undefined> {
-    const { wallets: allWallets } = await this.getAllWallets();
-    const existingQrWallet = allWallets.find(
-      (w) => w.type === WALLET_TYPE_QR && w.xfp && w.xfp === xfp,
-    );
-    if (existingQrWallet?.associatedDevice) {
-      const associatedDevice = await this.getDeviceSafe(
-        existingQrWallet.associatedDevice,
-      );
-      if (associatedDevice) {
-        return associatedDevice;
-      }
-    }
-
-    const existingDevice = await this.getDeviceByQuery({
-      featuresDeviceId: rawDeviceId,
-    });
-    return existingDevice;
-  }
-
   async createQrWallet({ qrDevice, airGapAccounts }: IDBCreateQRWalletParams) {
     const { deviceId: rawDeviceId, xfp } = qrDevice;
-    const existingDevice = await this.getQrWalletExistingDevice({
-      rawDeviceId,
-      xfp,
+    const existingDevice = await this.getDeviceByQuery({
+      featuresDeviceId: rawDeviceId,
     });
     const dbDeviceId = existingDevice?.id || accountUtils.buildDeviceDbId();
 
@@ -1593,7 +1566,6 @@ export abstract class LocalDbBase extends LocalDbBaseContainer {
           ids: [dbDeviceId],
           updater: async (item) => {
             item.updatedAt = now;
-            item.deviceId = rawDeviceId;
             // TODO update qrDevice last version(not updated version)
             return item;
           },

packages/kit-bg/src/providers/ProviderApiBtc.ts

@@ -213,6 +213,12 @@ class ProviderApiBtc extends ProviderApiBase {
 
   @providerApiMethod()
   public async getChain(request: IJsBridgeMessagePayload) {
+    const defaultNetwork = await this.backgroundApi.serviceNetwork.getNetwork({
+      networkId: getNetworkIdsMap().btc,
+    });
+    const defaultChain = await networkUtils.getBtcDappNetworkName(
+      defaultNetwork,
+    );
     try {
       const networks =
         await this.backgroundApi.serviceDApp.getConnectedNetworks({
@@ -222,9 +228,10 @@ class ProviderApiBtc extends ProviderApiBase {
       if (Array.isArray(networks) && networks.length) {
         return await networkUtils.getBtcDappUniSetChainName(networks[0]);
       }
-      return undefined;
-    } catch {
-      return undefined;
+      return defaultChain;
+    } catch (e) {
+      console.log('getChain error: ', e);
+      return defaultChain;
     }
   }
 

packages/kit-bg/src/services/ServiceAccount/ServiceAccount.ts

@@ -284,26 +284,59 @@ class ServiceAccount extends ServiceBase {
   async getAllHwQrWalletWithDevice(params?: {
     filterQrWallet?: boolean;
     filterHiddenWallet?: boolean;
+    skipDuplicateDevice?: boolean;
   }) {
     const { wallets, allDevices } = await this.getAllWallets({
       refillWalletInfo: true,
     });
 
     const filterQrWallet = params?.filterQrWallet ?? false;
     const filterHiddenWallet = params?.filterHiddenWallet ?? false;
+    const skipDuplicateDevice = params?.skipDuplicateDevice ?? false;
 
     const result: {
       [walletId: string]: IHwQrWalletWithDevice;
     } = {};
 
+    // Map of deviceId -> walletId for hardware wallets
+    const deviceToHwWalletMap: Record<string, string> = {};
+
+    // Collect all hardware wallet device IDs if skip duplication is enabled
+    if (skipDuplicateDevice) {
+      for (const wallet of wallets) {
+        if (
+          accountUtils.isHwWallet({ walletId: wallet.id }) &&
+          !accountUtils.isHwHiddenWallet({ wallet }) &&
+          wallet.associatedDevice
+        ) {
+          deviceToHwWalletMap[wallet.associatedDevice] = wallet.id;
+        }
+      }
+    }
+
     for (const wallet of wallets) {
       const isHiddenWallet = accountUtils.isHwHiddenWallet({ wallet });
       const isHwWallet = accountUtils.isHwWallet({ walletId: wallet.id });
       const isQrWallet = accountUtils.isQrWallet({ walletId: wallet.id });
 
-      const shouldIncludeHiddenWallet = !filterHiddenWallet || !isHiddenWallet;
-      const shouldIncludeQrWallet = isQrWallet && !filterQrWallet;
-      if (shouldIncludeHiddenWallet && (isHwWallet || shouldIncludeQrWallet)) {
+      // Check if this wallet should be included in the result
+      const isValidWalletType = isHwWallet || isQrWallet;
+      const passesHiddenWalletFilter = !filterHiddenWallet || !isHiddenWallet;
+      const passesQrWalletFilter = !filterQrWallet || !isQrWallet;
+      const passesDeviceDuplicationCheck = !(
+        skipDuplicateDevice &&
+        isQrWallet &&
+        wallet.associatedDevice &&
+        deviceToHwWalletMap[wallet.associatedDevice]
+      );
+
+      // Only add wallet to result if it passes all checks
+      if (
+        isValidWalletType &&
+        passesHiddenWalletFilter &&
+        passesQrWalletFilter &&
+        passesDeviceDuplicationCheck
+      ) {
         const device = (allDevices ?? []).find(
           (d) => d.id === wallet.associatedDevice,
         );

packages/kit/src/components/AccountSelector/hooks/useCreateQrWallet.tsx

@@ -41,7 +41,7 @@ export function useCreateQrWallet() {
         urJson: IAirGapUrJson;
       },
     ) => {
-      const { urJson, byDevice, byWallet, isOnboarding } = params;
+      const { urJson, byWallet, isOnboarding } = params;
       const { qrDevice, airGapAccounts, airGapMultiAccounts } =
         await backgroundApiProxy.serviceQrWallet.buildAirGapMultiAccounts({
           urJson,
@@ -55,9 +55,6 @@ export function useCreateQrWallet() {
       if (byWallet?.xfp && qrDevice?.xfp !== byWallet?.xfp) {
         throw new OneKeyErrorAirGapWalletMismatch();
       }
-      if (byDevice?.deviceId && qrDevice?.deviceId !== byDevice?.deviceId) {
-        throw new OneKeyErrorAirGapWalletMismatch();
-      }
       if (isOnboarding) {
         navigation.push(EOnboardingPages.FinalizeWalletSetup);
       }

packages/kit/src/views/DeviceManagement/pages/DeviceDetailsModal/DeviceBasicInfoSection.tsx

@@ -31,14 +31,14 @@ function DeviceBasicInfoSection({
   const defaultInfo = useMemo(
     () => ({
       firmwareVersion: '-',
-      walletAvatarBadge: isQrWallet ? 'QR' : undefined,
+      walletAvatarBadge: undefined,
       verifiedBadgeType: 'default' as IBadgeType,
       verifiedBadgeText: '-',
       verifiedBadgeTextColor: '$iconCritical' as IIconProps['color'],
       verifiedBadgeIconName: 'ErrorSolid' as IKeyOfIcons,
       verifiedBadgeIconColor: '$iconCritical' as IIconProps['color'],
     }),
-    [isQrWallet],
+    [],
   );
 
   const { result: deviceInfo } = usePromiseResult(
@@ -74,15 +74,15 @@ function DeviceBasicInfoSection({
 
       return {
         firmwareVersion: versions?.firmwareVersion ?? '-',
-        walletAvatarBadge: isQrWallet ? 'QR' : undefined,
+        walletAvatarBadge: undefined,
         verifiedBadgeType: status.type,
         verifiedBadgeIconName: status.icon,
         verifiedBadgeIconColor: status.color,
         verifiedBadgeText: intl.formatMessage({ id: status.textId }),
         verifiedBadgeTextColor: status.color,
       };
     },
-    [device, isQrWallet, intl, defaultInfo],
+    [device, intl, defaultInfo],
     { initResult: defaultInfo },
   );
 

packages/kit/src/views/DeviceManagement/pages/DeviceDetailsModal/index.tsx

@@ -175,6 +175,7 @@ function DeviceDetailsModalCmp() {
   }, [result?.device?.connectId, detectStatus]);
 
   const renderUpdateAlert = useCallback(() => {
+    if (isQrWallet) return null;
     if (!detectResult?.shouldUpdate) return null;
 
     let message = 'New firmware is available';
@@ -208,7 +209,7 @@ function DeviceDetailsModalCmp() {
         }}
       />
     );
-  }, [intl, actions, result?.device?.connectId, detectResult]);
+  }, [intl, actions, result?.device?.connectId, detectResult, isQrWallet]);
 
   const renderContent = useCallback(() => {
     if (isLoading || !result) {

packages/kit/src/views/DeviceManagement/pages/DeviceManagementListModal/index.tsx

@@ -26,7 +26,6 @@ import {
   EModalRoutes,
   EOnboardingPages,
 } from '@onekeyhq/shared/src/routes';
-import accountUtils from '@onekeyhq/shared/src/utils/accountUtils';
 import type { IHwQrWalletWithDevice } from '@onekeyhq/shared/types/account';
 
 import { useBuyOneKeyHeaderRightButton } from '../../hooks/useBuyOneKeyHeaderRightButton';
@@ -40,6 +39,7 @@ function DeviceManagementListModal() {
         const r =
           await backgroundApiProxy.serviceAccount.getAllHwQrWalletWithDevice({
             filterHiddenWallet: true,
+            skipDuplicateDevice: true,
           });
         return Object.values(r).filter(
           (item): item is IHwQrWalletWithDevice =>
@@ -84,9 +84,6 @@ function DeviceManagementListModal() {
       const walletAvatarProps: IWalletAvatarProps = {
         wallet: item.wallet,
         status: 'default',
-        badge: accountUtils.isQrWallet({ walletId: item.wallet.id })
-          ? 'QR'
-          : undefined,
       };
       return (
         <ListItem