refactor: Unflatten selectors and convert to TypeScript

.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,11 @@ const state = {
     openSeaEnabled: true,
   },
   appState: {
+    isAccountMenuOpen: false,
+    welcomeScreenSeen: false,
+    pendingTokens: {},
+    customNonceValue: '',
+    nextNonce: 71,
     shouldClose: false,
     menuOpen: false,
     modal: {
@@ -1665,7 +1665,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

@@ -260,6 +260,11 @@ export const SENTRY_BACKGROUND_STATE = {
       petnamesEnabled: true,
       showConfirmationAdvancedDetails: true,
       privacyMode: false,
+      useNativeCurrencyAsPrimaryCurrency: true,
+      featureNotificationsEnabled: true,
+      showMultiRpcModal: true,
+      tokenSortConfig: {},
+      shouldShowAggregatedBalancePopover: true,
     },
     useExternalServices: false,
     selectedAddress: false,
@@ -412,26 +417,13 @@ export const SENTRY_BACKGROUND_STATE = {
   ///: END:ONLY_INCLUDE_IF
 };
 
-const flattenedBackgroundStateMask = Object.values(
-  SENTRY_BACKGROUND_STATE,
-).reduce((partialBackgroundState, controllerState: object) => {
-  return {
-    ...partialBackgroundState,
-    ...controllerState,
-  };
-}, {});
-
 // This describes the subset of Redux state attached to errors sent to Sentry
 // These properties have some potential to be useful for debugging, and they do
 // not contain any identifiable information.
 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,
@@ -440,18 +432,29 @@ export const SENTRY_UI_STATE = {
     welcomeScreenSeen: true,
     slides: false,
     confirmationExchangeRates: true,
-    useSafeChainsListValidation: true,
-    watchEthereumAccountEnabled: false,
-    bitcoinSupportEnabled: false,
-    bitcoinTestnetSupportEnabled: false,
-    ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
-    addSnapAccountEnabled: false,
-    snapsAddSnapAccountModalDismissed: false,
-    ///: END:ONLY_INCLUDE_IF
-    switchedNetworkDetails: false,
-    switchedNetworkNeverShowMessage: false,
-    newPrivacyPolicyToastClickedOrClosed: false,
-    newPrivacyPolicyToastShownDate: false,
+  },
+  metamask: {
+    // This property comes from the background but isn't in controller state
+    isInitialized: true,
+    ...SENTRY_BACKGROUND_STATE,
+    PreferencesController: {
+      ...SENTRY_BACKGROUND_STATE.PreferencesController,
+      useSafeChainsListValidation: true,
+      watchEthereumAccountEnabled: false,
+      bitcoinSupportEnabled: false,
+      bitcoinTestnetSupportEnabled: false,
+      ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
+      addSnapAccountEnabled: false,
+      snapsAddSnapAccountModalDismissed: false,
+      ///: END:ONLY_INCLUDE_IF
+    },
+    AppStateController: {
+      ...SENTRY_BACKGROUND_STATE.AppStateController,
+      switchedNetworkDetails: false,
+      switchedNetworkNeverShowMessage: false,
+      newPrivacyPolicyToastClickedOrClosed: false,
+      newPrivacyPolicyToastShownDate: false,
+    },
   },
   unconnectedAccount: true,
 };

app/scripts/controllers/account-tracker-controller.ts

@@ -24,7 +24,7 @@ import {
   NetworkControllerGetStateAction,
   Provider,
 } from '@metamask/network-controller';
-import { hasProperty, Hex } from '@metamask/utils';
+import { getKnownPropertyNames, hasProperty, Hex } from '@metamask/utils';
 import {
   BaseController,
   ControllerGetStateAction,
@@ -66,7 +66,7 @@ type Account = {
 export type AccountTrackerControllerState = {
   accounts: Record<string, Account | Record<string, never>>;
   currentBlockGasLimit: string;
-  accountsByChainId: Record<string, AccountTrackerControllerState['accounts']>;
+  accountsByChainId: Record<Hex, AccountTrackerControllerState['accounts']>;
   currentBlockGasLimitByChainId: Record<Hex, string>;
 };
 
@@ -524,7 +524,7 @@ export default class AccountTrackerController extends BaseController<
     addresses.forEach((address) => {
       accounts[address] = {};
     });
-    Object.keys(accountsByChainId).forEach((chainId) => {
+    getKnownPropertyNames(accountsByChainId).forEach((chainId) => {
       addresses.forEach((address) => {
         accountsByChainId[chainId][address] = {};
       });
@@ -562,7 +562,7 @@ export default class AccountTrackerController extends BaseController<
     addresses.forEach((address) => {
       delete accounts[address];
     });
-    Object.keys(accountsByChainId).forEach((chainId) => {
+    getKnownPropertyNames(accountsByChainId).forEach((chainId) => {
       addresses.forEach((address) => {
         delete accountsByChainId[chainId][address];
       });

app/scripts/controllers/app-state-controller.ts

@@ -65,7 +65,7 @@ export type AppStateControllerState = {
   // prior to Migration 92.3 where we split out the setting to support
   // multiple networks.
   hadAdvancedGasFeesSetPriorToMigration92_3: boolean;
-  qrHardware: Json;
+  qrHardware: { sign?: { request?: Json } } | Json;
   nftsDropdownState: Json;
   surveyLinkLastClickedOrClosed: number | null;
   signatureSecurityAlertResponses: Record<string, SecurityAlertResponse>;