Merge branch 'main' into fix/account-connect-origin-spoof

Author: smilingkylan

CHANGELOG.md

@@ -7,22 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- fix(swaps): set default slippage when source or destination token is not stablecoin ([#14730](https://github.com/MetaMask/metamask-mobile/pull/14730))
+
+### Changed
+
+- fix(multi-srp): display errors only after all the words are have been entered ([#14607](https://github.com/MetaMask/metamask-mobile/pull/14607))
+
 ### Added
 
 - fix(browser): fix browser PermissionsSummary origin spoofing when browser redirects issue ([#13394](https://github.com/MetaMask/metamask-mobile/pull/13394))
+- feat(bridge): add solana chain support and improve bridge state management ([#14713](https://github.com/MetaMask/metamask-mobile/pull/14713))
 - feat(bridge): add error handling and input management for bridge quotes ([#14693](https://github.com/MetaMask/metamask-mobile/pull/14693))
 - feat(multi-srp): enable multi-srp in main and beta ([#14558](https://github.com/MetaMask/metamask-mobile/pull/14558))
 - feat(ramp): Update ramp data flow to fetch cryptos before payment methods ([#14437](https://github.com/MetaMask/metamask-mobile/pull/14437))
 - feat(bridge): add destination account picker ([#14656](https://github.com/MetaMask/metamask-mobile/pull/14656))
 - feat(bridge): add Solana assets to bridge token pickers ([#14365](https://github.com/MetaMask/metamask-mobile/pull/14365))
 - feat: add AppMetadataController controller ([#14513](https://github.com/MetaMask/metamask-mobile/pull/14513))
 - feat(bridge): implement bridge quote fetching ([#14413](https://github.com/MetaMask/metamask-mobile/pull/14413))
-
+- feat(multi-srp): add e2e tests ([#14583](https://github.com/MetaMask/metamask-mobile/pull/14583))
+- feat(bridge): fetch token metadata for Bridge token pickers if not already available ([#14699](https://github.com/MetaMask/metamask-mobile/pull/14699))
 
 ### Changed
 
 - feat(bridge): Handle Solana vs EVM swap and bridge routing ([#14614](https://github.com/MetaMask/metamask-mobile/pull/14614))
 
+### Fixed
+
+- fix(bridge): fix not switching networks when selecting source token ([#14712](https://github.com/MetaMask/metamask-mobile/pull/14712))
+
 ## [7.44.0]
 
 ### Added
@@ -95,11 +109,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix: inherit icon size from text component parent ([#14024](https://github.com/MetaMask/metamask-mobile/pull/14024))
 - fix: animation added for loading state on SnapUILink button ([#13973](https://github.com/MetaMask/metamask-mobile/pull/13973))
 - fix: Revert "chore: upgrade Xcode 16 on bitrise.yml" ([#14012](https://github.com/MetaMask/metamask-mobile/pull/14012))
-
-### Fixed
-
 - fix(bridge): hide staked native assets from token selectors ([#14457](https://github.com/MetaMask/metamask-mobile/pull/14457))
 
+
 ## [7.43.0]
 
 ### Added

app/components/UI/Bridge/Views/BridgeView/BridgeView.styles.ts

@@ -18,7 +18,6 @@ export const createStyles = (params: { theme: Theme }) => {
       width: '100%',
       paddingHorizontal: 16,
       paddingBottom: 24,
-
       gap: 12,
       alignItems: 'center',
       justifyContent: 'center',
@@ -59,7 +58,6 @@ export const createStyles = (params: { theme: Theme }) => {
     },
     quoteContainer: {
       paddingHorizontal: 24,
-      paddingVertical: 24,
     },
     keypadContainer: {
       flex: 1,
@@ -77,16 +75,18 @@ export const createStyles = (params: { theme: Theme }) => {
     },
     dynamicContent: {
       flex: 1,
-    },
-    dynamicContentWithKeypad: {
-      justifyContent: 'flex-start',
-    },
-    dynamicContentWithoutKeypad: {
+      paddingBottom: 12,
       justifyContent: 'flex-start',
     },
     keypadContainerWithDestinationPicker: {
       justifyContent: 'center',
       paddingVertical: 12,
     },
+    dynamicContentWithDestinationPickerAndQuoteCard: {
+      justifyContent: 'flex-start',
+    },
+    dynamicContentWithOnlyQuoteCard: {
+      justifyContent: 'space-around',
+    },
   });
 };

app/components/UI/Bridge/Views/BridgeView/BridgeView.test.tsx

@@ -9,6 +9,8 @@ import { Hex } from '@metamask/utils';
 import BridgeView from '.';
 import { createBridgeTestState } from '../../testUtils';
 import { initialState } from '../../_mocks_/initialState';
+import { RequestStatus, type QuoteResponse } from '@metamask/bridge-controller';
+import mockQuotes from '../../_mocks_/mock-quotes-sol-sol.json';
 
 // TODO remove this mock once we have a real implementation
 jest.mock('../../../../../selectors/confirmTransaction');
@@ -72,23 +74,21 @@ jest.mock('../../hooks/useLatestBalance', () => ({
 }));
 
 describe('BridgeView', () => {
-  const mockChainId = '0x1' as Hex;
-  const optimismChainId = '0xa' as Hex;
   const token2Address = '0x0000000000000000000000000000000000000002' as Hex;
 
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   it('renders', async () => {
-    const { getByText } = renderScreen(
+    const { toJSON } = renderScreen(
       BridgeView,
       {
         name: Routes.BRIDGE.ROOT,
       },
       { state: initialState },
     );
-    expect(getByText('Select amount')).toBeDefined();
+    expect(toJSON()).toMatchSnapshot();
   });
 
   it('should open BridgeTokenSelector when clicking source token', async () => {
@@ -275,6 +275,8 @@ describe('BridgeView', () => {
           quoteRequest: {
             insufficientBal: true,
           },
+          quotesLoadingStatus: RequestStatus.FETCHED,
+          quotes: [mockQuotes[0] as unknown as QuoteResponse],
         },
       });
 
@@ -295,6 +297,8 @@ describe('BridgeView', () => {
           quoteRequest: {
             insufficientBal: false,
           },
+          quotesLoadingStatus: RequestStatus.FETCHED,
+          quotes: [mockQuotes[0] as unknown as QuoteResponse],
         },
         bridgeReducerOverrides: {
           sourceAmount: '1.0', // Less than balance of 2.0 ETH
@@ -314,28 +318,26 @@ describe('BridgeView', () => {
     });
 
     it('should handle Continue button press', async () => {
+      const testState = createBridgeTestState({
+        bridgeControllerOverrides: {
+          quoteRequest: {
+            insufficientBal: false,
+          },
+          quotesLoadingStatus: RequestStatus.FETCHED,
+          quotes: [mockQuotes[0] as unknown as QuoteResponse],
+        },
+        bridgeReducerOverrides: {
+          sourceAmount: '1.0', // Less than balance of 2.0 ETH
+        },
+      });
+
       const { getByText } = renderScreen(
         BridgeView,
         {
           name: Routes.BRIDGE.ROOT,
         },
         {
-          state: {
-            ...initialState,
-            bridge: {
-              ...initialState.bridge,
-              sourceAmount: '1.0',
-              destToken: {
-                address: token2Address,
-                symbol: 'TOKEN2',
-                decimals: 18,
-                image: 'https://token2.com/logo.png',
-                chainId: optimismChainId,
-              },
-              selectedDestChainId: optimismChainId,
-              selectedSourceChainIds: [mockChainId, optimismChainId],
-            },
-          },
+          state: testState,
         },
       );
 
@@ -352,6 +354,8 @@ describe('BridgeView', () => {
           quoteRequest: {
             insufficientBal: false,
           },
+          quotesLoadingStatus: RequestStatus.FETCHED,
+          quotes: [mockQuotes[0] as unknown as QuoteResponse],
         },
         bridgeReducerOverrides: {
           sourceAmount: '1.0', // Less than balance of 2.0 ETH
@@ -372,4 +376,4 @@ describe('BridgeView', () => {
       // TODO: Add expectations once Terms navigation is implemented
     });
   });
-});
+});