fix: use toToken from execution if present

lifinance · Nov 9, 2022 · 3afa3e5 · 3afa3e5
1 parent 519c253
commit 3afa3e5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 29 deletions.
diff --git a/packages/widget/src/components/StepActions/StepActions.tsx b/packages/widget/src/components/StepActions/StepActions.tsx
@@ -124,7 +124,7 @@ export const StepDetailsContent: React.FC<{ step: Step }> = ({ step }) => {
           step.execution?.toToken?.decimals ?? step.action.toToken.decimals,
         ),
       })}{' '}
-      {step.action.toToken.symbol}
+      {step.execution?.toToken?.symbol ?? step.action.toToken.symbol}
     </Typography>
   );
 };

diff --git a/packages/widget/src/pages/SwapHistoryPage/SwapHistoryItem.tsx b/packages/widget/src/pages/SwapHistoryPage/SwapHistoryItem.tsx
@@ -22,6 +22,11 @@ export const SwapHistoryItem: React.FC<{
   const startedAt = new Date(
     route.steps[0].execution?.process[0].startedAt ?? 0,
   );
+  const fromToken = { ...route.fromToken, amount: route.fromAmount };
+  const toToken = {
+    ...(route.steps.at(-1)?.execution?.toToken ?? route.toToken),
+    amount: route.steps.at(-1)?.execution?.toAmount ?? route.toAmount,
+  };
   return (
     <Card onClick={handleClick}>
       <Box
@@ -45,22 +50,9 @@ export const SwapHistoryItem: React.FC<{
         </Typography>
       </Box>
       <Box py={1}>
-        <Token
-          token={{ ...route.fromToken, amount: route.fromAmount }}
-          px={2}
-          pt={1}
-          connected
-        />
+        <Token token={fromToken} px={2} pt={1} connected />
         <TokenDivider />
-        <Token
-          token={{
-            ...route.toToken,
-            amount: route.steps.at(-1)?.execution?.toAmount ?? route.toAmount,
-          }}
-          px={2}
-          pt={0.5}
-          pb={1}
-        />
+        <Token token={toToken} px={2} pt={0.5} pb={1} />
       </Box>
     </Card>
   );

diff --git a/packages/widget/src/pages/SwapPage/StatusBottomSheet.tsx b/packages/widget/src/pages/SwapPage/StatusBottomSheet.tsx
@@ -31,8 +31,17 @@ export const StatusBottomSheet: React.FC<RouteExecution> = ({
   const ref = useRef<BottomSheetBase>(null);
   const { getChainById } = useChains();
   const { setValue } = useFormContext();
+
+  const toToken = {
+    ...(route.steps.at(-1)?.execution?.toToken ?? route.toToken),
+    amount:
+      route.steps.at(-1)?.execution?.toAmount ??
+      route.steps.at(-1)?.estimate.toAmount ??
+      route.toAmount,
+  };
+
   const { token, refetch, refetchNewBalance, refetchAllBalances } =
-    useTokenBalance(route.toToken, route.toAddress);
+    useTokenBalance(toToken, route.toAddress);
 
   const clearFromAmount = () => {
     refetchAllBalances();
@@ -114,17 +123,7 @@ export const StatusBottomSheet: React.FC<RouteExecution> = ({
             {title}
           </Typography>
           {status === 'success' ? (
-            <Token
-              token={{
-                ...route.toToken,
-                amount:
-                  route.steps.at(-1)?.execution?.toAmount ??
-                  route.steps.at(-1)?.estimate.toAmount ??
-                  route.toAmount,
-              }}
-              py={1}
-              disableDescription
-            />
+            <Token token={toToken} py={1} disableDescription />
           ) : null}
         </IconContainer>
         <Typography py={1}>{message}</Typography>
@@ -141,7 +140,7 @@ export const StatusBottomSheet: React.FC<RouteExecution> = ({
         </Box>
         {status === 'success' ? (
           <Box mt={2}>
-            <Button variant="text" fullWidth onClick={handleSeeDetails}>
+            <Button variant="text" onClick={handleSeeDetails} fullWidth>
               {t('button.seeDetails')}
             </Button>
           </Box>