chore: selectors confirmations dir

app/components/Views/SDK/SDKSessionModal/SDKSessionModal.tsx

@@ -33,6 +33,7 @@ import Text, {
 } from '../../../../component-library/components/Texts/Text';
 import { useTheme } from '../../../../util/theme';
 import { strings } from '../../../../../locales/i18n';
+import { selectPermissionControllerState } from '../../../../selectors/snaps/permissionController';
 
 const createStyles = (
   _colors: ThemeColors,
@@ -91,11 +92,7 @@ const SDKSessionModal = ({ route }: SDKSEssionMoodalProps) => {
   const { colors, typography } = useTheme();
   const styles = createStyles(colors, typography, safeAreaInsets);
   const { navigate } = useNavigation();
-  const permittedAccountsList = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) => state.engine.backgroundState.PermissionController,
-  );
+  const permittedAccountsList = useSelector(selectPermissionControllerState);
 
   const [permittedAccountsAddresses, setPermittedAccountsAddresses] = useState<
     string[]

app/components/Views/Settings/Contacts/ContactForm/index.js

@@ -35,6 +35,7 @@ import { selectChainId } from '../../../../../selectors/networkController';
 import { AddContactViewSelectorsIDs } from '../../../../../../e2e/selectors/Settings/Contacts/AddContactView.selectors';
 import { selectInternalAccounts } from '../../../../../selectors/accountsController';
 import { toLowerCaseEquals } from '../../../../../util/general';
