Merge branch 'main' into enable-predict-market-details-performance

Author: chrisleewilcox

app/components/UI/Earn/Views/EarnInputView/EarnInputView.tsx

@@ -646,26 +646,27 @@ const EarnInputView = () => {
     // Call the original handler first
     handleCurrencySwitch();
 
-    if (shouldLogStablecoinEvent()) {
-      trackEvent(
-        createEventBuilder(MetaMetricsEvents.EARN_INPUT_CURRENCY_SWITCH_CLICKED)
-          .addProperties({
-            selected_provider: EVENT_PROVIDERS.CONSENSYS,
-            text: 'Currency Switch Clicked',
-            location: EVENT_LOCATIONS.EARN_INPUT_VIEW,
-            currency_type: !isFiat ? 'fiat' : 'native',
-            experience: earnToken?.experience?.type,
-          })
-          .build(),
-      );
-    }
+    trackEvent(
+      createEventBuilder(MetaMetricsEvents.EARN_INPUT_CURRENCY_SWITCH_CLICKED)
+        .addProperties({
+          selected_provider: EVENT_PROVIDERS.CONSENSYS,
+          text: 'Currency Switch Clicked',
+          location: EVENT_LOCATIONS.EARN_INPUT_VIEW,
+          currency_type: !isFiat ? 'fiat' : 'native',
+          experience: earnToken?.experience?.type,
+          token_symbol: earnToken?.symbol,
+          chain_id: earnToken?.chainId ? toHex(earnToken.chainId) : undefined,
+        })
+        .build(),
+    );
   }, [
-    shouldLogStablecoinEvent,
     handleCurrencySwitch,
     trackEvent,
     createEventBuilder,
     isFiat,
     earnToken?.experience?.type,
+    earnToken?.symbol,
+    earnToken?.chainId,
   ]);
 
   const getButtonLabel = () => {

app/components/UI/Earn/Views/EarnWithdrawInputView/EarnWithdrawInputView.tsx

@@ -1,3 +1,4 @@
+import { toHex } from '@metamask/controller-utils';
 import { Hex } from '@metamask/utils';
 import {
   useFocusEffect,
@@ -576,6 +577,10 @@ const EarnWithdrawInputView = () => {
             // We want to track the currency switching to. Not the current currency.
             currency_type: isFiat ? 'native' : 'fiat',
             experience: receiptToken?.experience?.type,
+            token_symbol: receiptToken?.symbol,
+            chain_id: receiptToken?.chainId
+              ? toHex(receiptToken.chainId)
+              : undefined,
           })
           .build(),
       );
@@ -591,6 +596,10 @@ const EarnWithdrawInputView = () => {
             // We want to track the currency switching to. Not the current currency.
             currency_type: isFiat ? 'native' : 'fiat',
             experience: receiptToken?.experience?.type,
+            token_symbol: receiptToken?.symbol,
+            chain_id: receiptToken?.chainId
+              ? toHex(receiptToken.chainId)
+              : undefined,
           })
           .build(),
       );
@@ -603,6 +612,8 @@ const EarnWithdrawInputView = () => {
     createEventBuilder,
     isFiat,
     receiptToken?.experience?.type,
+    receiptToken?.symbol,
+    receiptToken?.chainId,
   ]);
 
   const handleQuickAmountPressWithTracking = useCallback(

app/components/UI/Ramp/Aggregator/Views/BuildQuote/BuildQuote.tsx

@@ -139,7 +139,6 @@ const BuildQuote = () => {
     selectedRegion,
     selectedAsset,
     selectedFiatCurrencyId,
-    setSelectedFiatCurrencyId,
     selectedAddress,
     selectedNetworkName,
     sdkError,
@@ -183,7 +182,6 @@ const BuildQuote = () => {
   }, [paymentMethods, themeAppearance]);
 
   const {
-    defaultFiatCurrency,
     queryDefaultFiatCurrency,
     fiatCurrencies,
     queryGetFiatCurrencies,
@@ -245,31 +243,6 @@ const BuildQuote = () => {
     }, [shouldShowUnsupportedModal, navigation, regions, selectedRegion]),
   );
 
