update

Author: jpuri

ui/pages/confirmations/confirmation/alerts/useAlertsActions.tsx

@@ -3,15 +3,21 @@ import { useCallback } from 'react';
 import { useSelector } from 'react-redux';
 
 import { AlertActionKey } from '../../../../components/app/confirm/info/row/constants';
-import { getApprovalsByOrigin } from '../../../../selectors';
 import { useConfirmationNavigation } from '../../hooks/useConfirmationNavigation';
+import {
+  ApprovalsMetaMaskState,
+  getApprovalsByOrigin,
+} from '../../../../selectors';
 
 export const useAlertsActions = (
   hideAlertModal: () => void,
   pendingConfirmation: ApprovalRequest<{ id: string }>,
 ) => {
   const pendingConfirmationsFromOrigin = useSelector((state) =>
-    getApprovalsByOrigin(state, pendingConfirmation?.origin),
+    getApprovalsByOrigin(
+      state as ApprovalsMetaMaskState,
+      pendingConfirmation?.origin,
+    ),
   );
 
   const { getIndex, navigateToIndex } = useConfirmationNavigation();

ui/pages/confirmations/confirmation/alerts/useUpdateEthereumChainAlerts.ts

@@ -6,7 +6,10 @@ import { useSelector } from 'react-redux';
 import { Alert } from '../../../../ducks/confirm-alerts/confirm-alerts';
 import { AlertActionKey } from '../../../../components/app/confirm/info/row/constants';
 import { Severity } from '../../../../helpers/constants/design-system';
-import { getApprovalsByOrigin } from '../../../../selectors';
+import {
+  ApprovalsMetaMaskState,
+  getApprovalsByOrigin,
+} from '../../../../selectors';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 
 const VALIDATED_APPROVAL_TYPES = [
@@ -18,7 +21,10 @@ export function useUpdateEthereumChainAlerts(
   pendingConfirmation: ApprovalRequest<{ id: string }>,
 ): Alert[] {
   const pendingConfirmationsFromOrigin = useSelector((state) =>
-    getApprovalsByOrigin(state, pendingConfirmation?.origin),
+    getApprovalsByOrigin(
+      state as ApprovalsMetaMaskState,
+      pendingConfirmation?.origin,
+    ),
   );
 
   const t = useI18nContext();

ui/selectors/approvals.ts

@@ -99,6 +99,18 @@ export const selectPendingApproval = createDeepEqualSelector(
   (approval) => approval,
 );
 
+export const getApprovalsByOrigin = (
+  state: ApprovalsMetaMaskState,
+  origin: string,
+) => {
+  const pendingApprovals = getPendingApprovals(state);
+
+  return pendingApprovals?.filter(
+    (confirmation: ApprovalRequest<Record<string, Json>>) =>
+      confirmation.origin === origin,
+  );
+};
+
 function isWatchTokenApproval(approval: ApprovalRequest<Record<string, Json>>) {
   const tokenId = (approval.requestData?.asset as Record<string, string>)
     ?.tokenId;

ui/selectors/selectors.js

@@ -1502,21 +1502,6 @@ export const getMemoizedUnapprovedConfirmations = createDeepEqualSelector(
   (confirmations) => confirmations,
 );
 
-/**
- * Get pending confirmation from specified origin.
- *
- * @param state - Redux state object.
- * @param origin - Origin to ger approvals from.
- * @returns array of approvals from an origin
- */
-export const getApprovalsByOrigin = (state, origin) => {
-  const pendingApprovals = getMemoizedUnapprovedConfirmations(state);
-
-  return pendingApprovals?.filter(
-    (confirmation) => confirmation.origin === origin,
-  );
-};
-
 /**
  * Get a memoized version of the unapproved templated confirmations.
  */