Merge branch 'main' into feat/enable-stx-migration

MetaMask · Dec 13, 2024 · 775fc85 · 775fc85
2 parents cf008ed + bb1c77e
commit 775fc85
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 32 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
@@ -393,7 +393,7 @@ export function useTransactionDisplayData(transactionGroup) {
     primarySuffix = bridgeTokenDisplayData.sourceTokenSymbol;
     primaryDisplayValue = formatAmount(
       locale,
-      new BigNumber(bridgeTokenDisplayData.sourceTokenAmountSent),
+      new BigNumber(bridgeTokenDisplayData.sourceTokenAmountSent ?? 0),
     );
     secondaryDisplayValue = bridgeTokenDisplayData.displayCurrencyAmount;
   } else {

diff --git a/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js b/ui/pages/swaps/prepare-swap-page/prepare-swap-page.js
@@ -63,9 +63,7 @@ import {
   isHardwareWallet,
   getHardwareWalletType,
   getIsBridgeChain,
-  getMetaMetricsId,
-  getParticipateInMetaMetrics,
-  getDataCollectionForMarketing,
+  getIsBridgeEnabled,
 } from '../../../selectors';
 import {
   getSmartTransactionsEnabled,
@@ -77,7 +75,6 @@ import {
   hexToDecimal,
 } from '../../../../shared/modules/conversion.utils';
 import { getURLHostName } from '../../../helpers/utils/util';
-import { getPortfolioUrl } from '../../../helpers/utils/portfolio';
 import { usePrevious } from '../../../hooks/usePrevious';
 import { useTokenTracker } from '../../../hooks/useTokenTracker';
 import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
@@ -143,6 +140,7 @@ import SwapsFooter from '../swaps-footer';
 import SelectedToken from '../selected-token/selected-token';
 import ListWithSearch from '../list-with-search/list-with-search';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
+import useBridging from '../../../hooks/bridge/useBridging';
 import { SmartTransactionsBannerAlert } from '../../confirmations/components/smart-transactions-banner-alert';
 import QuotesLoadingAnimation from './quotes-loading-animation';
 import ReviewQuote from './review-quote';
@@ -158,6 +156,7 @@ export default function PrepareSwapPage({
   const dispatch = useDispatch();
   const history = useHistory();
   const trackEvent = useContext(MetaMetricsContext);
+  const { openBridgeExperience } = useBridging();
 
   const [fetchedTokenExchangeRate, setFetchedTokenExchangeRate] =
     useState(undefined);
@@ -177,6 +176,7 @@ export default function PrepareSwapPage({
   const [prefetchingQuotes, setPrefetchingQuotes] = useState(false);
   const [rotateSwitchTokens, setRotateSwitchTokens] = useState(false);
 
+  const isBridgeSupported = useSelector(getIsBridgeEnabled);
   const isFeatureFlagLoaded = useSelector(getIsFeatureFlagLoaded);
   const balanceError = useSelector(getBalanceError);
   const fetchParams = useSelector(getFetchParams, isEqual);
@@ -208,7 +208,6 @@ export default function PrepareSwapPage({
     ? Object.keys(aggregatorMetadata).length
     : 0;
   const isBridgeChain = useSelector(getIsBridgeChain);
-  const metaMetricsId = useSelector(getMetaMetricsId);
 
   const tokenConversionRates = useSelector(getTokenExchangeRates, isEqual);
   const conversionRate = useSelector(getConversionRate);
@@ -227,8 +226,6 @@ export default function PrepareSwapPage({
   const currentCurrency = useSelector(getCurrentCurrency);
   const fetchingQuotes = useSelector(getFetchingQuotes);
   const loadingComplete = !fetchingQuotes && areQuotesPresent;
-  const isMetaMetricsEnabled = useSelector(getParticipateInMetaMetrics);
-  const isMarketingEnabled = useSelector(getDataCollectionForMarketing);
 
   const fetchParamsFromToken = isSwapsDefaultTokenAddress(
     sourceTokenInfo?.address,
@@ -1064,41 +1061,22 @@ export default function PrepareSwapPage({
         </div>
         {showCrossChainSwapsLink && (
           <ButtonLink
-            endIconName={IconName.Export}
+            endIconName={isBridgeSupported ? undefined : IconName.Export}
             endIconProps={{
               size: IconSize.Xs,
             }}
             variant={TextVariant.bodySm}
             marginTop={2}
             fontWeight={FontWeight.Normal}
             onClick={() => {
-              const portfolioUrl = getPortfolioUrl(
-                'bridge',
-                'ext_bridge_prepare_swap_link',
-                metaMetricsId,
-                isMetaMetricsEnabled,
-                isMarketingEnabled,
-              );
-
-              global.platform.openTab({
-                url: `${portfolioUrl}&token=${fromTokenAddress}`,
-              });
-
-              trackEvent({
-                category: MetaMetricsEventCategory.Swaps,
-                event: MetaMetricsEventName.BridgeLinkClicked,
-                properties: {
-                  location: 'Swaps',
-                  text: 'Swap across networks with MetaMask Portfolio',
-                  chain_id: chainId,
-                  token_symbol: fromTokenSymbol,
-                },
-              });
+              openBridgeExperience('Swaps', fromToken);
             }}
             target="_blank"
             data-testid="prepare-swap-page-cross-chain-swaps-link"
           >
-            {t('crossChainSwapsLink')}
+            {isBridgeSupported
+              ? t('crossChainSwapsLinkNative')
+              : t('crossChainSwapsLink')}
           </ButtonLink>
         )}
         {!showReviewQuote && toTokenIsNotDefault && occurrences < 2 && (