-  useEffect(() => {
-    const handleRegionChange = async () => {
-      if (
-        selectedRegion &&
-        selectedFiatCurrencyId === defaultFiatCurrency?.id
-      ) {
-        const newRegionCurrency = await queryDefaultFiatCurrency(
-          selectedRegion.id,
-        );
-        if (newRegionCurrency?.id) {
-          setSelectedFiatCurrencyId(newRegionCurrency.id);
-        }
-      }
-    };
-
-    handleRegionChange();
-  }, [
-    selectedRegion,
-    selectedFiatCurrencyId,
-    defaultFiatCurrency?.id,
-    queryDefaultFiatCurrency,
-    selectedPaymentMethodId,
-    setSelectedFiatCurrencyId,
-  ]);
-
   const gasLimitEstimation = useERC20GasLimitEstimation({
     tokenAddress: selectedAsset?.address,
     fromAddress: selectedAddress,

app/components/UI/Ramp/Aggregator/hooks/useFiatCurrencies.test.ts

@@ -1,3 +1,4 @@
+import { act } from '@testing-library/react-native';
 import { RampSDK } from '../sdk';
 import useFiatCurrencies from './useFiatCurrencies';
 import useSDKMethod from './useSDKMethod';
@@ -325,4 +326,107 @@ describe('useFiatCurrencies', () => {
       mockUseRampSDKValues.setSelectedFiatCurrencyId,
     ).not.toHaveBeenCalled();
   });
+
+  it('updates currency when region changes and using default currency', async () => {
+    const mockQueryDefaultFiatCurrency = jest.fn();
+    const mockSetSelectedFiatCurrencyId = jest.fn();
+
+    mockUseRampSDKValues.selectedRegion = { id: 'region-1' };
+    mockUseRampSDKValues.selectedFiatCurrencyId = 'default-fiat-currency-id';
+    mockUseRampSDKValues.setSelectedFiatCurrencyId =
+      mockSetSelectedFiatCurrencyId;
+
+    mockQueryDefaultFiatCurrency.mockResolvedValue({
+      id: 'new-region-currency',
+    });
+
+    (useSDKMethod as jest.Mock)
+      .mockReturnValueOnce([
+        {
+          data: { id: 'default-fiat-currency-id' },
+          error: null,
+          isFetching: false,
+        },
+        mockQueryDefaultFiatCurrency,
+      ])
+      .mockReturnValueOnce([
+        {
+          data: [{ id: 'default-fiat-currency-id' }],
+          error: null,
+          isFetching: false,
+        },
+        jest.fn(),
+      ])
+      .mockReturnValueOnce([
+        {
+          data: { id: 'default-fiat-currency-id' },
+          error: null,
+          isFetching: false,
+        },
+        mockQueryDefaultFiatCurrency,
+      ])
+      .mockReturnValueOnce([
+        {
+          data: [{ id: 'default-fiat-currency-id' }],
+          error: null,
+          isFetching: false,
+        },
+        jest.fn(),
+      ]);
+
+    const { rerender } = renderHookWithProvider(() => useFiatCurrencies());
+
+    mockUseRampSDKValues.selectedRegion = { id: 'region-2' };
+
+    await act(async () => {
+      rerender(() => useFiatCurrencies());
+      await new Promise((resolve) => setTimeout(resolve, 50));
+    });
+
+    expect(mockQueryDefaultFiatCurrency).toHaveBeenCalledWith('region-2');
+    expect(mockSetSelectedFiatCurrencyId).toHaveBeenCalledWith(
+      'new-region-currency',
+    );
+  });
+
+  it('does not update currency when region changes but not using default currency', async () => {
+    const mockQueryDefaultFiatCurrency = jest.fn();
+    const mockSetSelectedFiatCurrencyId = jest.fn();
+
+    mockUseRampSDKValues.selectedRegion = { id: 'region-1' };
+    mockUseRampSDKValues.selectedFiatCurrencyId = 'custom-currency-id';
+    mockUseRampSDKValues.setSelectedFiatCurrencyId =
+      mockSetSelectedFiatCurrencyId;
+
+    (useSDKMethod as jest.Mock)
+      .mockReturnValue([
+        {
+          data: { id: 'default-fiat-currency-id' },
+          error: null,
+          isFetching: false,
+        },
+        mockQueryDefaultFiatCurrency,
+      ])
+      .mockReturnValue([
+        {
+          data: [
+            { id: 'custom-currency-id' },
+            { id: 'default-fiat-currency-id' },
+          ],
+          error: null,
+          isFetching: false,
+        },
+        jest.fn(),
+      ]);
+
+    const { rerender } = renderHookWithProvider(() => useFiatCurrencies());
+
+    mockUseRampSDKValues.selectedRegion = { id: 'region-2' };
+
+    rerender(() => useFiatCurrencies());
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(mockSetSelectedFiatCurrencyId).not.toHaveBeenCalled();
+  });
 });

