fix: Move foreground state properties from metamask slice to appState slice

.storybook/test-data.js

@@ -310,7 +310,6 @@ const state = {
     connectedAccounts: ['0x64a845a5b02460acf8a3d84503b0d68d028b4bb4'],
     isInitialized: true,
     isUnlocked: true,
-    isAccountMenuOpen: false,
     rpcUrl: 'https://rawtestrpc.metamask.io/',
     internalAccounts: {
       accounts: {
@@ -677,8 +676,6 @@ const state = {
         ],
       },
     ],
-    pendingTokens: {},
-    customNonceValue: '',
     send: {
       gasLimit: '0xcb28',
       gasPrice: null,
@@ -702,7 +699,6 @@ const state = {
     },
     useBlockie: false,
     featureFlags: {},
-    welcomeScreenSeen: false,
     slides: [],
     currentLocale: 'en',
     preferences: {
@@ -731,7 +727,6 @@ const state = {
       },
     },
     participateInMetaMetrics: true,
-    nextNonce: 71,
     connectedStatusPopoverHasBeenShown: true,
     swapsWelcomeMessageHasBeenShown: true,
     defaultHomeActiveTabName: 'Tokens',
@@ -1630,6 +1625,12 @@ const state = {
     openSeaEnabled: true,
   },
   appState: {
+    isAccountMenuOpen: false,
+    welcomeScreenSeen: false,
+    pendingTokens: {},
+    confirmationExchangeRates: {},
+    customNonceValue: '',
+    nextNonce: 71,
     shouldClose: false,
     menuOpen: false,
     modal: {
@@ -1665,7 +1666,6 @@ const state = {
     isLoading: false,
     warning: null,
     buyView: {},
-    gasIsLoading: false,
     defaultHdPaths: {
       trezor: "m/44'/60'/0'/0",
       ledger: "m/44'/60'/0'/0/0",

app/scripts/constants/sentry-state.ts

@@ -426,11 +426,7 @@ const flattenedBackgroundStateMask = Object.values(
 export const SENTRY_UI_STATE = {
   gas: true,
   history: true,
-  metamask: {
-    ...flattenedBackgroundStateMask,
-    // This property comes from the background but isn't in controller state
-    isInitialized: true,
-    // These properties are in the `metamask` slice but not in the background state
+  appState: {
     customNonceValue: true,
     isAccountMenuOpen: true,
     isNetworkMenuOpen: true,
@@ -439,6 +435,11 @@ export const SENTRY_UI_STATE = {
     welcomeScreenSeen: true,
     slides: false,
     confirmationExchangeRates: true,
+  },
+  metamask: {
+    ...flattenedBackgroundStateMask,
+    // This property comes from the background but isn't in controller state
+    isInitialized: true,
     useSafeChainsListValidation: true,
     watchEthereumAccountEnabled: false,
     bitcoinSupportEnabled: false,

docs/testing.md

@@ -74,7 +74,6 @@ const generateGasEstimatorProps = (overrides) => ({
 
 const generateAppState = (overrides) => ({
   networkDropdownOpen: false,
-  gasIsLoading: false,
   isLoading: false,
   modal: {
     open: false,

test/data/mock-send-state.json

@@ -13,7 +13,6 @@
     "networkDropdownOpen": false,
     "importNftsModal": { "open": false },
     "showPermittedNetworkToastOpen": false,
-    "gasIsLoading": false,
     "isLoading": false,
     "importTokensModalOpen": false,
     "modal": {

test/data/mock-state.json

@@ -10,12 +10,17 @@
     "url": "https://metamask.github.io/test-dapp/"
   },
   "appState": {
+    "isAccountMenuOpen": false,
+    "confirmationExchangeRates": {},
+    "nextNonce": 71,
+    "welcomeScreenSeen": false,
+    "pendingTokens": {},
+    "customTokenAmount": "10",
     "networkDropdownOpen": false,
     "importNftsModal": {
       "open": false
     },
     "showPermittedNetworkToastOpen": false,
-    "gasIsLoading": false,
     "isLoading": false,
     "modal": {
       "open": false,
@@ -27,8 +32,7 @@
         "name": null
       }
     },
-    "warning": null,
-    "customTokenAmount": "10"
+    "warning": null
   },
   "confirmAlerts": {
     "alerts": [],
@@ -419,11 +423,9 @@
         "key": "tokenFiatAmount",
         "order": "dsc",
         "sortCallback": "stringNumeric"
-      },
-      "tokenNetworkFilter": {}
+      }
     },
     "ensResolutionsByAddress": {},
-    "isAccountMenuOpen": false,
     "isUnlocked": true,
     "alertEnabledness": {
       "unconnectedAccount": true

test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json

@@ -1,7 +1,71 @@
 {
   "DNS": "object",
   "activeTab": "object",
-  "appState": "object",
+  "appState": {
+    "customNonceValue": "",
+    "isAccountMenuOpen": false,
+    "isNetworkMenuOpen": false,
+    "nextNonce": null,
+    "confirmationExchangeRates": {},
+    "ledgerTransportStatus": "string",
+    "ledgerWebHidConnectedStatus": "string",
+    "loadingMessage": "undefined",
+    "menuOpen": "boolean",
+    "modal": "object",
+    "alertOpen": "boolean",
+    "alertMessage": null,
+    "networkDropdownOpen": "boolean",
+    "importNftsModal": "object",
+    "keyringRemovalSnapModal": "object",
+    "importTokensModalOpen": "boolean",
+    "deprecatedNetworkModalOpen": "boolean",
+    "accountDetail": "object",
+    "isLoading": "boolean",
+    "isNftStillFetchingIndication": "boolean",
+    "buyView": "object",
+    "defaultHdPaths": "object",
+    "networksTabSelectedRpcUrl": "string",
+    "requestAccountTabs": "object",
+    "currentWindowTab": "object",
+    "gasLoadingAnimationIsShowing": "boolean",
+    "externalServicesOnboardingToggleState": "boolean",
+    "newNftAddedMessage": "string",
+    "removeNftMessage": "string",
+    "newNetworkAddedName": "string",
+    "editedNetwork": "undefined",
+    "newNetworkAddedConfigurationId": "string",
+    "newTokensImported": "string",
+    "newTokensImportedError": "string",
+    "onboardedInThisUISession": "boolean",
+    "customTokenAmount": "string",
+    "accountDetailsAddress": "string",
+    "isAddingNewNetwork": "boolean",
+    "isMultiRpcOnboarding": "boolean",
+    "errorInSettings": null,
+    "openMetaMaskTabs": "object",
+    "pendingTokens": "object",
+    "qrCodeData": null,
+    "selectedNetworkConfigurationId": "string",
+    "scrollToBottom": "boolean",
+    "sendInputCurrencySwitched": "boolean",
+    "shouldClose": "boolean",
+    "showBasicFunctionalityModal": "boolean",
+    "showDataDeletionErrorModal": "boolean",
+    "showDeleteMetaMetricsDataModal": "boolean",
+    "showIpfsModalOpen": "boolean",
+    "showKeyringRemovalSnapModal": "boolean",
+    "showNftDetectionEnablementToast": "boolean",
+    "showPermittedNetworkToastOpen": "boolean",
+    "showTermsOfUsePopup": "boolean",
+    "showWhatsNewPopup": "boolean",
+    "singleExceptions": "object",
+    "smartTransactionsError": null,
+    "smartTransactionsErrorMessageDismissed": "boolean",
+    "snapsInstallPrivacyWarningShown": "boolean",
+    "txId": null,
+    "warning": "string",
+    "welcomeScreenSeen": false
+  },
   "bridge": "object",
   "confirmAlerts": "object",
   "confirmTransaction": "object",
@@ -12,18 +76,12 @@
   "metamask": {
     "isInitialized": true,
     "isUnlocked": true,
-    "isAccountMenuOpen": false,
-    "isNetworkMenuOpen": false,
     "internalAccounts": { "accounts": "object", "selectedAccount": "string" },
     "transactions": "object",
     "networkConfigurations": "object",
     "addressBook": "object",
-    "confirmationExchangeRates": {},
-    "pendingTokens": "object",
-    "customNonceValue": "",
     "useBlockie": false,
     "featureFlags": {},
-    "welcomeScreenSeen": false,
     "currentLocale": "en",
     "preferences": {
       "hideZeroBalanceTokens": false,
@@ -48,7 +106,6 @@
     "use4ByteResolution": true,
     "participateInMetaMetrics": true,
     "dataCollectionForMarketing": "boolean",
-    "nextNonce": null,
     "currencyRates": {
       "ETH": {
         "conversionDate": "number",

ui/components/multichain/import-tokens-modal/import-tokens-modal-confirm.js

@@ -2,6 +2,7 @@ import React, { useContext } from 'react';
 import { useSelector } from 'react-redux';
 import {
   getCurrentNetwork,
+  getPendingTokens,
   getTestNetworkBackgroundColor,
   getTokenList,
 } from '../../../selectors';
@@ -22,7 +23,6 @@ import {
   AlignItems,
   FlexDirection,
 } from '../../../helpers/constants/design-system';
-import { getPendingTokens } from '../../../ducks/metamask/metamask';
 import TokenBalance from '../../ui/token-balance/token-balance';
 import { I18nContext } from '../../../contexts/i18n';
 

ui/components/multichain/import-tokens-modal/import-tokens-modal.js

@@ -29,6 +29,7 @@ import {
   getCurrentNetwork,
   getTestNetworkBackgroundColor,
   getTokenExchangeRates,
+  getPendingTokens,
 } from '../../../selectors';
 import {
   addImportedTokens,
@@ -90,10 +91,7 @@ import {
 } from '../../../helpers/utils/util';
 import { tokenInfoGetter } from '../../../helpers/utils/token-util';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import {
-  getNativeCurrency,
-  getPendingTokens,
-} from '../../../ducks/metamask/metamask';
+import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,

ui/ducks/app/app.test.js

@@ -358,4 +358,73 @@ describe('App State', () => {
 
     expect(state.errorInSettings).toBeNull();
   });
+
+  it('toggles account menu', () => {
+    const state = reduceApp(
+      {},
+      {
+        type: actionConstants.TOGGLE_ACCOUNT_MENU,
+      },
+    );
+
+    expect(state.isAccountMenuOpen).toStrictEqual(true);
+  });
+
+  it('toggles network menu', () => {
+    const state = reduceApp(
+      {},
+      {
+        type: actionConstants.TOGGLE_NETWORK_MENU,
+      },
+    );
+
+    expect(state.isNetworkMenuOpen).toStrictEqual(true);
+  });
+
+  it('close welcome screen', () => {
+    const state = reduceApp(
+      {},
+      {
+        type: actionConstants.CLOSE_WELCOME_SCREEN,
+      },
+    );
+
+    expect(state.welcomeScreenSeen).toStrictEqual(true);
+  });
+
+  it('sets pending tokens', () => {
+    const payload = {
+      address: '0x617b3f8050a0bd94b6b1da02b4384ee5b4df13f4',
+      decimals: 18,
+      symbol: 'META',
+    };
+
+    const pendingTokensState = reduceApp(
+      {},
+      {
+        type: actionConstants.SET_PENDING_TOKENS,
+        payload,
+      },
+    );
+
+    expect(pendingTokensState.pendingTokens).toStrictEqual(payload);
+  });
+
+  it('clears pending tokens', () => {
+    const payload = {
+      address: '0x617b3f8050a0bd94b6b1da02b4384ee5b4df13f4',
+      decimals: 18,
+      symbol: 'META',
+    };
+
+    const pendingTokensState = {
+      pendingTokens: payload,
+    };
+
+    const state = reduceApp(pendingTokensState, {
+      type: actionConstants.CLEAR_PENDING_TOKENS,
+    });
+
+    expect(state.pendingTokens).toStrictEqual({});
+  });
 });