Fix E2E tests

MetaMask · Dec 9, 2024 · 3d66d7f · 3d66d7f
1 parent db5cdf9
commit 3d66d7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/ui/pages/confirmations/components/confirm/nav/nav.tsx b/ui/pages/confirmations/components/confirm/nav/nav.tsx
@@ -1,5 +1,6 @@
 import React, { useCallback } from 'react';
 
+import { useDispatch } from 'react-redux';
 import { QueueType } from '../../../../../../shared/constants/metametrics';
 import {
   Box,
@@ -35,9 +36,9 @@ export type NavProps = {
 
 export const Nav = ({ confirmationId }: NavProps) => {
   const t = useI18nContext();
+  const dispatch = useDispatch();
 
-  const { confirmations, count, getIndex, navigateToIndex } =
-    useConfirmationNavigation();
+  const { count, getIndex, navigateToIndex } = useConfirmationNavigation();
 
   const position = getIndex(confirmationId);
 
@@ -49,8 +50,8 @@ export const Nav = ({ confirmationId }: NavProps) => {
   );
 
   const onRejectAll = useCallback(async () => {
-    await rejectAllApprovals();
-  }, [confirmations]);
+    await dispatch(rejectAllApprovals());
+  }, [dispatch]);
 
   useQueuedConfirmationsEvent(QueueType.NavigationHeader);
 

diff --git a/ui/store/actions.ts b/ui/store/actions.ts
@@ -5304,8 +5304,16 @@ export function requestUserApproval({
   };
 }
 
-export async function rejectAllApprovals() {
-  await submitRequestToBackground('rejectAllApprovals');
+export function rejectAllApprovals() {
+  return async (dispatch: MetaMaskReduxDispatch) => {
+    await submitRequestToBackground('rejectAllApprovals');
+
+    const { pendingApprovals } = await forceUpdateMetamaskState(dispatch);
+
+    if (Object.values(pendingApprovals).length === 0) {
+      dispatch(closeCurrentNotificationWindow());
+    }
+  };
 }
 
 export async function getCurrentNetworkEIP1559Compatibility(): Promise<