Merge from main

MetaMask · Jul 21, 2023 · 57f2450 · 57f2450
2 parents 03a0d06 + a8d0613
commit 57f2450
Show file tree

Hide file tree

Showing 261 changed files with 975 additions and 1,490 deletions.
diff --git a/.detoxrc.js b/.detoxrc.js
@@ -8,6 +8,7 @@ module.exports = {
     jest: {
       setupTimeout: 120000,
     },
+    retries: 2,
   },
 
   configurations: {

diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
@@ -88,6 +88,7 @@ import WC2Manager, {
 } from '../../../../app/core/WalletConnect/WalletConnectV2';
 import NavigationService from '../../../core/NavigationService';
 import LockScreen from '../../Views/LockScreen';
+import { selectFrequentRpcList } from '../../../selectors/preferencesController';
 
 const clearStackNavigatorOptions = {
   headerShown: false,
@@ -233,10 +234,7 @@ const App = ({ userLoggedIn }) => {
       dispatch(setCurrentBottomNavRoute(route));
     }
   };
-  const frequentRpcList = useSelector(
-    (state) =>
-      state?.engine?.backgroundState?.PreferencesController?.frequentRpcList,
-  );
+  const frequentRpcList = useSelector(selectFrequentRpcList);
 
   useEffect(() => {
     if (prevNavigator.current || !navigator) return;

diff --git a/app/components/Nav/Main/MainNavigator.js b/app/components/Nav/Main/MainNavigator.js
@@ -45,17 +45,17 @@ import SwapsQuotesView from '../../UI/Swaps/QuotesView';
 import CollectiblesDetails from '../../UI/CollectibleModal';
 import OptinMetrics from '../../UI/OptinMetrics';
 import Drawer from '../../UI/Drawer';
-import { FiatOnRampSDKProvider } from '../../UI/FiatOnRampAggregator/sdk';
-import GetStarted from '../../../components/UI/FiatOnRampAggregator/Views/GetStarted';
-import PaymentMethods from '../../UI/FiatOnRampAggregator/Views/PaymentMethods/PaymentMethods';
-import AmountToBuy from '../../../components/UI/FiatOnRampAggregator/Views/AmountToBuy';
-import Quotes from '../../../components/UI/FiatOnRampAggregator/Views/Quotes';
-import CheckoutWebView from '../../UI/FiatOnRampAggregator/Views/Checkout';
-import OnRampSettings from '../../UI/FiatOnRampAggregator/Views/Settings';
-import OnrampAddActivationKey from '../../UI/FiatOnRampAggregator/Views/Settings/AddActivationKey';
-import Regions from '../../UI/FiatOnRampAggregator/Views/Regions';
+import { FiatOnRampSDKProvider } from '../../UI/Ramp/sdk';
+import GetStarted from '../../UI/Ramp/Views/GetStarted';
+import PaymentMethods from '../../UI/Ramp/Views/PaymentMethods/PaymentMethods';
+import AmountToBuy from '../../UI/Ramp/Views/AmountToBuy';
+import Quotes from '../../UI/Ramp/Views/Quotes';
+import CheckoutWebView from '../../UI/Ramp/Views/Checkout';
+import OnRampSettings from '../../UI/Ramp/Views/Settings';
+import OnrampAddActivationKey from '../../UI/Ramp/Views/Settings/AddActivationKey';
+import Regions from '../../UI/Ramp/Views/Regions';
 import { colors as importedColors } from '../../../styles/common';
-import OrderDetails from '../../UI/FiatOnRampAggregator/Views/OrderDetails';
+import OrderDetails from '../../UI/Ramp/Views/OrderDetails';
 import TabBar from '../../../component-library/components/Navigation/TabBar';
 import BrowserUrlModal from '../../Views/BrowserUrlModal';
 import Routes from '../../../constants/navigation/Routes';

diff --git a/app/components/Nav/Main/RootRPCMethodsUI.js b/app/components/Nav/Main/RootRPCMethodsUI.js
@@ -59,6 +59,7 @@ import {
 import { selectTokenList } from '../../../selectors/tokenListController';
 import { selectTokens } from '../../../selectors/tokensController';
 import { selectAccountsLength } from '../../../selectors/accountTrackerController';
+import { selectSelectedAddress } from '../../../selectors/preferencesController';
 import { createAccountConnectNavDetails } from '../../Views/AccountConnect';
 import { ApprovalResult } from '../../UI/Approval/ApprovalResult';
 import { ApprovalResultType } from '../../UI/Approval/ApprovalResult/ApprovalResult';
@@ -953,8 +954,7 @@ RootRPCMethodsUI.propTypes = {
 };
 
 const mapStateToProps = (state) => ({
-  selectedAddress:
-    state.engine.backgroundState.PreferencesController.selectedAddress,
+  selectedAddress: selectSelectedAddress(state),
   chainId: selectChainId(state),
   tokens: selectTokens(state),
   swapsTransactions:

diff --git a/app/components/Nav/Main/index.js b/app/components/Nav/Main/index.js
@@ -27,7 +27,7 @@ import FadeOutOverlay from '../../UI/FadeOutOverlay';
 import Device from '../../../util/device';
 import BackupAlert from '../../UI/BackupAlert';
 import Notification from '../../UI/Notification';
-import FiatOrders from '../../UI/FiatOnRampAggregator';
+import RampOrders from '../../UI/Ramp';
 import {
   showTransactionNotification,
   hideCurrentNotification,
@@ -361,7 +361,7 @@ const Main = (props) => {
         <GlobalAlert />
         <FadeOutOverlay />
         <Notification navigation={props.navigation} />
-        <FiatOrders />
+        <RampOrders />
         <SwapsLiveness />
         <BackupAlert
           onDismiss={toggleRemindLater}

diff --git a/app/components/UI/AccountApproval/index.js b/app/components/UI/AccountApproval/index.js
@@ -31,6 +31,7 @@ import {
 } from '../../../selectors/networkController';
 import { selectTokensLength } from '../../../selectors/tokensController';
 import { selectAccountsLength } from '../../../selectors/accountTrackerController';
+import { selectSelectedAddress } from '../../../selectors/preferencesController';
 import AppConstants from '../../../../app/core/AppConstants';
 import { shuffle } from 'lodash';
 import SDKConnect from '../../../core/SDKConnect/SDKConnect';
@@ -462,9 +463,8 @@ class AccountApproval extends PureComponent {
 
 const mapStateToProps = (state) => ({
   accountsLength: selectAccountsLength(state),
-  selectedAddress:
-    state.engine.backgroundState.PreferencesController.selectedAddress,
   tokensLength: selectTokensLength(state),
+  selectedAddress: selectSelectedAddress(state),
   networkType: selectProviderType(state),
   chainId: selectChainId(state),
 });

diff --git a/app/components/UI/AccountApproval/index.test.tsx b/app/components/UI/AccountApproval/index.test.tsx
@@ -2,31 +2,13 @@ import React from 'react';
 import AccountApproval from './';
 import { shallow } from 'enzyme';
 import configureMockStore from 'redux-mock-store';
-import { SEPOLIA } from '../../../constants/network';
 import { Provider } from 'react-redux';
+import initialBackgroundState from '../../../util/test/initial-background-state.json';
 
 const mockStore = configureMockStore();
 const initialState = {
   engine: {
-    backgroundState: {
-      AccountTrackerController: {
-        accounts: { '0x2': { balance: '0' } },
-      },
-      NetworkController: {
-        providerConfig: {
-          type: SEPOLIA,
-        },
-      },
-      TokensController: {
-        tokens: [],
-      },
-      PreferencesController: {
-        selectedAddress: '0xe7E125654064EEa56229f273dA586F10DF96B0a1',
-        identities: {
-          '0xe7E125654064EEa56229f273dA586F10DF96B0a1': { name: 'Account 1' },
-        },
-      },
-    },
+    backgroundState: initialBackgroundState,
   },
 };
 const store = mockStore(initialState);

diff --git a/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx b/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx
@@ -8,67 +8,13 @@ import { ENSCache } from '../../../util/ENSUtils';
 import { Transaction } from './AccountFromToInfoCard.types';
 import AccountFromToInfoCard from '.';
 import Engine from '../../../core/Engine';
+import initialBackgroundState from '../../../util/test/initial-background-state.json';
 
-jest.mock('../../../util/address', () => ({
-  ...jest.requireActual('../../../util/address'),
-  isQRHardwareAccount: () => false,
-}));
-
-jest.mock('../../../core/Engine', () => ({
-  context: {
-    TokensController: {
-      addToken: () => undefined,
-    },
-  },
-}));
-
-jest.mock('../../../util/ENSUtils', () => ({
-  ...jest.requireActual('../../../util/ENSUtils'),
-  doENSReverseLookup: jest.fn(),
-}));
-
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useSelector: (fn: any) =>
-    fn({
-      engine: {
-        backgroundState: {
-          PreferencesController: {
-            selectedAddress: '0x0',
-            identities: {
-              '0x0': {
-                address: '0x0',
-                name: 'Account 1',
-              },
-              '0x1': {
-                address: '0x1',
-                name: 'Account 2',
-              },
-            },
-          },
-          NetworkController: {
-            provider: {
-              ticker: 'eth',
-            },
-          },
-          AddressBookController: {
-            addressBook: {},
-          },
-        },
-      },
-    }),
-}));
-
-jest.mock('../../../util/address', () => ({
-  ...jest.requireActual('../../../util/address'),
-  isQRHardwareAccount: jest.fn(),
-}));
-
-const mockStore = configureMockStore();
-const initialState = {
+const mockInitialState = {
   settings: {},
   engine: {
     backgroundState: {
+      ...initialBackgroundState,
       AccountTrackerController: {
         accounts: {
           '0x0': {
@@ -84,7 +30,6 @@ const initialState = {
           '0x326836cc6cd09B5aa59B81A7F72F25FcC0136b95': '0x5',
         },
       },
-      TokensController: {},
       PreferencesController: {
         selectedAddress: '0x0',
         identities: {
@@ -98,40 +43,46 @@ const initialState = {
           },
         },
       },
-      CurrencyRateController: {
-        conversionRate: 10,
-        currentCurrency: 'usd',
-      },
-      NetworkController: {
-        provider: {
-          ticker: 'eth',
-        },
-        network: '1',
-      },
-      AddressBookController: {
-        addressBook: {
-          '1': {
-            '0x0': {
-              address: '0x0',
-              name: 'Account 1',
-            },
-            '0x1': {
-              address: '0x1',
-              name: 'Account 2',
-            },
-          },
-        },
-      },
     },
   },
 };
-const store = mockStore(initialState);
+
+jest.mock('../../../util/address', () => ({
+  ...jest.requireActual('../../../util/address'),
+  isQRHardwareAccount: () => false,
+}));
+
+jest.mock('../../../core/Engine', () => ({
+  context: {
+    TokensController: {
+      addToken: () => undefined,
+    },
+  },
+}));
+
+jest.mock('../../../util/ENSUtils', () => ({
+  ...jest.requireActual('../../../util/ENSUtils'),
+  doENSReverseLookup: jest.fn(),
+}));
+
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useSelector: (fn: any) => fn(mockInitialState),
+}));
+
+jest.mock('../../../util/address', () => ({
+  ...jest.requireActual('../../../util/address'),
+  isQRHardwareAccount: jest.fn(),
+}));
+
+const mockStore = configureMockStore();
+const store = mockStore(mockInitialState);
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
   useSelector: jest
     .fn()
-    .mockImplementation((callback) => callback(initialState)),
+    .mockImplementation((callback) => callback(mockInitialState)),
 }));
 
 const transactionState: Transaction = {
@@ -155,39 +106,39 @@ describe('AccountFromToInfoCard', () => {
   it('should match snapshot', async () => {
     const container = renderWithProvider(
       <AccountFromToInfoCard transactionState={transactionState} />,
-      { state: initialState },
+      { state: mockInitialState },
     );
     expect(container).toMatchSnapshot();
   });
 
   it('should render from address', async () => {
     const { findByText } = renderWithProvider(
       <AccountFromToInfoCard transactionState={transactionState} />,
-      { state: initialState },
+      { state: mockInitialState },
     );
     expect(await findByText('Account 1')).toBeDefined();
   });
 
   it('should render balance of from address', async () => {
     const { findByText } = renderWithProvider(
       <AccountFromToInfoCard transactionState={transactionState} />,
-      { state: initialState },
+      { state: mockInitialState },
     );
     expect(await findByText('Balance: < 0.00001 ETH')).toBeDefined();
   });
 
   it('should render to account name', async () => {
     const { findByText } = renderWithProvider(
       <AccountFromToInfoCard transactionState={transactionState} />,
-      { state: initialState },
+      { state: mockInitialState },
     );
     expect(await findByText('Account 2')).toBeDefined();
   });
 
   it('should render to address', async () => {
     const { findByText } = renderWithProvider(
       <AccountFromToInfoCard transactionState={transactionState} />,
-      { state: initialState },
+      { state: mockInitialState },
     );
     expect(await findByText('0x1...0x1')).toBeDefined();
   });
@@ -213,7 +164,7 @@ describe('AccountFromToInfoCard', () => {
     };
     const { findByText } = renderWithProvider(
       <AccountFromToInfoCard transactionState={NFTTransaction as any} />,
-      { state: initialState },
+      { state: mockInitialState },
     );
     expect(await findByText('0xF4e8...287B')).toBeDefined();
   });
@@ -236,7 +187,7 @@ describe('AccountFromToInfoCard', () => {
     };
     const { queryByText } = renderWithProvider(
       <AccountFromToInfoCard transactionState={txState} />,
-      { state: initialState },
+      { state: mockInitialState },
     );
     expect(await queryByText('test1.eth')).toBeDefined();
     expect(await queryByText('test3.eth')).toBeDefined();
@@ -274,7 +225,7 @@ describe('AccountFromToInfoCard', () => {
     it('should render balance from AssetsContractController.getERC20BalanceOf if selectedAddress is different from fromAddress', async () => {
       const { findByText } = renderWithProvider(
         <AccountFromToInfoCard transactionState={ERC20Transaction as any} />,
-        { state: initialState },
+        { state: mockInitialState },
       );
       expect(mockGetERC20BalanceOf).toBeCalledTimes(1);
       expect(await findByText('Balance: 10 TST')).toBeDefined();
@@ -291,7 +242,7 @@ describe('AccountFromToInfoCard', () => {
       };
       const { findByText } = renderWithProvider(
         <AccountFromToInfoCard transactionState={transaction as any} />,
-        { state: initialState },
+        { state: mockInitialState },
       );
       expect(mockGetERC20BalanceOf).toBeCalledTimes(0);
       expect(await findByText('Balance: 0.0005 TST')).toBeDefined();

diff --git a/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.tsx b/app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.tsx
@@ -9,6 +9,7 @@ import {
   selectNetwork,
   selectTicker,
 } from '../../../selectors/networkController';
+import { selectIdentities } from '../../../selectors/preferencesController';
 import { collectConfusables } from '../../../util/confusables';
 import { decodeTransferData } from '../../../util/transactions';
 import { doENSReverseLookup } from '../../../util/ENSUtils';
@@ -172,7 +173,7 @@ const AccountFromToInfoCard = (props: AccountFromToInfoCardProps) => {
 };
 
 const mapStateToProps = (state: any) => ({
-  identities: state.engine.backgroundState.PreferencesController.identities,
+  identities: selectIdentities(state),
   network: selectNetwork(state),
   ticker: selectTicker(state),
 });