Merge branch 'main' into zs/new-browsing-experience

app/components/UI/OptinMetrics/__snapshots__/index.test.tsx.snap

@@ -694,7 +694,7 @@ exports[`OptinMetrics render matches snapshot 1`] = `
                                   }
                                 }
                               >
-                                We'll use this data to learn how you interact with our marketing communications. We may share relavent news (like product features).
+                                We'll use this data to learn how you interact with our marketing communications. We may share relevant news (like product features).
                               </Text>
                             </TouchableOpacity>
                             <View>

app/components/UI/Ramp/hooks/useCryptoCurrencies.test.ts

@@ -14,6 +14,7 @@ const mockuseRampSDKInitialValues: DeepPartial<RampSDK> = {
   selectedFiatCurrencyId: 'test-fiat-currency-id',
   selectedAsset: null,
   setSelectedAsset: jest.fn(),
+  setIntent: jest.fn(),
   selectedChainId: '1',
   isBuy: true,
 };
@@ -354,4 +355,54 @@ describe('useCryptoCurrencies', () => {
       queryGetCryptoCurrencies: mockQueryGetCryptoCurrencies,
     });
   });
+
+  it('selects the crypto currency from intent if available and resets it', () => {
+    const mockQueryGetCryptoCurrencies = jest.fn();
+    (useSDKMethod as jest.Mock).mockReturnValue([
+      {
+        data: [
+          { network: { chainId: '1' }, address: 'test-address-1' },
+          { network: { chainId: '1' }, address: 'test-address-2' },
+          { network: { chainId: '1' }, address: NATIVE_ADDRESS },
+        ],
+        error: null,
+        isFetching: false,
+      },
+      mockQueryGetCryptoCurrencies,
+    ]);
+
+    mockUseRampSDKValues.selectedAsset = {
+      network: { chainId: '1' },
+      address: 'test-address-3',
+    };
+
+    const mockedIntent = { address: 'test-address-2' };
+    mockUseRampSDKValues.intent = mockedIntent;
+
+    const { result } = renderHookWithProvider(() => useCryptoCurrencies());
+
+    expect(mockUseRampSDKValues.setSelectedAsset).toHaveBeenCalledWith({
+      network: { chainId: '1' },
+      address: 'test-address-2',
+    });
+    expect(result.current).toEqual({
+      cryptoCurrencies: [
+        { network: { chainId: '1' }, address: 'test-address-1' },
+        { network: { chainId: '1' }, address: 'test-address-2' },
+        { network: { chainId: '1' }, address: NATIVE_ADDRESS },
+      ],
+      errorCryptoCurrencies: null,
+      isFetchingCryptoCurrencies: false,
+      queryGetCryptoCurrencies: mockQueryGetCryptoCurrencies,
+    });
+
+    expect(mockUseRampSDKValues.setIntent).toHaveBeenCalledWith(
+      expect.any(Function),
+    );
+    const setIntentFunction = (mockUseRampSDKValues.setIntent as jest.Mock).mock
+      .calls[0][0];
+    expect(setIntentFunction(mockedIntent)).toEqual({
+      address: undefined,
+    });
+  });
 });

app/components/UI/Ramp/hooks/useCryptoCurrencies.ts

@@ -13,6 +13,7 @@ export default function useCryptoCurrencies() {
     selectedChainId,
     isBuy,
     intent,
+    setIntent,
   } = useRampSDK();
 
   const [
@@ -62,6 +63,7 @@ export default function useCryptoCurrencies() {
         );
         if (intentAsset) {
           setSelectedAsset(intentAsset);
+          setIntent((prevIntent) => ({ ...prevIntent, address: undefined }));
           return;
         }
       }
@@ -85,6 +87,7 @@ export default function useCryptoCurrencies() {
     selectedAsset,
     selectedChainId,
     setSelectedAsset,
+    setIntent,
   ]);
 
   return {

app/components/Views/NetworkSelector/NetworkSelector.styles.ts

@@ -154,6 +154,28 @@ const createStyles = (colors: Colors) =>
       fontSize: 10,
       marginTop: 4,
     },
+    screen: { justifyContent: 'flex-end' },
+    scrollableDescription: {
+      maxHeight: Device.getDeviceHeight() * 0.7,
+    },
+    sheet: {
+      backgroundColor: colors.background.default,
+      borderTopLeftRadius: 20,
+      borderTopRightRadius: 20,
+    },
+    title: {
+      textAlign: 'center',
+      marginTop: 8,
+      marginBottom: 8,
+    },
+    notch: {
+      width: 48,
+      height: 5,
+      borderRadius: 4,
+      backgroundColor: colors.border.default,
+      marginTop: 8,
+      alignSelf: 'center',
+    },
     searchContainer: {
       marginLeft: 16,
       marginRight: 16,

app/components/Views/NetworkSelector/NetworkSelector.test.tsx

@@ -540,7 +540,7 @@ describe('Network Selector', () => {
     it('renders the linea mainnet cell correctly', () => {
       (isNetworkUiRedesignEnabled as jest.Mock).mockImplementation(() => true);
       const { getByText } = renderComponent(initialState);
-      const lineaRpcUrl = getByText('https://linea-rpc.publicnode.com');
+      const lineaRpcUrl = getByText('linea-rpc.publicnode.com');
       const lineaCell = getByText('Linea');
       expect(lineaCell).toBeTruthy();
       expect(lineaRpcUrl).toBeTruthy();
@@ -572,7 +572,7 @@ describe('Network Selector', () => {
     it('renders the  mainnet cell correctly', () => {
       (isNetworkUiRedesignEnabled as jest.Mock).mockImplementation(() => true);
       const { getByText } = renderComponent(initialState);
-      const mainnetRpcUrl = getByText('https://mainnet-rpc.publicnode.com');
+      const mainnetRpcUrl = getByText('mainnet-rpc.publicnode.com');
       const mainnetCell = getByText('Ethereum Mainnet');
       expect(mainnetCell).toBeTruthy();
       expect(mainnetRpcUrl).toBeTruthy();