cleanup

Author: n3ps

ui/selectors/selectors.js

@@ -2960,7 +2960,7 @@ export function getUrlScanCacheResult(state, hostname) {
  * @param {*} state
  * @returns The token scan cache object
  */
-function getTokenScanCache(state) {
+export function getTokenScanCache(state) {
   return state.metamask.tokenScanCache;
 }
 

ui/selectors/token-trust-signals.ts

@@ -1,6 +1,7 @@
 import { createDeepEqualSelector } from '../../shared/lib/selectors/selector-creators';
 import type { MultichainTokenScanKey } from '../helpers/utils/token-scan';
 import type { MetaMaskReduxState } from '../store/store';
+import { getTokenScanCache } from './selectors';
 import { EMPTY_OBJECT } from './shared';
 
 type TokenScanCacheResult = {
@@ -16,24 +17,10 @@ export type TokenScanCacheResults = Record<
   TokenScanCacheResult
 >;
 
-type MetaMaskWithTokenScanCache = {
-  tokenScanCache?: TokenScanCacheResults;
-};
-
-const getTokenScanCache = (
-  state: MetaMaskReduxState,
-): TokenScanCacheResults => {
-  const metamaskState = state.metamask as unknown as
-    | MetaMaskWithTokenScanCache
-    | undefined;
-
-  return (
-    metamaskState?.tokenScanCache ?? (EMPTY_OBJECT as TokenScanCacheResults)
-  );
-};
-
 export const getTokenScanResultsForCacheKeys = createDeepEqualSelector(
-  getTokenScanCache,
+  (state: MetaMaskReduxState) =>
+    (getTokenScanCache(state) as TokenScanCacheResults | undefined) ??
+    (EMPTY_OBJECT as TokenScanCacheResults),
   (_state: MetaMaskReduxState, tokenScanCacheKeys?: MultichainTokenScanKey[]) =>
     tokenScanCacheKeys,
   (tokenScanCache, tokenScanCacheKeys): TokenScanCacheResults => {