conditionally render gas row if non-zero (#1320)

wormhole-foundation · Dec 12, 2023 · bcc19c8 · bcc19c8
1 parent f9f43f1
commit bcc19c8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/wormhole-connect/src/routes/cctpRelay/cctpRelay.ts b/wormhole-connect/src/routes/cctpRelay/cctpRelay.ts
@@ -537,7 +537,7 @@ export class CCTPRelayRoute extends CCTPManualRoute implements RelayAbstract {
       MAX_DECIMALS,
     );
     const { gasToken } = CHAINS[txData.toChain]!;
-    return [
+    let rows = [
       {
         title: 'Amount',
         value: `${formattedAmt} ${getDisplayName(token)}`,
@@ -552,13 +552,18 @@ export class CCTPRelayRoute extends CCTPManualRoute implements RelayAbstract {
         title: 'Relayer fee',
         value: `${formattedFee} ${getDisplayName(token)}`,
       },
-      {
+    ];
+
+    if (!BigNumber.from(txData.toNativeTokenAmount).isZero()) {
+      rows.push({
         title: 'Convert to native gas token',
         value: `≈ ${formattedToNative} ${getDisplayName(
           token,
         )} \u2192 ${getDisplayName(TOKENS[gasToken])}`,
-      },
-    ];
+      });
+    }
+
+    return rows;
   }
 
   async getTransferDestInfo({

diff --git a/wormhole-connect/src/routes/relay/relay.ts b/wormhole-connect/src/routes/relay/relay.ts
@@ -457,13 +457,8 @@ export class RelayRoute extends BridgeRoute implements RelayAbstract {
       txData.tokenDecimals,
       MAX_DECIMALS,
     );
-    const formattedToNative = toNormalizedDecimals(
-      txData.toNativeTokenAmount,
-      txData.tokenDecimals,
-      MAX_DECIMALS,
-    );
     const { gasToken } = CHAINS[txData.toChain]!;
-    return [
+    let rows = [
       {
         title: 'Amount',
         value: `${formattedAmt} ${getDisplayName(token)}`,
@@ -478,13 +473,24 @@ export class RelayRoute extends BridgeRoute implements RelayAbstract {
         title: 'Relayer fee',
         value: `${formattedFee} ${getDisplayName(token)}`,
       },
-      {
+    ];
+
+    if (!BigNumber.from(txData.toNativeTokenAmount).isZero()) {
+      const formattedToNative = toNormalizedDecimals(
+        txData.toNativeTokenAmount,
+        txData.tokenDecimals,
+        MAX_DECIMALS,
+      );
+
+      rows.push({
         title: 'Convert to native gas token',
         value: `≈ ${formattedToNative} ${getDisplayName(
           token,
         )} \u2192 ${getDisplayName(TOKENS[gasToken])}`,
-      },
-    ];
+      });
+    }
+
+    return rows;
   }
 
   async getTransferDestInfo({