fix issue where queued request counts were not included in logic to r…

…eroute from home screen and close notification
MetaMask · Jun 20, 2024 · 44a6e33 · 44a6e33
1 parent b8bd980
commit 44a6e33
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -2285,6 +2285,7 @@ export default class MetamaskController extends EventEmitter {
         AuthenticationController: this.authenticationController,
         UserStorageController: this.userStorageController,
         MetamaskNotificationsController: this.metamaskNotificationsController,
+        QueuedRequestController: this.queuedRequestController,
         PushPlatformNotificationsController:
           this.pushPlatformNotificationsController,
         ...resetOnRestartStore,

diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
@@ -89,17 +89,19 @@ import FlaskHomeFooter from './flask/flask-home-footer.component';
 
 function shouldCloseNotificationPopup({
   isNotification,
-  totalUnapprovedCount,
+  totalUnapprovedAndQueuedRequestCount,
   hasApprovalFlows,
   isSigningQRHardwareTransaction,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   waitForConfirmDeepLinkDialog,
   institutionalConnectRequests,
   ///: END:ONLY_INCLUDE_IF
 }) {
+  // we can't use totalUnapproved because there are also queued requests
+
   let shouldClose =
     isNotification &&
-    totalUnapprovedCount === 0 &&
+    totalUnapprovedAndQueuedRequestCount === 0 &&
     !hasApprovalFlows &&
     !isSigningQRHardwareTransaction;
 

diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
@@ -46,6 +46,7 @@ import {
   getNewTokensImportedError,
   hasPendingApprovals,
   getSelectedInternalAccount,
+  getQueuedRequestCount,
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
   getAccountType,
   ///: END:ONLY_INCLUDE_IF
@@ -114,6 +115,9 @@ const mapStateToProps = (state) => {
   const { address: selectedAddress } = getSelectedInternalAccount(state);
   const { forgottenPassword } = metamask;
   const totalUnapprovedCount = getTotalUnapprovedCount(state);
+  const queuedRequestCount = getQueuedRequestCount(state);
+  const totalUnapprovedAndQueuedRequestCount =
+    totalUnapprovedCount + queuedRequestCount;
   const swapsEnabled = getSwapsFeatureIsLive(state);
   const pendingConfirmations = getUnapprovedTemplatedConfirmations(state);
   ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
@@ -175,6 +179,7 @@ const mapStateToProps = (state) => {
     selectedAddress,
     firstPermissionsRequestId,
     totalUnapprovedCount,
+    totalUnapprovedAndQueuedRequestCount,
     participateInMetaMetrics,
     hasApprovalFlows: getApprovalFlows(state)?.length > 0,
     connectedStatusPopoverHasBeenShown,

diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
@@ -775,6 +775,10 @@ export function getTotalUnapprovedCount(state) {
   return state.metamask.pendingApprovalCount ?? 0;
 }
 
+export function getQueuedRequestCount(state) {
+  return state.metamask.queuedRequestCount ?? 0;
+}
+
 export function getTotalUnapprovedMessagesCount(state) {
   const {
     unapprovedMsgCount = 0,

diff --git a/ui/selectors/transactions.js b/ui/selectors/transactions.js
@@ -618,22 +618,6 @@ export const submittedPendingTransactionsSelector = createSelector(
     ),
 );
 
-const hasUnapprovedTransactionsInCurrentNetwork = (state) => {
-  const unapprovedTxs = getUnapprovedTransactions(state);
-  const unapprovedTxRequests = getApprovalRequestsByType(
-    state,
-    ApprovalType.Transaction,
-  );
-
-  const chainId = getCurrentChainId(state);
-
-  const filteredUnapprovedTxInCurrentNetwork = unapprovedTxRequests.filter(
-    ({ id }) => unapprovedTxs[id] && unapprovedTxs[id].chainId === chainId,
-  );
-
-  return filteredUnapprovedTxInCurrentNetwork.length > 0;
-};
-
 const TRANSACTION_APPROVAL_TYPES = [
   ApprovalType.EthDecrypt,
   ApprovalType.EthGetEncryptionPublicKey,
@@ -643,8 +627,12 @@ const TRANSACTION_APPROVAL_TYPES = [
 ];
 
 export function hasTransactionPendingApprovals(state) {
+  const unapprovedTxRequests = getApprovalRequestsByType(
+    state,
+    ApprovalType.Transaction,
+  );
   return (
-    hasUnapprovedTransactionsInCurrentNetwork(state) ||
+    unapprovedTxRequests.length > 0 ||
     hasPendingApprovals(state, TRANSACTION_APPROVAL_TYPES)
   );
 }