Reality2byte
diff --git a/‎app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts‎
Lines changed: 14 additions & 1 deletion b/‎app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyController.ts‎
Lines changed: 14 additions & 1 deletion
diff --git a/‎app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyToastRegistrations.test.tsx‎
Lines changed: 27 additions & 0 deletions b/‎app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyToastRegistrations.test.tsx‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyToastRegistrations.tsx‎
Lines changed: 11 additions & 2 deletions b/‎app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/hooks/useQuickBuyToastRegistrations.tsx‎
Lines changed: 11 additions & 2 deletions
diff --git a/‎app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/quickBuyTradeTracker.test.ts‎
Lines changed: 159 additions & 0 deletions b/‎app/components/Views/SocialLeaderboard/TraderPositionView/components/QuickBuy/quickBuyTradeTracker.test.ts‎
Lines changed: 159 additions & 0 deletions
@@ -95,7 +95,11 @@ import {
   SocialLeaderboardEventValues,
 } from '../../../../analytics';
 import { buildQuickBuyToastOptions } from '../quickBuyToastOptions';
-import { trackQuickBuyTrade } from '../quickBuyTradeTracker';
+import {
+  trackQuickBuyTrade,
+  beginQuickBuySubmission,
+  endQuickBuySubmission,
+} from '../quickBuyTradeTracker';
 import { resolveQuickBuyTerminalToast } from '../resolveQuickBuyTerminalToast';
 
 export type QuickBuyButtonError =
@@ -1061,6 +1065,11 @@ export function useQuickBuyController(
       submitStartedAtRef.current ? Date.now() - submitStartedAtRef.current : 0;
 
     try {
+      // Mark a QuickBuy submission as in flight BEFORE submitTx so the generic
+      // transaction notification (which fires mid-submit, before the tx id is
+      // known) is suppressed. The id-based tracker takes over for the terminal
+      // notification once submitTx resolves.
+      beginQuickBuySubmission();
       dispatch(setIsSubmittingTx(true));
       const submitResult = await Engine.context.BridgeStatusController.submitTx(
         walletAddress,
@@ -1132,6 +1141,10 @@ export function useQuickBuyController(
         });
       }
     } finally {
+      // Cleared after `trackQuickBuyTrade` (in the try block) has registered the
+      // tx id, so the predicate transitions from marker-based to id-based
+      // suppression with no coverage gap.
+      endQuickBuySubmission();
       dispatch(setIsSubmittingTx(false));
     }
   }, [
 
@@ -8,13 +8,21 @@ import {
 } from '../../../../../../../util/haptics';
 import { buildQuickBuyToastOptions } from '../quickBuyToastOptions';
 import {
+  clearSettledQuickBuyTrades,
   getTrackedQuickBuyTradeIds,
+  isQuickBuyTransaction,
   trackQuickBuyTrade,
   untrackQuickBuyTrade,
   type TrackedQuickBuyTrade,
 } from '../quickBuyTradeTracker';
+import { registerNotificationSkipPredicate } from '../../../../../../../core/notificationSkipPredicates';
 import { useQuickBuyToastRegistrations } from './useQuickBuyToastRegistrations';
 
+jest.mock('../../../../../../../core/notificationSkipPredicates', () => ({
+  __esModule: true,
+  registerNotificationSkipPredicate: jest.fn(() => jest.fn()),
+}));
+
 jest.mock('../quickBuyToastOptions', () => ({
   buildQuickBuyToastOptions: jest.fn((kind: string) => ({ kind })),
 }));
@@ -101,10 +109,29 @@ describe('useQuickBuyToastRegistrations', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     getTrackedQuickBuyTradeIds().forEach(untrackQuickBuyTrade);
+    clearSettledQuickBuyTrades();
     Engine.context.MultichainTransactionsController.state.nonEvmTransactions =
       {};
   });
 
