[FRE-1260] Refactor SwapExecutionPage to use route data for asset den…

…oms (#529)
skip-mev · Dec 4, 2024 · 94573e0 · 94573e0
1 parent e0bc1a7
commit 94573e0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.changeset/dirty-bobcats-own.md b/.changeset/dirty-bobcats-own.md
@@ -0,0 +1,5 @@
+---
+'@skip-go/widget': patch
+---
+
+Refactor SwapExecutionPage to use route data for asset denoms
diff --git a/packages/widget/src/pages/SwapExecutionPage/SwapExecutionPageRouteDetailed.tsx b/packages/widget/src/pages/SwapExecutionPage/SwapExecutionPageRouteDetailed.tsx
@@ -51,7 +51,7 @@ export const SwapExecutionPageRouteDetailed = ({
   operations,
   statusData,
   onClickEditDestinationWallet: _onClickEditDestinationWallet,
-  swapExecutionState
+  swapExecutionState,
 }: SwapExecutionPageRouteProps) => {
   const { data: swapVenues } = useAtomValue(skipSwapVenuesAtom);
   const { data: bridges } = useAtomValue(skipBridgesAtom);
@@ -87,6 +87,7 @@ export const SwapExecutionPageRouteDetailed = ({
     return _onClickEditDestinationWallet;
   }, [isSignRequired, chainAddresses, swapExecutionState, _onClickEditDestinationWallet]);
 
+
   return (
     <StyledSwapExecutionPageRoute>
       <Column>

diff --git a/packages/widget/src/pages/SwapExecutionPage/SwapExecutionPageRouteSimple.tsx b/packages/widget/src/pages/SwapExecutionPage/SwapExecutionPageRouteSimple.tsx
@@ -21,7 +21,7 @@ export const SwapExecutionPageRouteSimple = ({
   operations,
   statusData,
   onClickEditDestinationWallet: _onClickEditDestinationWallet,
-  swapExecutionState
+  swapExecutionState,
 }: SwapExecutionPageRouteProps) => {
   const theme = useTheme();
   const { route } = useAtomValue(swapExecutionStateAtom);
@@ -33,17 +33,15 @@ export const SwapExecutionPageRouteSimple = ({
   const sourceStatus = swapExecutionState === SwapExecutionState.confirmed ? "completed" : status?.[firstOperation.transferIndex]?.status;
   const destinationStatus = swapExecutionState === SwapExecutionState.confirmed ? "completed" : status?.[lastOperation.transferIndex]?.status;
 
-  const sourceDenom = firstOperation.denomIn;
-  const destinationDenom = lastOperation.denomOut;
 
   const source = {
-    denom: sourceDenom,
+    denom: firstOperation.denomIn,
     tokenAmount: firstOperation.amountIn,
     chainId: firstOperation.fromChainID ?? firstOperation.chainID,
     usdValue: route?.usdAmountIn,
   };
   const destination = {
-    denom: destinationDenom,
+    denom: lastOperation.denomOut,
     tokenAmount: lastOperation.amountOut,
     chainId: lastOperation.toChainID ?? lastOperation.chainID,
     usdValue: route?.usdAmountOut,

diff --git a/packages/widget/src/utils/clientType.ts b/packages/widget/src/utils/clientType.ts
@@ -127,6 +127,12 @@ function getOperationDetailsAndType(operation: SkipClientOperation) {
             operationDetails as EvmSwap
           ).fromChainID;
           break;
+        // special case needed for axelar transfers where the source denom is not the first operation denom
+        case OperationType.axelarTransfer:
+          (operationDetails as Transfer).denomIn = (
+            operationDetails as AxelarTransfer
+          ).ibcTransferToAxelar?.denomIn ?? (operationDetails as Transfer).denomIn;
+          break;
         case OperationType.bankSend:
           (operationDetails as Transfer).denomIn = (
             operationDetails as BankSend