+import { selectAddressBook } from '../../../../../selectors/addressBookController';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -504,7 +505,7 @@ class ContactForm extends PureComponent {
 ContactForm.contextType = ThemeContext;
 
 const mapStateToProps = (state) => ({
-  addressBook: state.engine.backgroundState.AddressBookController.addressBook,
+  addressBook: selectAddressBook(state),
   internalAccounts: selectInternalAccounts(state),
   chainId: selectChainId(state),
 });

app/components/Views/Settings/Contacts/index.js

@@ -13,6 +13,7 @@ import { selectChainId } from '../../../../selectors/networkController';
 import Routes from '../../../../../app/constants/navigation/Routes';
 
 import { ContactsViewSelectorIDs } from '../../../../../e2e/selectors/Settings/Contacts/ContacsView.selectors';
+import { selectAddressBook } from '../../../../selectors/addressBookController';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -175,7 +176,7 @@ class Contacts extends PureComponent {
 Contacts.contextType = ThemeContext;
 
 const mapStateToProps = (state) => ({
-  addressBook: state.engine.backgroundState.AddressBookController.addressBook,
+  addressBook: selectAddressBook(state),
   chainId: selectChainId(state),
 });
 

app/components/Views/Snaps/SnapSettings/SnapSettings.tsx

@@ -27,6 +27,7 @@ import { strings } from '../../../../../locales/i18n';
 import { useStyles } from '../../../hooks/useStyles';
 import { useSelector } from 'react-redux';
 import SNAP_SETTINGS_REMOVE_BUTTON from './SnapSettings.constants';
+import { selectPermissionControllerState } from '../../../../selectors/snaps/permissionController';
 
 interface SnapSettingsProps {
   snap: Snap;
@@ -42,11 +43,7 @@ const SnapSettings = () => {
 
   const { snap } = useParams<SnapSettingsProps>();
 
-  const permissionsState = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) => state.engine.backgroundState.PermissionController,
-  );
+  const permissionsState = useSelector(selectPermissionControllerState);
 
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

app/components/Views/Snaps/SnapsSettingsList/SnapsSettingsList.tsx

@@ -12,6 +12,7 @@ import { strings } from '../../../../../locales/i18n';
 import { useStyles } from '../../../../component-library/hooks';
 import stylesheet from './SnapsSettingsList.styles';
 import { Snap } from '@metamask/snaps-utils';
+import { selectSnaps } from '../../../../selectors/snaps/snapController';
 
 export const createSnapsSettingsListNavDetails = createNavigationDetails(
   Routes.SNAPS.SNAPS_SETTINGS_LIST,
@@ -21,11 +22,7 @@ const SnapsSettingsList = () => {
   const navigation = useNavigation();
   const { styles, theme } = useStyles(stylesheet, {});
   const { colors } = theme;
-  const snaps = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) => state.engine.backgroundState.SnapController.snaps,
-  );
+  const snaps = useSelector(selectSnaps);
 
   useEffect(() => {
     navigation.setOptions(

app/components/Views/confirmations/Approval/index.js

@@ -51,6 +51,8 @@ import { withMetricsAwareness } from '../../../../components/hooks/useMetrics';
 import { STX_NO_HASH_ERROR } from '../../../../util/smart-transactions/smart-publish-hook';
 import { getSmartTransactionMetricsProperties } from '../../../../util/smart-transactions';
 import { selectTransactionMetrics } from '../../../../core/redux/slices/transactionMetrics';
+import { selectTransactions } from '../../../../selectors/transactionController';
+import { selectShowCustomNonce } from '../../../../selectors/settings';
 import { buildTransactionParams } from '../../../../util/confirmation/transactions';
 
 const REVIEW = 'review';
@@ -653,10 +655,10 @@ class Approval extends PureComponent {
 
 const mapStateToProps = (state) => ({
   transaction: getNormalizedTxState(state),
-  transactions: state.engine.backgroundState.TransactionController.transactions,
+  transactions: selectTransactions(state),
   selectedAddress: selectSelectedInternalAccountChecksummedAddress(state),
   networkType: selectProviderType(state),
-  showCustomNonce: state.settings.showCustomNonce,
+  showCustomNonce: selectShowCustomNonce(state),
   chainId: selectChainId(state),
   activeTabUrl: getActiveTabUrl(state),
   shouldUseSmartTransaction: selectShouldUseSmartTransaction(state),

app/components/Views/confirmations/ApproveView/Approve/index.js

@@ -71,6 +71,12 @@ import { selectGasFeeEstimates } from '../../../../../selectors/confirmTransacti
 import { selectGasFeeControllerEstimateType } from '../../../../../selectors/gasFeeController';
 import { selectShouldUseSmartTransaction } from '../../../../../selectors/smartTransactionsController';
 import { STX_NO_HASH_ERROR } from '../../../../../util/smart-transactions/smart-publish-hook';
+import { selectTransactions } from '../../../../../selectors/transactionController';
+import {
+  selectPrimaryCurrency,
+  selectShowCustomNonce,
+} from '../../../../../selectors/settings';
+import { selectAddressBook } from '../../../../../selectors/addressBookController';
 import { buildTransactionParams } from '../../../../../util/confirmation/transactions';
 
 const EDIT = 'edit';
@@ -902,17 +908,17 @@ const mapStateToProps = (state) => ({
   accounts: selectAccounts(state),
   ticker: selectTicker(state),
   transaction: getNormalizedTxState(state),
-  transactions: state.engine.backgroundState.TransactionController.transactions,
+  transactions: selectTransactions(state),
   tokensLength: selectTokensLength(state),
   accountsLength: selectAccountsLength(state),
-  primaryCurrency: state.settings.primaryCurrency,
+  primaryCurrency: selectPrimaryCurrency(state),
   chainId: selectChainId(state),
   gasFeeEstimates: selectGasFeeEstimates(state),
   gasEstimateType: selectGasFeeControllerEstimateType(state),
   conversionRate: selectConversionRate(state),
   currentCurrency: selectCurrentCurrency(state),
-  showCustomNonce: state.settings.showCustomNonce,
-  addressBook: state.engine.backgroundState.AddressBookController.addressBook,
+  showCustomNonce: selectShowCustomNonce(state),
+  addressBook: selectAddressBook(state),
   providerType: selectProviderType(state),
   providerRpcTarget: selectRpcUrl(state),
   networkConfigurations: selectNetworkConfigurations(state),

app/components/Views/confirmations/Send/index.js

@@ -65,6 +65,7 @@ import { withMetricsAwareness } from '../../../../components/hooks/useMetrics';
 import { selectShouldUseSmartTransaction } from '../../../../selectors/smartTransactionsController';
 import { STX_NO_HASH_ERROR } from '../../../../util/smart-transactions/smart-publish-hook';
 import { toLowerCaseEquals } from '../../../../util/general';
+import { selectAddressBook } from '../../../../selectors/addressBookController';
 import TransactionTypes from '../../../../core/TransactionTypes';
 
 const REVIEW = 'review';
@@ -780,7 +781,7 @@ class Send extends PureComponent {
 }
 
 const mapStateToProps = (state) => ({
-  addressBook: state.engine.backgroundState.AddressBookController.addressBook,
+  addressBook: selectAddressBook(state),
   accounts: selectAccounts(state),
   contractBalances: selectContractBalances(state),
   transaction: state.transaction,

app/components/Views/confirmations/SendFlow/AddressList/AddressList.tsx

@@ -24,6 +24,8 @@ import { selectInternalAccounts } from '../../../../../selectors/accountsControl
 import { AddressListProps, Contact } from './AddressList.types';
 import styleSheet from './AddressList.styles';
 import { toChecksumHexAddress } from '@metamask/controller-utils';
+import { selectAddressBook } from '../../../../../selectors/addressBookController';
+import { RootState } from '../../../../../reducers';
 
 // TODO: Replace "any" with type
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -51,16 +53,9 @@ const AddressList: React.FC<AddressListProps> = ({
   const [fuse, setFuse] = useState<any>(undefined);
   const chainId = useSelector(selectChainId);
   const internalAccounts = useSelector(selectInternalAccounts);
-  const addressBook = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) =>
-      state.engine.backgroundState.AddressBookController.addressBook,
-  );
+  const addressBook = useSelector(selectAddressBook);
   const ambiguousAddressEntries = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) => state.user.ambiguousAddressEntries,
+    (state: RootState) => state.user.ambiguousAddressEntries,
   );
 
   const networkAddressBook: { [address: string]: AddressBookEntry } = useMemo(

app/components/Views/confirmations/SendFlow/Confirm/components/CustomGasModal/CustomGasModal.tsx

@@ -10,6 +10,9 @@ import EditGasFeeLegacy from '../../../../components/EditGasFeeLegacyUpdate';
 import createStyles from './CustomGasModal.styles';
 import { CustomGasModalProps } from './CustomGasModal.types';
 import { selectGasFeeEstimates } from '../../../../../../../selectors/confirmTransaction';
+import { selectGasFeeControllerEstimateType } from '../../../../../../..//selectors/gasFeeController';
+import { RootState } from '../../../../../../../reducers';
+import { selectPrimaryCurrency } from '../../../../../../..//selectors/settings';
 
 const CustomGasModal = ({
   gasSelected,
@@ -27,33 +30,15 @@ const CustomGasModal = ({
 }: CustomGasModalProps) => {
   const { colors } = useAppThemeFromContext();
   const styles = createStyles();
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const transaction = useSelector((state: any) => state.transaction);
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const gasFeeEstimate = useSelector((state: any) =>
-    selectGasFeeEstimates(state),
-  );
-  const primaryCurrency = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) => state.settings.primaryCurrency,
-  );
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const chainId = useSelector((state: any) => selectChainId(state));
+
+  const transaction = useSelector((state: RootState) => state.transaction);
+  const gasFeeEstimate = useSelector(selectGasFeeEstimates);
+  const primaryCurrency = useSelector(selectPrimaryCurrency);
+  const chainId = useSelector(selectChainId);
   const selectedAsset = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) => state.transaction.selectedAsset,
-  );
-  const gasEstimateType = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) =>
-      state.engine.backgroundState.GasFeeController.gasEstimateType,
+    (state: RootState) => state.transaction.selectedAsset,
   );
+  const gasEstimateType = useSelector(selectGasFeeControllerEstimateType);
 
   const [selectedGas, setSelectedGas] = useState(gasSelected);
   const [eip1559Txn, setEIP1559Txn] = useState(EIP1559GasTxn);

app/components/Views/confirmations/SendFlow/SendTo/index.js

@@ -62,6 +62,7 @@ import { includes } from 'lodash';
 import { SendViewSelectorsIDs } from '../../../../../../e2e/selectors/SendView.selectors';
 import { withMetricsAwareness } from '../../../../../components/hooks/useMetrics';
 import { toLowerCaseEquals } from '../../../../../util/general';
+import { selectAddressBook } from '../../../../../selectors/addressBookController';
 
 const dummy = () => true;
 
@@ -668,7 +669,7 @@ class SendFlow extends PureComponent {
 SendFlow.contextType = ThemeContext;
 
 const mapStateToProps = (state) => ({
-  addressBook: state.engine.backgroundState.AddressBookController.addressBook,
+  addressBook: selectAddressBook(state),
   chainId: selectChainId(state),
   selectedAddress: selectSelectedInternalAccountChecksummedAddress(state),
   selectedAsset: state.transaction.selectedAsset,

app/components/Views/confirmations/components/ApproveTransactionReview/AddNickname/index.tsx

@@ -40,6 +40,7 @@ import { ContractNickNameViewSelectorsIDs } from '../../../../../../../e2e/selec
 import { useMetrics } from '../../../../../../components/hooks/useMetrics';
 import { selectInternalAccounts } from '../../../../../../selectors/accountsController';
 import { RootState } from '../../../../../../reducers';
+import { selectAddressBook } from '../../../../../../selectors/addressBookController';
 
 const getAnalyticsParams = () => ({});
 
@@ -267,7 +268,7 @@ const mapStateToProps = (state: RootState) => ({
   providerType: selectProviderType(state),
   providerRpcTarget: selectRpcUrl(state),
   providerChainId: selectChainId(state),
-  addressBook: state.engine.backgroundState.AddressBookController.addressBook,
+  addressBook: selectAddressBook(state),
   internalAccounts: selectInternalAccounts(state),
   networkConfigurations: selectNetworkConfigurations(state),
 });

app/components/Views/confirmations/components/EditGasFeeLegacyUpdate/index.tsx

@@ -41,6 +41,8 @@ import {
 } from '../../../../../util/gasUtils';
 import { useMetrics } from '../../../../../components/hooks/useMetrics';
 import { selectGasFeeEstimates } from '../../../../../selectors/confirmTransaction';
+import { selectPrimaryCurrency } from '../../../../../selectors/settings';
+import { selectGasFeeControllerEstimateType } from '../../../../../selectors/gasFeeController';
 
 const EditGasFeeLegacy = ({
   onCancel,
@@ -77,22 +79,11 @@ const EditGasFeeLegacy = ({
   const styles = createStyles(colors);
   const gasFeeEstimate = useSelector(selectGasFeeEstimates);
 
-  const primaryCurrency = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) => state.settings.primaryCurrency,
-  );
+  const primaryCurrency = useSelector(selectPrimaryCurrency);
 
-  const gasEstimateType = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) =>
-      state.engine.backgroundState.GasFeeController.gasEstimateType,
-  );
+  const gasEstimateType = useSelector(selectGasFeeControllerEstimateType);
 
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const chainId = useSelector((state: any) => selectChainId(state));
+  const chainId = useSelector(selectChainId);
 
   const gasTransaction = useGasTransaction({
     onlyGas,

app/components/hooks/useHideFiatForTestnet/index.test.ts

@@ -1,7 +1,7 @@
 import { renderHook } from '@testing-library/react-hooks';
 import { selectChainId } from '../../../selectors/networkController';
 import { TEST_NETWORK_IDS } from '../../../constants/network';
-import selectShowFiatInTestnets from '../../../selectors/settings';
+import { selectShowFiatInTestnets } from '../../../selectors/settings';
 import useHideFiatForTestnet from './index';
 
 jest.mock('react-redux', () => ({
@@ -13,8 +13,7 @@ jest.mock('../../../selectors/networkController', () => ({
 }));
 
 jest.mock('../../../selectors/settings', () => ({
-  __esModule: true,
-  default: jest.fn(),
+  selectShowFiatInTestnets: jest.fn(),
 }));
 
 describe('useHideFiatForTestnet', () => {

app/components/hooks/useHideFiatForTestnet/index.ts

@@ -1,7 +1,7 @@
 import { useSelector } from 'react-redux';
 import type { Hex } from '@metamask/utils';
 import { selectChainId } from '../../../selectors/networkController';
-import selectShowFiatInTestnets from '../../../selectors/settings';
+import { selectShowFiatInTestnets } from '../../../selectors/settings';
 import { TEST_NETWORK_IDS } from '../../../constants/network';
 
 /**

app/selectors/addressBookController.test.ts

@@ -0,0 +1,33 @@
+import { RootState } from '../reducers';
+import { selectAddressBook } from './addressBookController';
+import { AddressBookState } from '@metamask/address-book-controller';
+
+describe('selectAddressBook', () => {
+  it('returns addressBook from state', () => {
+    const mockAddressBookState: AddressBookState = {
+      addressBook: {
+        '0x1': {
+          '0x123': {
+            address: '0x123',
+            name: 'Alice',
+            chainId: '0x1',
+            memo: 'Friend',
+            isEns: false,
+          },
+        },
+      },
+    };
+
+    const mockState = {
+      engine: {
+        backgroundState: {
+          AddressBookController: mockAddressBookState,
+        },
+      },
+    };
+
+    expect(selectAddressBook(mockState as RootState)).toEqual(
+      mockAddressBookState.addressBook,
+    );
+  });
+});

app/selectors/addressBookController.ts

@@ -0,0 +1,12 @@
+import { RootState } from '../reducers';
+import { createSelector } from 'reselect';
+import { AddressBookState } from '@metamask/address-book-controller';
+
+export const selectAddressBookControllerState = (state: RootState) =>
+  state.engine.backgroundState.AddressBookController;
+
+export const selectAddressBook = createSelector(
+  selectAddressBookControllerState,
+  (addressBookControllerState: AddressBookState) =>
+    addressBookControllerState.addressBook,
+);