CP-13769: Hide successful toast for single chain swaps (#3683)

Author: atn4z7

packages/core-mobile/app/new/features/swap/utils/buildRequestContext.test.ts

@@ -1,9 +1,22 @@
 import { TransferStepDetails } from '@avalabs/fusion-sdk'
+import { isAvalancheChainId } from 'services/network/utils/isAvalancheNetwork'
+import { getChainIdFromCaip2 } from 'utils/caip2ChainIds'
 import { RequestContext } from 'store/rpc/types'
 import { buildRequestContext } from './buildRequestContext'
 
+jest.mock('services/network/utils/isAvalancheNetwork', () => ({
+  isAvalancheChainId: jest.fn()
+}))
+jest.mock('utils/caip2ChainIds', () => ({
+  getChainIdFromCaip2: jest.fn()
+}))
+
+const mockIsAvalancheChainId = isAvalancheChainId as jest.Mock
+const mockGetChainIdFromCaip2 = getChainIdFromCaip2 as jest.Mock
+
 const AVAX_CHAIN_ID = 'eip155:43114'
 const BTC_CHAIN_ID = 'bip122:000000000019d6689c085ae165831e93'
+const SOLANA_CHAIN_ID = 'solana:mainnet'
 
 function makeStepDetails(
   overrides: Partial<
@@ -16,8 +29,8 @@ function makeStepDetails(
   const {
     currentSignature = 1,
     requiredSignatures = 1,
-    sourceChainId = AVAX_CHAIN_ID,
-    targetChainId = AVAX_CHAIN_ID
+    sourceChainId = SOLANA_CHAIN_ID,
+    targetChainId = SOLANA_CHAIN_ID
   } = overrides
 
   return {
@@ -32,26 +45,33 @@ function makeStepDetails(
 }
 
 describe('buildRequestContext', () => {
-  describe(`${RequestContext.TOASTS_AND_CONFETTI_DISABLED}`, () => {
-    it('is false for a single-step same-chain swap', () => {
+  beforeEach(() => {
+    // Default: Solana — getChainIdFromCaip2 returns undefined for non-EVM chains,
+    // so isAvalancheChainId is never reached (short-circuit in the implementation)
+    mockGetChainIdFromCaip2.mockReturnValue(undefined)
+    mockIsAvalancheChainId.mockReset()
+  })
+
+  describe(`${RequestContext.SUPPRESS_TX_FEEDBACK}`, () => {
+    it('is absent for a single-step same-chain swap', () => {
       const ctx = buildRequestContext(
         makeStepDetails({ currentSignature: 1, requiredSignatures: 1 })
       )
-      expect(ctx[RequestContext.TOASTS_AND_CONFETTI_DISABLED]).toBe(false)
+      expect(ctx[RequestContext.SUPPRESS_TX_FEEDBACK]).toBeUndefined()
     })
 
     it('is true for an intermediate step (currentSignature < requiredSignatures)', () => {
       const ctx = buildRequestContext(
         makeStepDetails({ currentSignature: 1, requiredSignatures: 2 })
       )
-      expect(ctx[RequestContext.TOASTS_AND_CONFETTI_DISABLED]).toBe(true)
+      expect(ctx[RequestContext.SUPPRESS_TX_FEEDBACK]).toBe(true)
     })
 
-    it('is false for the final step of a multi-step same-chain swap', () => {
+    it('is absent for the final step of a multi-step same-chain swap', () => {
       const ctx = buildRequestContext(
         makeStepDetails({ currentSignature: 2, requiredSignatures: 2 })
       )
-      expect(ctx[RequestContext.TOASTS_AND_CONFETTI_DISABLED]).toBe(false)
+      expect(ctx[RequestContext.SUPPRESS_TX_FEEDBACK]).toBeUndefined()
     })
 
     it('is true for a cross-chain swap (final step)', () => {
@@ -63,7 +83,7 @@ describe('buildRequestContext', () => {
           targetChainId: BTC_CHAIN_ID
         })
       )
-      expect(ctx[RequestContext.TOASTS_AND_CONFETTI_DISABLED]).toBe(true)
+      expect(ctx[RequestContext.SUPPRESS_TX_FEEDBACK]).toBe(true)
     })
 
     it('is true for a cross-chain intermediate step', () => {
@@ -75,7 +95,118 @@ describe('buildRequestContext', () => {
           targetChainId: BTC_CHAIN_ID
         })
       )
-      expect(ctx[RequestContext.TOASTS_AND_CONFETTI_DISABLED]).toBe(true)
+      expect(ctx[RequestContext.SUPPRESS_TX_FEEDBACK]).toBe(true)
+    })
+  })
+
+  describe(`${RequestContext.IMMEDIATE_SENT_TOAST}`, () => {
+    it('is true for a non-Avalanche same-chain final step', () => {
+      const ctx = buildRequestContext(makeStepDetails())
+      expect(ctx[RequestContext.IMMEDIATE_SENT_TOAST]).toBe(true)
+    })
+
+    it('is absent for an Avalanche same-chain final step (ApprovalController handles it)', () => {
+      mockGetChainIdFromCaip2.mockReturnValue(43114)
+      mockIsAvalancheChainId.mockReturnValue(true)
+
+      const ctx = buildRequestContext(
+        makeStepDetails({
+          sourceChainId: AVAX_CHAIN_ID,
+          targetChainId: AVAX_CHAIN_ID
+        })
+      )
+      expect(ctx[RequestContext.IMMEDIATE_SENT_TOAST]).toBeUndefined()
+    })
+
+    it('is absent for a cross-chain swap (SUPPRESS_TX_FEEDBACK handles it)', () => {
+      const ctx = buildRequestContext(
+        makeStepDetails({
+          sourceChainId: AVAX_CHAIN_ID,
+          targetChainId: BTC_CHAIN_ID
+        })
+      )
+      expect(ctx[RequestContext.IMMEDIATE_SENT_TOAST]).toBeUndefined()
+    })
+
+    it('is absent for an intermediate step (SUPPRESS_TX_FEEDBACK handles it)', () => {
+      const ctx = buildRequestContext(
+        makeStepDetails({ currentSignature: 1, requiredSignatures: 2 })
+      )
+      expect(ctx[RequestContext.IMMEDIATE_SENT_TOAST]).toBeUndefined()
+    })
+  })
+
+  describe(`${RequestContext.CONFETTI_DISABLED}`, () => {
+    it('is true for a non-Avalanche same-chain final step', () => {
+      const ctx = buildRequestContext(makeStepDetails())
+      expect(ctx[RequestContext.CONFETTI_DISABLED]).toBe(true)
+    })
+
+    it('is absent for an Avalanche same-chain final step (confetti fires in onTransactionPending)', () => {
+      mockGetChainIdFromCaip2.mockReturnValue(43114)
+      mockIsAvalancheChainId.mockReturnValue(true)
+
+      const ctx = buildRequestContext(
+        makeStepDetails({
+          sourceChainId: AVAX_CHAIN_ID,
+          targetChainId: AVAX_CHAIN_ID
+        })
+      )
+      expect(ctx[RequestContext.CONFETTI_DISABLED]).toBeUndefined()
+    })
+
+    it('is absent for a cross-chain swap (SUPPRESS_TX_FEEDBACK handles it)', () => {
+      const ctx = buildRequestContext(
+        makeStepDetails({
+          sourceChainId: AVAX_CHAIN_ID,
+          targetChainId: BTC_CHAIN_ID
+        })
+      )
+      expect(ctx[RequestContext.CONFETTI_DISABLED]).toBeUndefined()
+    })
+
+    it('is absent for an intermediate step (SUPPRESS_TX_FEEDBACK handles it)', () => {
+      const ctx = buildRequestContext(
+        makeStepDetails({ currentSignature: 1, requiredSignatures: 2 })
+      )
+      expect(ctx[RequestContext.CONFETTI_DISABLED]).toBeUndefined()
+    })
+  })
+
+  describe(`${RequestContext.SUCCESS_TOAST_DISABLED}`, () => {
+    it('is true for a non-Avalanche same-chain final step', () => {
+      const ctx = buildRequestContext(makeStepDetails())
+      expect(ctx[RequestContext.SUCCESS_TOAST_DISABLED]).toBe(true)
+    })
+
+    it('is absent for an Avalanche same-chain final step (ApprovalController handles it)', () => {
+      mockGetChainIdFromCaip2.mockReturnValue(43114)
+      mockIsAvalancheChainId.mockReturnValue(true)
+
+      const ctx = buildRequestContext(
+        makeStepDetails({
+          sourceChainId: AVAX_CHAIN_ID,
+          targetChainId: AVAX_CHAIN_ID
+        })
+      )
+      expect(ctx[RequestContext.SUCCESS_TOAST_DISABLED]).toBeUndefined()
+    })
+
+    it('is absent for a cross-chain swap (SUPPRESS_TX_FEEDBACK handles it)', () => {
+      const ctx = buildRequestContext(
+        makeStepDetails({
+          sourceChainId: AVAX_CHAIN_ID,
+          targetChainId: BTC_CHAIN_ID
+        })
+      )
+      expect(ctx[RequestContext.SUCCESS_TOAST_DISABLED]).toBeUndefined()
+    })
+
+    it('is absent for an intermediate step (SUPPRESS_TX_FEEDBACK handles it)', () => {
+      const ctx = buildRequestContext(
+        makeStepDetails({ currentSignature: 1, requiredSignatures: 2 })
+      )
+      expect(ctx[RequestContext.SUCCESS_TOAST_DISABLED]).toBeUndefined()
     })
   })
 })

packages/core-mobile/app/new/features/swap/utils/buildRequestContext.ts

@@ -1,4 +1,6 @@
 import { TransferStepDetails } from '@avalabs/fusion-sdk'
+import { isAvalancheChainId } from 'services/network/utils/isAvalancheNetwork'
+import { getChainIdFromCaip2 } from 'utils/caip2ChainIds'
 import { RequestContext } from 'store/rpc/types'
 
 export function buildRequestContext({
@@ -10,9 +12,28 @@ export function buildRequestContext({
     quote.sourceChain.chainId !== quote.targetChain.chainId
   const isIntermediateTransaction = currentSignature < requiredSignatures
 
+  if (isCrossChainSwap || isIntermediateTransaction) {
+    // Suppress all transaction feedback — no toasts or confetti at any stage
+    return { [RequestContext.SUPPRESS_TX_FEEDBACK]: true }
+  }
+
+  const numericChainId = getChainIdFromCaip2(quote.sourceChain.chainId)
+  const isAvalanche =
+    numericChainId !== undefined && isAvalancheChainId(numericChainId)
+
+  if (isAvalanche) {
+    // ApprovalController handles Avalanche in-app swaps via isInAppAvalancheRequest:
+    // onTransactionPending → "Transaction sent" + confetti
+    // onTransactionConfirmed → nothing
+    return {}
+  }
+
+  // Non-Avalanche same-chain final step (e.g. Solana): show "Transaction sent"
+  // immediately and suppress the success toast and confetti — the notification
+  // center tracks the authoritative final status
   return {
-    // Suppresses all toasts and confetti for cross-chain swaps and intermediate steps
-    [RequestContext.TOASTS_AND_CONFETTI_DISABLED]:
-      isCrossChainSwap || isIntermediateTransaction
+    [RequestContext.IMMEDIATE_SENT_TOAST]: true,
+    [RequestContext.SUCCESS_TOAST_DISABLED]: true,
+    [RequestContext.CONFETTI_DISABLED]: true
   }
 }

packages/core-mobile/app/store/rpc/types.ts

@@ -182,6 +182,15 @@ export enum RequestContext {
   // used to signal that the in-app review logic should be triggered
   IN_APP_REVIEW = 'inAppReview',
 
-  // used to suppress all toasts and confetti for intermediate or cross-chain swap steps
-  TOASTS_AND_CONFETTI_DISABLED = 'toastsAndConfettiDisabled'
+  // used to suppress all transaction feedback (toasts, confetti, in-app review) for
+  // intermediate or cross-chain swap steps
+  SUPPRESS_TX_FEEDBACK = 'suppressTxFeedback',
+
+  // used to suppress only the success toast on confirmation, while still allowing the
+  // pending toast — confetti is controlled separately by CONFETTI_DISABLED
+  SUCCESS_TOAST_DISABLED = 'successToastDisabled',
+
+  // used to show "Transaction sent" immediately in onTransactionPending instead of a
+  // pending toast — used when no confirmed toast will follow (e.g. Fusion same-chain swap)
+  IMMEDIATE_SENT_TOAST = 'immediateSentToast'
 }

packages/core-mobile/app/vmModule/ApprovalController/ApprovalController.test.ts

@@ -11,10 +11,12 @@ import { promptForAppReviewAfterSuccessfulTransaction } from 'features/appReview
 import AnalyticsService from 'services/analytics/AnalyticsService'
 import { getAddressForChainId } from 'store/rpc/handlers/wc_sessionRequest/utils'
 import {
-  isToastsAndConfettiEnabled,
+  isTxFeedbackEnabled,
   isInAppAvalancheRequest,
   isConfettiEnabled,
   isInAppReview,
+  isSuccessToastEnabled,
+  isImmediateSentToast,
   showConfetti
 } from '../utils/requestContext'
 import { onApprove } from './onApprove'
@@ -24,10 +26,12 @@ import { approvalController } from './ApprovalController'
 // ─── Mocks ────────────────────────────────────────────────────────────────────
 
 jest.mock('../utils/requestContext', () => ({
-  isToastsAndConfettiEnabled: jest.fn(() => true),
+  isTxFeedbackEnabled: jest.fn(() => true),
   isInAppAvalancheRequest: jest.fn(() => false),
   isConfettiEnabled: jest.fn(() => true),
   isInAppReview: jest.fn(() => false),
+  isSuccessToastEnabled: jest.fn(() => true),
+  isImmediateSentToast: jest.fn(() => false),
   showConfetti: jest.fn()
 }))
 
@@ -87,10 +91,12 @@ jest.mock('store/rpc/handlers/wc_sessionRequest/utils', () => ({
 
 // ─── Typed mock aliases ────────────────────────────────────────────────────────
 
-const mockIsToastsAndConfettiEnabled = isToastsAndConfettiEnabled as jest.Mock
+const mockIsTxFeedbackEnabled = isTxFeedbackEnabled as jest.Mock
 const mockIsInAppAvalancheRequest = isInAppAvalancheRequest as jest.Mock
 const mockIsConfettiEnabled = isConfettiEnabled as jest.Mock
 const mockIsInAppReview = isInAppReview as jest.Mock
+const mockIsSuccessToastEnabled = isSuccessToastEnabled as jest.Mock
+const mockIsImmediateSentToast = isImmediateSentToast as jest.Mock
 const mockShowConfetti = showConfetti as jest.Mock
 const mockIsInAppRequest = isInAppRequest as jest.Mock
 const mockOnApprove = onApprove as jest.Mock
@@ -177,10 +183,12 @@ const populateSigningAddressCache = async (
 describe('ApprovalController', () => {
   beforeEach(() => {
     jest.clearAllMocks()
-    mockIsToastsAndConfettiEnabled.mockReturnValue(true)
+    mockIsTxFeedbackEnabled.mockReturnValue(true)
     mockIsInAppAvalancheRequest.mockReturnValue(false)
     mockIsConfettiEnabled.mockReturnValue(true)
     mockIsInAppReview.mockReturnValue(false)
+    mockIsSuccessToastEnabled.mockReturnValue(true)
+    mockIsImmediateSentToast.mockReturnValue(false)
     mockIsInAppRequest.mockReturnValue(false)
   })
 
@@ -193,8 +201,8 @@ describe('ApprovalController', () => {
       explorerLink: 'https://example.com'
     })
 
-    it('does nothing when toasts and confetti are disabled', () => {
-      mockIsToastsAndConfettiEnabled.mockReturnValue(false)
+    it('does nothing when SUPPRESS_TX_FEEDBACK is set', () => {
+      mockIsTxFeedbackEnabled.mockReturnValue(false)
 
       approvalController.onTransactionPending(pendingArgs(makeRequest()))
 
@@ -235,6 +243,17 @@ describe('ApprovalController', () => {
       })
       expect(transactionSnackbar.success).not.toHaveBeenCalled()
     })
+
+    it('shows "Transaction sent" immediately when IMMEDIATE_SENT_TOAST is set (e.g. Fusion same-chain swap)', () => {
+      mockIsImmediateSentToast.mockReturnValue(true)
+
+      approvalController.onTransactionPending(pendingArgs(makeRequest()))
+
+      expect(transactionSnackbar.success).toHaveBeenCalledWith({
+        message: 'Transaction sent'
+      })
+      expect(transactionSnackbar.pending).not.toHaveBeenCalled()
+    })
   })
 
   // ── onTransactionConfirmed ────────────────────────────────────────────────
@@ -249,8 +268,8 @@ describe('ApprovalController', () => {
       request
     })
 
-    it('skips UI effects when toasts and confetti are disabled', () => {
-      mockIsToastsAndConfettiEnabled.mockReturnValue(false)
+    it('skips all feedback when SUPPRESS_TX_FEEDBACK is set', () => {
+      mockIsTxFeedbackEnabled.mockReturnValue(false)
 
       approvalController.onTransactionConfirmed(confirmedArgs(makeRequest()))
 
@@ -261,8 +280,8 @@ describe('ApprovalController', () => {
       ).not.toHaveBeenCalled()
     })
 
-    it('still fires analytics when toasts and confetti are disabled', async () => {
-      mockIsToastsAndConfettiEnabled.mockReturnValue(false)
+    it('still fires analytics when SUPPRESS_TX_FEEDBACK is set', async () => {
+      mockIsTxFeedbackEnabled.mockReturnValue(false)
       const request = makeDappRequest(RpcMethod.ETH_SEND_TRANSACTION)
       await populateSigningAddressCache(request)
 
@@ -298,6 +317,16 @@ describe('ApprovalController', () => {
       expect(transactionSnackbar.success).not.toHaveBeenCalled()
     })
 
+    it('skips only the success toast when SUCCESS_TOAST_DISABLED is set (confetti controlled separately)', () => {
+      mockIsSuccessToastEnabled.mockReturnValue(false)
+      mockIsInAppRequest.mockReturnValue(true)
+
+      approvalController.onTransactionConfirmed(confirmedArgs(makeRequest()))
+
+      expect(transactionSnackbar.success).not.toHaveBeenCalled()
+      expect(mockShowConfetti).toHaveBeenCalledTimes(1)
+    })
+
     it('shows success toast with explorerLink for non-Avalanche requests', () => {
       const request = makeRequest()
       const explorerLink = 'https://explorer.example.com'