fix(ui-ux): copy evm address when evm domain is toggled on (#4043)

BirthdayResearch · Oct 6, 2023 · c63796e · c63796e
1 parent e13ad96
commit c63796e
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/...-app/app/screens/AppNavigator/screens/Portfolio/components/BottomSheetAddressDetailV2.tsx b/...-app/app/screens/AppNavigator/screens/Portfolio/components/BottomSheetAddressDetailV2.tsx
@@ -105,10 +105,11 @@ export const BottomSheetAddressDetailV2 = (
     const { getAddressUrl } = useDeFiScanContext();
 
     const onActiveAddressPress = useCallback(
-      debounce(() => {
+      debounce((addressToCopy: string) => {
         if (showToast) {
           return;
         }
+        Clipboard.setString(addressToCopy);
         setShowToast(true);
         setTimeout(() => setShowToast(false), TOAST_DURATION);
       }, 500),
@@ -117,7 +118,6 @@ export const BottomSheetAddressDetailV2 = (
 
     useEffect(() => {
       if (showToast) {
-        Clipboard.setString(props.address);
         toast.show(translate("components/toaster", "Address copied"), {
           type: "wallet_toast",
           placement: "top",
@@ -126,7 +126,7 @@ export const BottomSheetAddressDetailV2 = (
       } else {
         toast.hideAll();
       }
-    }, [showToast, props.address]);
+    }, [showToast]);
 
     // Getting addresses
     const fetchAddresses = async (): Promise<void> => {
@@ -349,6 +349,8 @@ export const BottomSheetAddressDetailV2 = (
       const activeAddress = availableAddresses.find(
         ({ dvm }) => dvm === props.address,
       );
+      const activeDomainAddress =
+        domain === DomainType.DVM ? activeAddress?.dvm : activeAddress?.evm;
       return (
         <ThemedViewV2
           style={tailwind("flex flex-col w-full px-5 py-2 items-center")}
@@ -367,12 +369,8 @@ export const BottomSheetAddressDetailV2 = (
             </View>
           )}
           <ActiveAddress
-            address={
-              (domain === DomainType.DVM
-                ? activeAddress?.dvm
-                : activeAddress?.evm) ?? ""
-            }
-            onPress={onActiveAddressPress}
+            address={activeDomainAddress ?? ""}
+            onPress={() => onActiveAddressPress(activeDomainAddress ?? "")}
           />
           <View
             style={tailwind(