DO NOT COmmiT

Author: sethkfman

.depcheckrc.yml

@@ -11,8 +11,11 @@ ignores:
   - 'babel-plugin-inline-import'
   # This is used in index.d.ts
   - '@sentry/react'
+<<<<<<< HEAD
   # These dependencies are needed for react-compiler - https://react.dev/learn/react-compiler#using-react-compiler-with-react-17-or-18
   - 'react-compiler-runtime'
+=======
+>>>>>>> stable
   # This is used on the patch for TokenRatesController of Assets controllers, for we to be able to use the last version of it
   - cockatiel
 

.iyarc

@@ -1,2 +1,6 @@
 # https://github.com/advisories/GHSA-c76h-2ccp-4975 This is temporarily ignored, will be fixed by updating yarn to v3 in this PR: https://github.com/MetaMask/metamask-mobile/pull/14477
-GHSA-c76h-2ccp-4975
+<<<<<<< HEAD
+GHSA-c76h-2ccp-4975
+=======
+GHSA-c76h-2ccp-4975
+>>>>>>> stable

.js.env.example

@@ -112,8 +112,11 @@ export MM_PERMISSIONS_SETTINGS_V1_ENABLED=""
 ## Stablecoin Lending
 export MM_STABLECOIN_LENDING_UI_ENABLED="true"
 export MM_STABLE_COIN_SERVICE_INTERRUPTION_BANNER_ENABLED="true"
+<<<<<<< HEAD
 ### Redesigned stablecoin lending
 export MM_STABLECOIN_LENDING_UI_ENABLED_REDESIGNED="true"
+=======
+>>>>>>> stable
 ## Pooled-Staking
 export MM_POOLED_STAKING_ENABLED="true"
 export MM_POOLED_STAKING_SERVICE_INTERRUPTION_BANNER_ENABLED="true"
@@ -122,15 +125,24 @@ export MM_POOLED_STAKING_SERVICE_INTERRUPTION_BANNER_ENABLED="true"
 # Remote feature flag values won't be updated,
 # and selectors should return their fallback values
 export OVERRIDE_REMOTE_FEATURE_FLAGS="false"
+<<<<<<< HEAD
+=======
+# Public key used to validate EIP-7702 contract signatures from LaunchDarkly
+export EIP_7702_PUBLIC_KEY=""
+>>>>>>> stable
 
 #Bridge flag to toggle between dev and prod API
 export BRIDGE_USE_DEV_APIS="false"
 
+<<<<<<< HEAD
 export MM_BRIDGE_ENABLED="true"
 
 # Set ramps environment to staging.
 # This is required when developing or checking existing ramps tests locally.
 export RAMP_INTERNAL_BUILD="true"
 
 # Enable 7702 locally
-export MM_SMART_ACCOUNT_UI_ENABLED="true"
+export MM_SMART_ACCOUNT_UI_ENABLED="true"
+=======
+export MM_BRIDGE_ENABLED="true"
+>>>>>>> stable

CHANGELOG.md

