fix: copy address tips not a same wallet (#2783)

* fix: copy address tip not a same wallet * chore: update app version * fix: bulksender header --------- Co-authored-by: sunnylqm <sunnylqm@onekey.so>
OneKeyHQ · Mar 31, 2023 · 413522f · 413522f
1 parent 45223ac
commit 413522f
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 10 deletions.
diff --git a/...ges/kit/src/components/Header/AccountSelectorChildren/RightAccountSection/ItemSection.tsx b/...ges/kit/src/components/Header/AccountSelectorChildren/RightAccountSection/ItemSection.tsx
@@ -73,7 +73,10 @@ const AccountSectionItem: FC<Props> = ({
     (value) => {
       switch (value) {
         case 'copy':
-          copyAddress(item.displayAddress ?? item.address);
+          copyAddress({
+            address: item.address,
+            displayAddress: item.displayAddress,
+          });
           break;
         case 'rename':
           DialogManager.show({

diff --git a/...s/NetworkAccountSelector/modals/NetworkAccountSelectorModal/AccountItemSelectDropdown.tsx b/...s/NetworkAccountSelector/modals/NetworkAccountSelectorModal/AccountItemSelectDropdown.tsx
@@ -124,7 +124,10 @@ function AccountItemSelectDropdown({
       switch (value) {
         case 'copy':
           setTimeout(() => {
-            copyAddress(account.displayAddress || account.address);
+            copyAddress({
+              address: account.address,
+              displayAddress: account.displayAddress,
+            });
           }, 150);
           break;
         case 'rename':

diff --git a/packages/kit/src/hooks/useCopyAddress.ts b/packages/kit/src/hooks/useCopyAddress.ts
@@ -30,14 +30,25 @@ export function useCopyAddress({
   const navigation = useNavigation();
 
   const copyAddress = useCallback(
-    (address?: string, template?: string, customPath?: string) => {
+    ({
+      address,
+      displayAddress,
+      template,
+      customPath,
+    }: {
+      address?: string;
+      displayAddress?: string;
+      template?: string;
+      customPath?: string;
+    }) => {
       if (isHwWallet) {
         navigation.navigate(RootRoutes.Modal, {
           screen: ModalRoutes.Receive,
           params: {
             screen: ReceiveTokenModalRoutes.ReceiveToken,
             params: {
               address,
+              displayAddress,
               wallet,
               network,
               account,
@@ -47,8 +58,8 @@ export function useCopyAddress({
           },
         });
       } else {
-        if (!address) return;
-        copyToClipboard(address);
+        if (!displayAddress && !address) return;
+        copyToClipboard(displayAddress ?? address ?? '');
         ToastManager.show({
           title: intl.formatMessage({ id: 'msg__address_copied' }),
         });

diff --git a/packages/kit/src/views/Account/AddNewAccount/BitcoinUsedAddress.tsx b/packages/kit/src/views/Account/AddNewAccount/BitcoinUsedAddress.tsx
@@ -171,7 +171,7 @@ const BitcoinUsedAddress: FC = () => {
 
   const onCopyAddress = useCallback(
     ({ address, path }: { address: string; path: string }) => {
-      copyAddress(address, account?.template, path);
+      copyAddress({ address, template: account?.template, customPath: path });
     },
     [copyAddress, account?.template],
   );

diff --git a/packages/kit/src/views/Overlay/AccountMoreMenu.tsx b/packages/kit/src/views/Overlay/AccountMoreMenu.tsx
@@ -227,7 +227,10 @@ const AccountMoreMenu: FC<IMenu> = (props) => {
         id: 'action__copy_address',
         onPress: () => {
           setTimeout(() => {
-            copyAddress(account?.address);
+            copyAddress({
+              address: account?.address,
+              displayAddress: account?.displayAddress,
+            });
           });
         },
         icon: 'Square2StackMini',

diff --git a/packages/kit/src/views/ReceiveToken/index.tsx b/packages/kit/src/views/ReceiveToken/index.tsx
@@ -42,7 +42,7 @@ const ReceiveToken = () => {
 
   const route = useRoute<NavigationProps>();
 
-  const { address, name } = route.params ?? {};
+  const { address, displayAddress, name } = route.params ?? {};
   const routePrams = route.params;
 
   const isVerticalLayout = useIsVerticalLayout();
@@ -59,7 +59,11 @@ const ReceiveToken = () => {
   const walletId = wallet?.id || '';
 
   const shownAddress =
-    address ?? account?.displayAddress ?? account?.address ?? '';
+    displayAddress ??
+    address ??
+    account?.displayAddress ??
+    account?.address ??
+    '';
   const shownName = name ?? account?.name ?? '';
 
   const { engine } = backgroundApiProxy;

diff --git a/packages/kit/src/views/ReceiveToken/types.ts b/packages/kit/src/views/ReceiveToken/types.ts
@@ -9,6 +9,7 @@ export { ReceiveTokenModalRoutes };
 export type ReceiveTokenRoutesParams = {
   [ReceiveTokenModalRoutes.ReceiveToken]: {
     address?: string;
+    displayAddress?: string;
     name?: string;
 
     wallet?: Wallet | null;

diff --git a/packages/kit/src/views/Wallet/AccountInfo/index.tsx b/packages/kit/src/views/Wallet/AccountInfo/index.tsx
@@ -122,7 +122,10 @@ const AccountAmountInfo: FC = () => {
             _hover={{ bg: 'surface-hovered' }}
             _pressed={{ bg: 'surface-pressed' }}
             onPress={() => {
-              copyAddress(account?.displayAddress ?? account?.address);
+              copyAddress({
+                address: account?.address,
+                displayAddress: account?.displayAddress,
+              });
             }}
           >
             <Text