app/components/UI/Ramp/Aggregator/hooks/useFiatCurrencies.ts

@@ -1,6 +1,7 @@
 import { useEffect, useMemo } from 'react';
 import { useRampSDK } from '../sdk';
 import useSDKMethod from './useSDKMethod';
+import usePrevious from '../../../../hooks/usePrevious';
 
 export default function useFiatCurrencies() {
   const {
@@ -75,6 +76,35 @@ export default function useFiatCurrencies() {
     setSelectedFiatCurrencyId,
   ]);
 
+  const previousRegion = usePrevious(selectedRegion);
+
+  /**
+   * Update fiat currency when region changes and using default currency.
+   */
+  useEffect(() => {
+    const handleRegionChange = async () => {
+      if (selectedRegion && previousRegion?.id !== selectedRegion.id) {
+        if (selectedFiatCurrencyId === defaultFiatCurrency?.id) {
+          const newRegionCurrency = await queryDefaultFiatCurrency(
+            selectedRegion.id,
+          );
+          if (newRegionCurrency?.id) {
+            setSelectedFiatCurrencyId(newRegionCurrency.id);
+          }
+        }
+      }
+    };
+
+    handleRegionChange();
+  }, [
+    selectedRegion,
+    previousRegion,
+    selectedFiatCurrencyId,
+    defaultFiatCurrency?.id,
+    queryDefaultFiatCurrency,
+    setSelectedFiatCurrencyId,
+  ]);
+
   /**
    * Get the fiat currency object by id
    */

package.json

@@ -199,7 +199,7 @@
     "@metamask/approval-controller": "^8.0.0",
     "@metamask/assets-controllers": "^87.1.1",
     "@metamask/base-controller": "^9.0.0",
-    "@metamask/bitcoin-wallet-snap": "^1.4.4",
+    "@metamask/bitcoin-wallet-snap": "^1.4.5",
     "@metamask/bridge-controller": "^56.0.3",
     "@metamask/bridge-status-controller": "^56.0.0",
     "@metamask/chain-agnostic-permission": "^1.2.2",

yarn.lock

@@ -7058,10 +7058,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/bitcoin-wallet-snap@npm:^1.4.4":
-  version: 1.4.4
-  resolution: "@metamask/bitcoin-wallet-snap@npm:1.4.4"
-  checksum: 10/bc568397e35a17e04919f320e47b49cd35136cec3a58336ece6131d5ad3a73a75d35909187ea55b2e3b0828be45eb7abbbacbdf7829b6f64ceac897ddaaf232c
+"@metamask/bitcoin-wallet-snap@npm:^1.4.5":
+  version: 1.4.5
+  resolution: "@metamask/bitcoin-wallet-snap@npm:1.4.5"
+  checksum: 10/861d2d4d6b036897cd9dde29f52e598e4b654993307cce99b6f8d0c2616b1728ebfa8d138cefe1fa40e97244a2a7eb6ba86393f8c2610e0247bd6154b9e0a28f
   languageName: node
   linkType: hard
 
@@ -34260,7 +34260,7 @@ __metadata:
     "@metamask/assets-controllers": "npm:^87.1.1"
     "@metamask/auto-changelog": "npm:^5.1.0"
     "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/bitcoin-wallet-snap": "npm:^1.4.4"
+    "@metamask/bitcoin-wallet-snap": "npm:^1.4.5"
     "@metamask/bridge-controller": "npm:^56.0.3"
     "@metamask/bridge-status-controller": "npm:^56.0.0"
     "@metamask/browser-passworder": "npm:^5.0.0"