@@ -10,13 +10,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - feat(bridge): add "hardware wallets not supported" error when attempting Solana swap/bridge ([#15743](https://github.com/MetaMask/metamask-mobile/pull/15743))
 - feat(bridge): fetch all tokens for bridge input([#15993](https://github.com/MetaMask/metamask-mobile/pull/15993))
 - fix(bridge): don't show currency value unless amount is above zero ([#15798](https://github.com/MetaMask/metamask-mobile/pull/15798))
+<<<<<<< HEAD
 - fix(bridge): prevent crash when viewing Solana asset details ([#16770](https://github.com/MetaMask/metamask-mobile/pull/16770))
+=======
+
+## [7.47.2]
+
+### Fixed
+- chore(runway): cherry-pick chore: bump pbkdf ([#16629](https://github.com/MetaMask/metamask-mobile/pull/16629))
+- chore(runway): cherry-pick fix: cp-7.47.2 migrate caip permission to include sessionProperties value ([#16643](https://github.com/MetaMask/metamask-mobile/pull/16643))
+- chore(runway): cherry-pick fix:  account address missmatch with identity ([#16683](https://github.com/MetaMask/metamask-mobile/pull/16683))
+- chore(runway): cherry-pick fix: Remove delay for dispatch of INIT_BG_STATE_KEY ([#16703](https://github.com/MetaMask/metamask-mobile/pull/16703))
+>>>>>>> stable
 
 ## [7.47.1]
 
 ### Fixed
 - fix: ensure inpage provider retries any pending requests sent before BackgroundBridge fully initialized ([#16349](https://github.com/MetaMask/metamask-mobile/pull/16349))
 
+<<<<<<< HEAD
 ## [7.47.0]
 
 ### Added
@@ -136,6 +148,72 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+=======
+ ## [7.47.0]
+
+ ### Added
+
+ - feat: migrate eth_accounts and permittedChains to CAIP-25 endowment ([#13970](https://github.com/MetaMask/metamask-mobile/pull/13970))
+ - feat(identity): rebrand "Profile syncing" to "Backup and sync", adding a dedicated settings menu and more ([#15003](https://github.com/MetaMask/metamask-mobile/pull/15003))
+ - feat(bridge): implement quote expiration handling in Bridge feature ([#14872](https://github.com/MetaMask/metamask-mobile/pull/14872))
+ - feat(bridge): use dynamic slippage for single-chain Solana swaps ([#14805](https://github.com/MetaMask/metamask-mobile/pull/14805))
+ - feat(bridge): enhance bridging with network fee estimation and UI improvements ([#14786](https://github.com/MetaMask/metamask-mobile/pull/14786))
+ - feat(ramp): auto-select region ([#14780](https://github.com/MetaMask/metamask-mobile/pull/14780))
+ - 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))
+ - feat(bridge): use `BridgeStatusController` for EVM and Solana Bridge transaction submission ([#14708](https://github.com/MetaMask/metamask-mobile/pull/14708))
+ - feat(multi-srp): add discover accounts to MultichainWalletSnapClient ([#14727](https://github.com/MetaMask/metamask-mobile/pull/14727))
+ - feat: real time dapp scanning BrowserTab ([#14515](https://github.com/MetaMask/metamask-mobile/pull/14515))
+ - feat(multi-srp): add new srp pills labels ([#14829](https://github.com/MetaMask/metamask-mobile/pull/14829))
+ - feat(earn): add pooled-staking and stablecoin lending remote feature flags ([#14660](https://github.com/MetaMask/metamask-mobile/pull/14660))
+ - feat: feat: AccountConnect and AccountApproval use dapp scanning ([#14514](https://github.com/MetaMask/metamask-mobile/pull/14514/))
+
+ ### Fixed
+
+ - fix(bridge): fix default swap destination token when source is USDC ([#15611](https://github.com/MetaMask/metamask-mobile/pull/15611))
+ - fix(multi-srp): display multichain accounts in SRP list ([#14724](https://github.com/MetaMask/metamask-mobile/pull/14724))
+ - fix(confirmations): remove transaction simulations from wallet initiated send flow ([#14994](https://github.com/MetaMask/metamask-mobile/pull/14994))
+ - fix(bridge): add auto slippage option and improve slippage selection UI ([#15159](https://github.com/MetaMask/metamask-mobile/pull/15159))
+ - fix(bridge): implement dynamic refresh rate in QuoteExpiredModal ([#15157](https://github.com/MetaMask/metamask-mobile/pull/15157))
+ - fix(bridge): keyboard not appearing when error banner is displayed ([#14862](https://github.com/MetaMask/metamask-mobile/pull/14862))
+ - fix(bridge): fix not switching networks when selecting source token ([#14712](https://github.com/MetaMask/metamask-mobile/pull/14712))
+ - fix: update confirmation font sizes ([#14715](https://github.com/MetaMask/metamask-mobile/pull/14715))
+ - fix(bridge): fix transaction history for EVM and Solana bridge transactions ([#14759](https://github.com/MetaMask/metamask-mobile/pull/14759))
+ - fix(bridge): change networks properly when user switches between source and destination tokens ([#14812](https://github.com/MetaMask/metamask-mobile/pull/14812))
+ - fix(bridge): fix(bridge): update quote details card toggle to handle same chain swaps and improve slippage button layout ([#15153](https://github.com/MetaMask/metamask-mobile/pull/15153))
+ - fix(bridge): show "Auto" slippage for Solana swaps
+ - fix(bridge): add insufficient balance check for Solana swaps
+ - fix(bridge): disable Solana as destination network if no Solana account exists
+ - fix(bridge): prevent quote error during bridge destination account selection
+
+## [7.46.2]
+
+### Fixed 
+- fix: Json rpc and invalid transaction type envelope errors ([#15538](https://github.com/MetaMask/metamask-mobile/pull/15538)
+
+## [7.46.1]
+
+### Fixed 
+- fix: capture exception with Sentry instead throwing the error ([#15469](https://github.com/MetaMask/metamask-mobile/pull/15469))
+
+## [7.46.0]
+
+### Added
+
+- fix(bridge): prevent quote polling when "quote expired" modal is open ([#15602](https://github.com/MetaMask/metamask-mobile/issues/15602))
+- feat(bridge): improve bridge screen layout and user experience ([#15425](https://github.com/MetaMask/metamask-mobile/pull/15425))
+- fix(browser): fix browser PermissionsSummary origin spoofing when browser redirects issue ([#13394](https://github.com/MetaMask/metamask-mobile/pull/13394))
+- feat: migrate eth_accounts and permittedChains to CAIP-25 endowment ([#13970](https://github.com/MetaMask/metamask-mobile/pull/13970))
+- feat(identity): rebrand "Profile syncing" to "Backup and sync", adding a dedicated settings menu and more ([#15003](https://github.com/MetaMask/metamask-mobile/pull/15003))
+>>>>>>> stable
 - feat(bridge): implement quote expiration handling in Bridge feature ([#14872](https://github.com/MetaMask/metamask-mobile/pull/14872))
 - feat(bridge): use dynamic slippage for single-chain Solana swaps ([#14805](https://github.com/MetaMask/metamask-mobile/pull/14805))
 - feat(bridge): enhance bridging with network fee estimation and UI improvements ([#14786](https://github.com/MetaMask/metamask-mobile/pull/14786))
@@ -167,6 +245,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+<<<<<<< HEAD
+=======
+- fix(bridge): reset state to prevent stale quotes on token switch ([#15571](https://github.com/MetaMask/metamask-mobile/pull/15571))
+- fix(multi-srp): display multichain accounts in SRP list ([#14724](https://github.com/MetaMask/metamask-mobile/pull/14724))
+- fix(confirmations): remove transaction simulations from wallet initiated send flow ([#14994](https://github.com/MetaMask/metamask-mobile/pull/14994))
+- fix(bridge): add auto slippage option and improve slippage selection UI ([#15159](https://github.com/MetaMask/metamask-mobile/pull/15159))
+- fix(bridge): implement dynamic refresh rate in QuoteExpiredModal ([#15157](https://github.com/MetaMask/metamask-mobile/pull/15157))
+>>>>>>> stable
 - fix(bridge): keyboard not appearing when error banner is displayed ([#14862](https://github.com/MetaMask/metamask-mobile/pull/14862))
 - fix(bridge): fix not switching networks when selecting source token ([#14712](https://github.com/MetaMask/metamask-mobile/pull/14712))
 - fix: updates a padding style specifically for Android devices ([#14725](https://github.com/MetaMask/metamask-mobile/pull/14725))
@@ -187,15 +273,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [7.45.1]
 
 ### Fixed
+<<<<<<< HEAD
+=======
+
+>>>>>>> stable
 - fix: update patch to use old AccountTrackerController data structures ([dfc076c](https://github.com/MetaMask/metamask-mobile/commit/dfc076cee12aab974720b2dd1e8a145b3fafd484))
 
 ## [7.45.0]
 
+<<<<<<< HEAD
 ### Changed
 
 - fix(multi-srp): display errors only after all the words are have been entered ([#14607](https://github.com/MetaMask/metamask-mobile/pull/14607))
 - fix(multi-srp): display alternative text color when in dark mode([#14718](https://github.com/MetaMask/metamask-mobile/pull/14718))
 
+=======
+>>>>>>> stable
 ### Added
 
 - feat(4213-2) update network icons ([#14069](https://github.com/MetaMask/metamask-mobile/pull/14069))
@@ -233,6 +326,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - feat: add phishing tracking events to PhishingModal component ([#14254](https://github.com/MetaMask/metamask-mobile/pull/14254))
 - feat: upgrade to brand evolution colors ([#14218](https://github.com/MetaMask/metamask-mobile/pull/14218))
 
+<<<<<<< HEAD
+=======
+### Changed
+
+- fix(multi-srp): display errors only after all the words are have been entered ([#14607](https://github.com/MetaMask/metamask-mobile/pull/14607))
+- fix(multi-srp): display alternative text color when in dark mode([#14718](https://github.com/MetaMask/metamask-mobile/pull/14718))
+
+>>>>>>> stable
 ### Fixed
 
 - fix(swaps): set default slippage when source or destination token is not stablecoin ([#14730](https://github.com/MetaMask/metamask-mobile/pull/14730))
@@ -5529,7 +5630,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#957](https://github.com/MetaMask/metamask-mobile/pull/957): fix timeouts (#957)
 - [#954](https://github.com/MetaMask/metamask-mobile/pull/954): Bugfix: onboarding navigation (#954)
 
+<<<<<<< HEAD
 [Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.46.2...HEAD
+=======
+[Unreleased]: https://github.com/MetaMask/metamask-mobile/compare/v7.47.0...HEAD
+[7.47.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.46.2...v7.47.0
+>>>>>>> stable
 [7.46.2]: https://github.com/MetaMask/metamask-mobile/compare/v7.46.1...v7.46.2
 [7.46.1]: https://github.com/MetaMask/metamask-mobile/compare/v7.46.0...v7.46.1
 [7.46.0]: https://github.com/MetaMask/metamask-mobile/compare/v7.45.1...v7.46.0

android/app/build.gradle

@@ -187,8 +187,13 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+<<<<<<< HEAD
         versionName "7.50.0"
         versionCode 2062
+=======
+        versionName "7.47.1"
+        versionCode 2004
+>>>>>>> stable
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/actions/multiSrp/index.test.ts

@@ -9,13 +9,16 @@ import {
 import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';
 import { createMockInternalAccount } from '../../util/test/accountsControllerTestUtils';
 
+<<<<<<< HEAD
 const testAddress = '0x123';
 const mockExpectedAccount = createMockInternalAccount(
   testAddress,
   'Account 1',
   KeyringTypes.hd,
 );
 
+=======
+>>>>>>> stable
 const mockSetSelectedAddress = jest.fn();
 const mockAddNewKeyring = jest.fn();
 const mockGetKeyringsByType = jest.fn();
@@ -24,7 +27,10 @@ const mockAddAccounts = jest.fn();
 const mockSetAccountLabel = jest.fn();
 const mockControllerMessenger = jest.fn();
 const mockAddDiscoveredAccounts = jest.fn();
+<<<<<<< HEAD
 const mockGetAccountByAddress = jest.fn().mockReturnValue(mockExpectedAccount);
+=======
+>>>>>>> stable
 
 const hdKeyring = {
   getAccounts: () => {
@@ -59,7 +65,10 @@ jest.mock('../../core/Engine', () => ({
     },
     AccountsController: {
       getNextAvailableAccountName: jest.fn().mockReturnValue('Snap Account 1'),
+<<<<<<< HEAD
       getAccountByAddress: () => mockGetAccountByAddress(),
+=======
+>>>>>>> stable
     },
   },
   setSelectedAddress: (address: string) => mockSetSelectedAddress(address),

app/actions/multiSrp/index.ts

@@ -3,7 +3,10 @@ import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';
 import ExtendedKeyringTypes from '../../constants/keyringTypes';
 import Engine from '../../core/Engine';
 import { KeyringSelector } from '@metamask/keyring-controller';
+<<<<<<< HEAD
 import { InternalAccount } from '@metamask/keyring-internal-api';
+=======
+>>>>>>> stable
 ///: BEGIN:ONLY_INCLUDE_IF(solana)
 import {
   MultichainWalletSnapFactory,
@@ -65,19 +68,29 @@ export async function importNewSecretRecoveryPhrase(mnemonic: string) {
     async ({ keyring }) => keyring.getAccounts(),
   );
 
+<<<<<<< HEAD
   let discoveredAccountsCount = 0;
 
+=======
+>>>>>>> stable
   ///: BEGIN:ONLY_INCLUDE_IF(solana)
   const multichainClient = MultichainWalletSnapFactory.createClient(
     WalletClientType.Solana,
   );
 
+<<<<<<< HEAD
   discoveredAccountsCount = await multichainClient.addDiscoveredAccounts(newKeyring.id);
   ///: END:ONLY_INCLUDE_IF
 
   Engine.setSelectedAddress(newAccountAddress);
 
   return { address: newAccountAddress, discoveredAccountsCount };
+=======
+  await multichainClient.addDiscoveredAccounts(newKeyring.id);
+  ///: END:ONLY_INCLUDE_IF
+
+  return Engine.setSelectedAddress(newAccountAddress);
+>>>>>>> stable
 }
 
 export async function createNewSecretRecoveryPhrase() {
@@ -125,6 +138,7 @@ export async function addNewHdAccount(
     Engine.setAccountLabel(addedAccountAddress, name);
   }
 
+<<<<<<< HEAD
   const account = AccountsController.getAccountByAddress(addedAccountAddress);
 
   // This should always be true. If it's not, we have a bug.
@@ -133,12 +147,17 @@ export async function addNewHdAccount(
     throw new Error('Account not found after creation');
   }
 
+=======
+>>>>>>> stable
   // We consider the account to be created once it got selected and renamed.
   store.dispatch(
     endPerformanceTrace({
       eventName: PerformanceEventNames.AddHdAccount,
     }),
   );
+<<<<<<< HEAD
 
   return account;
+=======
+>>>>>>> stable
 }

app/component-library/components-temp/CellSelectWithMenu/CellSelectWithMenu.tsx

@@ -60,6 +60,7 @@ const CellSelectWithMenu = ({
         ) : null}
 
         <View style={styles.cellBaseInfo}>
+<<<<<<< HEAD
           {title === undefined || typeof title === 'string' ? (
             <Text
               numberOfLines={1}
@@ -72,6 +73,15 @@ const CellSelectWithMenu = ({
           ) : (
             title
           )}
+=======
+          <Text
+            numberOfLines={1}
+            variant={DEFAULT_CELLBASE_AVATAR_TITLE_TEXTVARIANT}
+            testID={CellComponentSelectorsIDs.BASE_TITLE}
+          >
+            {title}
+          </Text>
+>>>>>>> stable
           {!!secondaryText && (
             <TouchableWithoutFeedback>
               <TouchableOpacity