chore: fix last comments

rango-exchange · Dec 19, 2023 · da2b8f7 · da2b8f7
1 parent d53f73b
commit da2b8f7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/components/detail/SwapSteps/SwapStepChainAmount.tsx b/components/detail/SwapSteps/SwapStepChainAmount.tsx
@@ -3,15 +3,22 @@ import React from 'react';
 import { SwapStepChainLogoProps } from './SwapSteps.type';
 
 function SwapStepChainAmount(props: SwapStepChainLogoProps) {
-  const { token } = props;
+  const { token, firstStep } = props;
   const { symbol, name, realAmount, expectedAmount } = token;
   return (
     <>
-      {isNaN(realAmount)
-        ? `Est. ~${expectedAmount.toFixed(2)} ${symbol || name}`
-        : `${realAmount.toFixed(2)} ${symbol}  (Est. ~${expectedAmount.toFixed(
-            2,
-          )} ${symbol || name})`}
+      {firstStep && `${realAmount.toFixed(2)} ${symbol}`}
+      {!firstStep && (
+        <>
+          {isNaN(realAmount)
+            ? `Est. ~${expectedAmount.toFixed(2)} ${symbol || name}`
+            : `${realAmount.toFixed(
+                2,
+              )} ${symbol}  (Est. ~${expectedAmount.toFixed(2)} ${
+                symbol || name
+              })`}
+        </>
+      )}
     </>
   );
 }

diff --git a/components/detail/SwapSteps/SwapStepItem.tsx b/components/detail/SwapSteps/SwapStepItem.tsx
@@ -36,7 +36,7 @@ function SwapStepItem(props: SwapStepItemProps) {
             <div className="flex items-center">
               <SwapStepChainLogo token={from} />
               <span className="text-12 ml-5 text-neutral-400">
-                <SwapStepChainAmount token={from} />
+                <SwapStepChainAmount firstStep={firstStep} token={from} />
               </span>
             </div>
             <div
@@ -51,7 +51,7 @@ function SwapStepItem(props: SwapStepItemProps) {
           <div className="hidden md:flex items-center my-15">
             <SwapStepChainLogo token={from} />
             <span className="text-14 text-neutral-400">
-              <SwapStepChainAmount token={from} />
+              <SwapStepChainAmount firstStep={firstStep} token={from} />
             </span>
             <NextIcon className="mx-10 text-primary-500" />
             <SwapStepChainLogo token={to} />

diff --git a/components/detail/SwapSteps/SwapStepSwapper.tsx b/components/detail/SwapSteps/SwapStepSwapper.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
 import React from 'react';
 import { SwapStepItemProps } from './SwapSteps.type';
-import { InternalPathType, SwapStatus } from 'types';
+import { InternalPathType } from 'types';
 import { BorderColor } from './SwapSteps.helper';
 
 function SwapStepSwapper(props: SwapStepItemProps) {
@@ -19,9 +19,7 @@ function SwapStepSwapper(props: SwapStepItemProps) {
           to: internalTo,
           swapper: internalSwapper,
         } = swapperItem;
-        const swapperStatus: SwapStatus =
-          index === swappers.length - 1 ? status : 'success';
-        const borderColor = BorderColor[swapperStatus];
+        const borderColor = BorderColor[status];
 
         return (
           <>
@@ -40,7 +38,7 @@ function SwapStepSwapper(props: SwapStepItemProps) {
               <div className="text-12 md:text-18 text-primary-500">
                 {internalSwapper?.swapperType === 'DEX'
                   ? `Swap on ${internalFrom?.blockchain} via ${internalSwapper?.swapperTitle}`
-                  : `Swap from ${internalFrom?.blockchain} to ${internalTo?.blockchain} via ${internalSwapper?.swapperTitle}`}
+                  : `Bridge from ${internalFrom?.blockchain} to ${internalTo?.blockchain} via ${internalSwapper?.swapperTitle}`}
               </div>
             </div>
           </>

diff --git a/components/detail/SwapSteps/SwapSteps.type.ts b/components/detail/SwapSteps/SwapSteps.type.ts
@@ -12,6 +12,7 @@ export interface SwapStepItemProps {
 
 export interface SwapStepChainLogoProps {
   token: AssetType;
+  firstStep?: boolean;
 }
 
 export interface SwapStepItemExpandedProps {