fix(trading): fix invalid receive address in DEX swap

trezor · Feb 27, 2025 · 7e92e4b · 7e92e4b
1 parent 480c589
commit 7e92e4b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/packages/suite/src/hooks/wallet/trading/form/useTradingExchangeWatchSendApproval.ts b/packages/suite/src/hooks/wallet/trading/form/useTradingExchangeWatchSendApproval.ts
@@ -60,8 +60,12 @@ export const useTradingExchangeWatchSendApproval = ({
 
                 dispatch(saveSelectedQuote(updatedSelectedQuote));
 
-                if (selectedQuote.dexTx) {
-                    await confirmTrade(selectedQuote.dexTx.from, undefined, updatedSelectedQuote);
+                if (selectedQuote.dexTx && selectedQuote.receiveAddress) {
+                    await confirmTrade(
+                        selectedQuote.receiveAddress,
+                        undefined,
+                        updatedSelectedQuote,
+                    );
                 }
             }
 

diff --git a/...ing/common/TradingSelectedOffer/TradingOfferExchange/TradingOfferExchangeSendApproval.tsx b/...ing/common/TradingSelectedOffer/TradingOfferExchange/TradingOfferExchangeSendApproval.tsx
@@ -87,6 +87,10 @@ export const TradingOfferExchangeSendApproval = () => {
     };
 
     const selectApprovalValue = async (type: ExtendedDexApprovalType) => {
+        if (!selectedQuote.receiveAddress) {
+            return;
+        }
+
         setApprovalType(type);
         if (type !== 'APPROVED') {
             const updatedSelectedQuote = {
@@ -96,12 +100,16 @@ export const TradingOfferExchangeSendApproval = () => {
 
             dispatch(saveSelectedQuote(updatedSelectedQuote));
 
-            await confirmTrade(dexTx.from, undefined, updatedSelectedQuote);
+            await confirmTrade(selectedQuote.receiveAddress, undefined, updatedSelectedQuote);
         }
     };
 
     // if the last step was change in approval, we have to recompute the swap request
     const proceedToSwap = async () => {
+        if (!selectedQuote.receiveAddress) {
+            return;
+        }
+
         if (selectedQuote.approvalType) {
             const updatedSelectedQuote = {
                 ...selectedQuote,
@@ -114,7 +122,11 @@ export const TradingOfferExchangeSendApproval = () => {
                 }),
             );
 
-            const confirmedTrade = await confirmTrade(dexTx.from, undefined, updatedSelectedQuote);
+            const confirmedTrade = await confirmTrade(
+                selectedQuote.receiveAddress,
+                undefined,
+                updatedSelectedQuote,
+            );
 
             if (!confirmedTrade) {
                 return;

diff --git a/...trading/common/TradingSelectedOffer/TradingOfferExchange/TradingOfferExchangeSendSwap.tsx b/...trading/common/TradingSelectedOffer/TradingOfferExchange/TradingOfferExchangeSendSwap.tsx
@@ -102,10 +102,11 @@ export const TradingOfferExchangeSendSwap = () => {
             if (
                 selectedQuote &&
                 selectedQuote?.dexTx &&
+                selectedQuote.receiveAddress &&
                 !customSlippageError &&
                 customSlippage !== selectedQuote.swapSlippage
             ) {
-                confirmTrade(selectedQuote.dexTx.from, undefined, {
+                confirmTrade(selectedQuote.receiveAddress, undefined, {
                     ...selectedQuote,
                     swapSlippage: customSlippage,
                     approvalType: undefined,
@@ -147,9 +148,9 @@ export const TradingOfferExchangeSendSwap = () => {
         if (value !== CUSTOM_SLIPPAGE) {
             setCustomSlippage(value);
 
-            if (!selectedQuote.dexTx) return;
+            if (!selectedQuote.dexTx || !selectedQuote.receiveAddress) return;
 
-            await confirmTrade(selectedQuote.dexTx.from, undefined, {
+            await confirmTrade(selectedQuote.receiveAddress, undefined, {
                 ...selectedQuote,
                 swapSlippage: value,
                 approvalType: undefined,