fix: fix the issue where TextInput can't scroll & prioritize hd/hw/qr…

…/imported accounts when sending. (#6582)
OneKeyHQ · Jan 22, 2025 · 1a20796 · 1a20796
1 parent bea6674
commit 1a20796
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/kit-bg/src/services/ServiceAccountProfile.ts b/packages/kit-bg/src/services/ServiceAccountProfile.ts
@@ -398,10 +398,15 @@ class ServiceAccountProfile extends ServiceBase {
             );
             if (accountItem) {
               item = accountItem;
-            } else {
-              // Fix the issue where an address can be both an HD/HW account and a watch-only account
-              // When an address exists in both HD/HW wallet and watch-only wallet,
-              // prioritize showing the HD/HW wallet name since it has higher security level.
+            }
+
+            // Fix the issue where an address can be both an HD/HW account and a watch-only account
+            // When an address exists in both HD/HW wallet and watch-only wallet,
+            // prioritize showing the HD/HW wallet name since it has higher security level.
+            if (
+              accountUtils.isWatchingAccount({ accountId: item.accountId }) ||
+              accountUtils.isOthersAccount({ accountId: item.accountId })
+            ) {
               const ownAccountItem = walletAccountItems.find((a) => {
                 const accountParams = { accountId: a.accountId };
                 return (
@@ -420,7 +425,6 @@ class ServiceAccountProfile extends ServiceBase {
           console.error(e);
           // pass
         }
-
         result.walletAccountName = `${item.walletName} / ${item.accountName}`;
         result.walletAccountId = item.accountId;
       }

diff --git a/packages/kit/src/views/SignatureConfirm/components/SignatureConfirmDataViewer/DataViewer.tsx b/packages/kit/src/views/SignatureConfirm/components/SignatureConfirmDataViewer/DataViewer.tsx
@@ -1,4 +1,5 @@
 import { TextAreaInput } from '@onekeyhq/components';
+import platformEnv from '@onekeyhq/shared/src/platformEnv';
 
 function DataViewer({ data }: { data: string }) {
   return (
@@ -12,7 +13,8 @@ function DataViewer({ data }: { data: string }) {
       lineHeight={16}
       bg="$bg"
       h="$60"
-      editable={false}
+      editable={platformEnv.isNativeAndroid}
+      showSoftInputOnFocus={false}
       value={data}
     />
   );