+  it('registers the QuickBuy notification skip predicate on mount and unregisters on unmount', () => {
+    const unregister = jest.fn();
+    (registerNotificationSkipPredicate as jest.Mock).mockReturnValue(
+      unregister,
+    );
+
+    const { unmount } = renderHook(() => useQuickBuyToastRegistrations());
+
+    expect(registerNotificationSkipPredicate).toHaveBeenCalledWith(
+      isQuickBuyTransaction,
+    );
+    expect(unregister).not.toHaveBeenCalled();
+
+    unmount();
+
+    expect(unregister).toHaveBeenCalledTimes(1);
+  });
+
   it('subscribes to both the bridge and multichain state change events', () => {
     const { result } = renderHook(() => useQuickBuyToastRegistrations());
 
 
@@ -1,8 +1,12 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback, useEffect, useMemo } from 'react';
 import type { ToastRef } from '../../../../../../../component-library/components/Toast/Toast.types';
 import { useAppThemeFromContext } from '../../../../../../../util/theme';
+import { registerNotificationSkipPredicate } from '../../../../../../../core/notificationSkipPredicates';
 import type { ToastRegistration } from '../../../../../../Nav/App/ControllerEventToastBridge';
-import { getTrackedQuickBuyTradeIds } from '../quickBuyTradeTracker';
+import {
+  getTrackedQuickBuyTradeIds,
+  isQuickBuyTransaction,
+} from '../quickBuyTradeTracker';
 import { resolveQuickBuyTerminalToast } from '../resolveQuickBuyTerminalToast';
 
 /**
@@ -19,6 +23,11 @@ import { resolveQuickBuyTerminalToast } from '../resolveQuickBuyTerminalToast';
 export const useQuickBuyToastRegistrations = (): ToastRegistration[] => {
   const theme = useAppThemeFromContext();
 
+  // Opt QuickBuy-initiated transactions out of the generic transaction
+  // notifications so the user only sees QuickBuy's own toasts. Registered at
+  // the app root so it covers submissions regardless of sheet lifecycle.
+  useEffect(() => registerNotificationSkipPredicate(isQuickBuyTransaction), []);
+
   // Shared by both controller subscriptions: `resolveQuickBuyTerminalToast`
   // checks each tracked trade against whichever controller is authoritative for
   // it, so we can fan out the same scan regardless of which event fired.
 
@@ -1,11 +1,24 @@
 import {
+  TransactionType,
+  type TransactionMeta,
+} from '@metamask/transaction-controller';
+import {
+  beginQuickBuySubmission,
+  clearSettledQuickBuyTrades,
+  endQuickBuySubmission,
   getTrackedQuickBuyTrade,
   getTrackedQuickBuyTradeIds,
+  hasPendingQuickBuySubmission,
+  isQuickBuyTransaction,
+  markQuickBuyTradeSettled,
   trackQuickBuyTrade,
   untrackQuickBuyTrade,
   type TrackedQuickBuyTrade,
 } from './quickBuyTradeTracker';
 
+const txMeta = (overrides: Partial<TransactionMeta>): TransactionMeta =>
+  overrides as TransactionMeta;
+
 const buyTrade: TrackedQuickBuyTrade = {
   tradeMode: 'buy',
   tokenSymbol: 'PEPE',
@@ -24,6 +37,10 @@ const sellTrade: TrackedQuickBuyTrade = {
 describe('quickBuyTradeTracker', () => {
   afterEach(() => {
     getTrackedQuickBuyTradeIds().forEach(untrackQuickBuyTrade);
+    clearSettledQuickBuyTrades();
+    while (hasPendingQuickBuySubmission()) {
+      endQuickBuySubmission();
+    }
   });
 
   it('stores and returns a tracked trade by tx meta id', () => {
@@ -84,4 +101,146 @@ describe('quickBuyTradeTracker', () => {
     expect(() => untrackQuickBuyTrade('missing')).not.toThrow();
     expect(getTrackedQuickBuyTradeIds()).toEqual(['tx-1']);
   });
+
+  describe('submission marker', () => {
+    it('reflects in-flight submissions via the counter', () => {
+      expect(hasPendingQuickBuySubmission()).toBe(false);
+
+      beginQuickBuySubmission();
+      expect(hasPendingQuickBuySubmission()).toBe(true);
+
+      endQuickBuySubmission();
+      expect(hasPendingQuickBuySubmission()).toBe(false);
+    });
+
+    it('stays active until all overlapping submissions end', () => {
+      beginQuickBuySubmission();
+      beginQuickBuySubmission();
+
+      endQuickBuySubmission();
+      expect(hasPendingQuickBuySubmission()).toBe(true);
+
+      endQuickBuySubmission();
+      expect(hasPendingQuickBuySubmission()).toBe(false);
+    });
+
+    it('never drops below zero on unbalanced ends', () => {
+      endQuickBuySubmission();
+
+      expect(hasPendingQuickBuySubmission()).toBe(false);
+
+      beginQuickBuySubmission();
+      expect(hasPendingQuickBuySubmission()).toBe(true);
+    });
+  });
+
+  describe('isQuickBuyTransaction', () => {
+    it('matches a transaction already tracked by id', () => {
+      trackQuickBuyTrade('tx-1', buyTrade);
+
+      expect(isQuickBuyTransaction(txMeta({ id: 'tx-1' }))).toBe(true);
+    });
+
+    it('matches an in-flight swap/bridge/batch transaction during submission', () => {
+      beginQuickBuySubmission();
+
+      expect(
+        isQuickBuyTransaction(
+          txMeta({ id: 'tx-9', type: TransactionType.batch }),
+        ),
+      ).toBe(true);
+      expect(
+        isQuickBuyTransaction(
+          txMeta({ id: 'tx-9', type: TransactionType.swap }),
+        ),
+      ).toBe(true);
+      expect(
+        isQuickBuyTransaction(
+          txMeta({ id: 'tx-9', type: TransactionType.bridge }),
+        ),
+      ).toBe(true);
+    });
+
+    it('matches a batch whose nested transaction is a swap during submission', () => {
+      beginQuickBuySubmission();
+
+      expect(
+        isQuickBuyTransaction(
+          txMeta({
+            id: 'tx-9',
+            type: TransactionType.batch,
+            nestedTransactions: [{ type: TransactionType.swap }],
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          } as any),
+        ),
+      ).toBe(true);
+    });
+
+    it('does not match an unrelated in-flight transaction type', () => {
+      beginQuickBuySubmission();
+
+      expect(
+        isQuickBuyTransaction(
+          txMeta({ id: 'tx-9', type: TransactionType.simpleSend }),
+        ),
+      ).toBe(false);
+    });
+
+    it('does not match when there is no marker and no tracked id', () => {
+      expect(
+        isQuickBuyTransaction(
+          txMeta({ id: 'tx-9', type: TransactionType.swap }),
+        ),
+      ).toBe(false);
+    });
+
+    it('still matches a trade after it has settled (covers the delayed re-check)', () => {
+      trackQuickBuyTrade('tx-1', buyTrade);
+      markQuickBuyTradeSettled('tx-1');
+
+      expect(getTrackedQuickBuyTradeIds()).toEqual([]);
+      expect(isQuickBuyTransaction(txMeta({ id: 'tx-1' }))).toBe(true);
+    });
+
+    it('stops matching a settled trade once it is explicitly untracked', () => {
+      trackQuickBuyTrade('tx-1', buyTrade);
+      markQuickBuyTradeSettled('tx-1');
+      untrackQuickBuyTrade('tx-1');
+
+      expect(isQuickBuyTransaction(txMeta({ id: 'tx-1' }))).toBe(false);
+    });
+  });
+
+  describe('markQuickBuyTradeSettled', () => {
+    it('removes the trade from the active registry so the terminal toast does not repeat', () => {
+      trackQuickBuyTrade('tx-1', buyTrade);
+
+      markQuickBuyTradeSettled('tx-1');
+
+      expect(getTrackedQuickBuyTrade('tx-1')).toBeUndefined();
+      expect(getTrackedQuickBuyTradeIds()).toEqual([]);
+    });
+
+    it('evicts the oldest settled id once the retention cap is exceeded', () => {
+      for (let i = 0; i < 51; i += 1) {
+        markQuickBuyTradeSettled(`tx-${i}`);
+      }
+
+      expect(isQuickBuyTransaction(txMeta({ id: 'tx-0' }))).toBe(false);
+      expect(isQuickBuyTransaction(txMeta({ id: 'tx-1' }))).toBe(true);
+      expect(isQuickBuyTransaction(txMeta({ id: 'tx-50' }))).toBe(true);
+    });
+
+    it('refreshes a re-settled id so it survives further eviction', () => {
+      markQuickBuyTradeSettled('keep-me');
+      for (let i = 0; i < 49; i += 1) {
+        markQuickBuyTradeSettled(`tx-${i}`);
+      }
+      // Re-settle to move it to the newest position before overflowing.
+      markQuickBuyTradeSettled('keep-me');
+      markQuickBuyTradeSettled('overflow');
+
+      expect(isQuickBuyTransaction(txMeta({ id: 'keep-me' }))).toBe(true);
+    });
+  });
 });