cleanup

Author: chrstph-dvx

packages/arb-token-bridge-ui/src/components/TransferPanel/Routes/ArbitrumCanonicalRoute.tsx

@@ -3,6 +3,7 @@ import { utils } from 'ethers';
 import { useMemo } from 'react';
 import { shallow } from 'zustand/shallow';
 
+import { getTokenOverride } from '../../../app/api/crosschain-transfers/utils';
 import { useGasSummary } from '../../../hooks/TransferPanel/useGasSummary';
 import { useNativeCurrency } from '../../../hooks/useNativeCurrency';
 import { useNetworks } from '../../../hooks/useNetworks';
@@ -107,7 +108,16 @@ export function ArbitrumCanonicalRoute() {
    * - Depositing USDC, we receive USDC.e on Arbitrum
    */
   const isUsdcTransfer = isTokenNativeUSDC(selectedToken?.address);
-  const overrideToken = isDepositMode ? bridgedUsdcToken : nativeUsdcToken;
+  const routeTokenOverride = getTokenOverride({
+    fromToken: selectedToken?.address,
+    sourceChainId: networks.sourceChain.id,
+    destinationChainId: networks.destinationChain.id,
+  });
+  const overrideToken = isUsdcTransfer
+    ? isDepositMode
+      ? bridgedUsdcToken
+      : nativeUsdcToken
+    : routeTokenOverride.destination ?? undefined;
 
   const durationMs =
     getDuration({
@@ -132,7 +142,7 @@ export function ArbitrumCanonicalRoute() {
       durationMs={durationMs}
       amountReceived={arbitrumData.amountReceived}
       isLoadingGasEstimate={isLoading}
-      overrideToken={isUsdcTransfer ? overrideToken : undefined}
+      overrideToken={overrideToken}
       gasCost={
         gasCost && gasCost.length > 0
           ? gasCost.map(({ gasCost, gasToken }) => ({

packages/arb-token-bridge-ui/src/hooks/__tests__/useDestinationToken.test.ts

@@ -12,6 +12,7 @@ import { ChainId } from '../../types/ChainId';
 import { CommonAddress } from '../../util/CommonAddressUtils';
 import {
   ETHEREUM_PYUSD_LOGO_URI,
+  getArbitrumOnePyusdCanonicalToken,
   getArbitrumOnePyusdOftToken,
   getEthereumPyusdToken,
 } from '../../util/PyusdUtils';

packages/arb-token-bridge-ui/src/util/PyusdUtils.ts

@@ -101,6 +101,13 @@ export function getPyusdTokenOverride({
     };
   }
 
+  if (!isDepositMode && isTokenArbitrumOnePyusdCanonical(tokenAddress)) {
+    return {
+      source: getArbitrumOnePyusdCanonicalToken(),
+      destination: getEthereumPyusdToken(),
+    };
+  }
+
   return null;
 }
 
@@ -111,7 +118,11 @@ export function isPyusdOverrideFlow({
   tokenAddress: string | undefined;
   isDepositMode: boolean;
 }) {
-  return !!getPyusdTokenOverride({ tokenAddress, isDepositMode });
+  if (isDepositMode) {
+    return isTokenEthereumPyusd(tokenAddress);
+  }
+
+  return isTokenArbitrumOnePyusdOft(tokenAddress);
 }
 
 export function getPyusdTokenForTransfer({

packages/arb-token-bridge-ui/src/util/__tests__/PyusdUtils.test.ts

@@ -25,13 +25,19 @@ describe('getPyusdTokenOverride', () => {
     });
   });
 
-  it('does not override canonical withdrawals', () => {
+  it('overrides canonical withdrawals to black-logo L1 PYUSD on destination', () => {
     expect(
       getPyusdTokenOverride({
         tokenAddress: CommonAddress.ArbitrumOne.PYUSDCanonical,
         isDepositMode: false,
       }),
-    ).toBeNull();
+    ).toMatchObject({
+      source: {
+        address: CommonAddress.ArbitrumOne.PYUSDCanonical,
+        logoURI: ARBITRUM_ONE_PYUSD_OFT_LOGO_URI,
+      },
+      destination: { address: CommonAddress.Ethereum.PYUSD, logoURI: ETHEREUM_PYUSD_LOGO_URI },
+    });
   });
 });