fix: x and p send set address

ava-labs · Oct 28, 2024 · e19795e · e19795e
1 parent 68a849c
commit e19795e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/pages/Send/components/SendAVM.tsx b/src/pages/Send/components/SendAVM.tsx
@@ -110,7 +110,7 @@ export const SendAVM = ({
       token={nativeToken}
       tokenList={tokenList}
       onContactChanged={(contact) => {
-        if (contact?.addressXP) setAddress(contact.addressXP);
+        setAddress(contact?.addressXP ?? '');
       }}
       onAmountChanged={(newAmount) => setAmount(newAmount)}
       onTokenChanged={() => {}} // noop, AVAX has only one token

diff --git a/src/pages/Send/components/SendPVM.tsx b/src/pages/Send/components/SendPVM.tsx
@@ -119,7 +119,7 @@ export const SendPVM = ({
       token={nativeToken}
       tokenList={tokenList}
       onContactChanged={(contact) => {
-        if (contact?.addressXP) setAddress(contact.addressXP);
+        setAddress(contact?.addressXP ?? '');
       }}
       onAmountChanged={(newAmount) => setAmount(newAmount)}
       onTokenChanged={() => {}} // noop, AVAX has only one token

diff --git a/src/pages/Send/hooks/useIdentifyAddress.ts b/src/pages/Send/hooks/useIdentifyAddress.ts
@@ -24,7 +24,12 @@ export const useIdentifyAddress = () => {
   const identifyAddress = useCallback(
     (address: string): Contact => {
       if (!address)
-        return { ...UNSAVED_CONTACT_BASE, address: '', addressBTC: '' };
+        return {
+          ...UNSAVED_CONTACT_BASE,
+          address: '',
+          addressBTC: '',
+          addressXP: '',
+        };
       const addressLowerCase = address.toLowerCase();
       for (const contact of contacts) {
         if (
@@ -57,13 +62,13 @@ export const useIdentifyAddress = () => {
             ? { addressBTC: account.addressBTC, address: '' }
             : isPchainNetwork(network)
             ? {
-                addressXP: account.addressPVM ? account.addressPVM : '',
+                addressXP: address,
                 address: '',
                 addressBTC: '',
               }
             : isXchainNetwork(network)
             ? {
-                addressXP: account.addressAVM ? account.addressAVM : '',
+                addressXP: address,
                 address: '',
                 addressBTC: '',
               }