fix(toasts): make pending toasts persistent and prevent cross-dismiss; show privacy toast immediately

cursoragent · cursoragent · commit f972bb03de2b · 2026-06-03T19:29:14.000Z
diff --git a/ui/components/app/toast-listener/shared.test.tsx b/ui/components/app/toast-listener/shared.test.tsx
@@ -25,6 +25,7 @@ describe('toast-listener/shared', () => {
       severity: 'default',
       title: 'Transaction submitted',
       description: 'Waiting for confirmation',
+      hasNoTimeout: true,
       'data-testid': 'pending-toast',
     });
   });
diff --git a/ui/components/app/toast-listener/shared.tsx b/ui/components/app/toast-listener/shared.tsx
@@ -11,6 +11,7 @@ export function showPendingToast(id: string, options: ToastOptions) {
     severity: 'default',
     title: options.title,
     description: options.description,
+    hasNoTimeout: true,
     'data-testid': options.dataTestId,
   });
 }
diff --git a/ui/components/app/toast-master/toast-master.js b/ui/components/app/toast-master/toast-master.js
@@ -147,10 +147,9 @@ function PrivacyPolicyToast() {
 
     if (!newPrivacyPolicyToastShownDate) {
       setNewPrivacyPolicyToastShownDate(Date.now());
-      return undefined;
     }
 
-    toast({
+    const toastId = toast({
       severity: 'default',
       title: t('newPrivacyPolicyTitle'),
       actionButtonLabel: t('newPrivacyPolicyActionButton'),
@@ -167,7 +166,9 @@ function PrivacyPolicyToast() {
     });
 
     return () => {
-      toast.dismiss();
+      if (toastId) {
+        toast.dismiss(toastId);
+      }
     };
   }, [newPrivacyPolicyToastShownDate, showPrivacyPolicyToast, t]);
 
@@ -210,7 +211,7 @@ function PermittedNetworkToast() {
       return undefined;
     }
 
-    toast({
+    const toastId = toast({
       severity: 'default',
       title: t('permittedChainToastUpdate', [
         getURLHost(activeTabOrigin),
@@ -233,7 +234,9 @@ function PermittedNetworkToast() {
     });
 
     return () => {
-      toast.dismiss();
+      if (toastId) {
+        toast.dismiss(toastId);
+      }
     };
   }, [
     activeTabOrigin,
@@ -261,7 +264,7 @@ function InfuraSwitchToast() {
       return undefined;
     }
 
-    toast({
+    const toastId = toast({
       severity: 'success',
       title: t('updatedToMetaMaskDefault'),
       startAccessory: (
@@ -272,7 +275,9 @@ function InfuraSwitchToast() {
     });
 
     return () => {
-      toast.dismiss();
+      if (toastId) {
+        toast.dismiss(toastId);
+      }
     };
   }, [dispatch, showInfuraSwitchToast, t]);
 
@@ -351,7 +356,7 @@ function ShieldPausedToast() {
       setShieldPausedToastLastClickedOrClosed(Date.now());
     };
 
-    toast({
+    const toastId = toast({
       severity: 'danger',
       title: t('shieldPaymentPaused'),
       description: t(descriptionText),
@@ -368,7 +373,9 @@ function ShieldPausedToast() {
     });
 
     return () => {
-      toast.dismiss();
+      if (toastId) {
+        toast.dismiss(toastId);
+      }
     };
   }, [
     actionText,
@@ -408,7 +415,7 @@ function ShieldEndingToast() {
       return undefined;
     }
 
-    toast({
+    const toastId = toast({
       severity: 'default',
       title: t('shieldCoverageEnding'),
       description: t('shieldCoverageEndingDescription', [
@@ -430,7 +437,9 @@ function ShieldEndingToast() {
     });
 
     return () => {
-      toast.dismiss();
+      if (toastId) {
+        toast.dismiss(toastId);
+      }
     };
   }, [
     isSubscriptionEndingSoon,
@@ -497,7 +506,7 @@ function StorageErrorToast() {
       setIsDismissed(true);
     };
 
-    toast({
+    const toastId = toast({
       severity: 'danger',
       'data-testid': 'storage-error-toast',
       startAccessory: (
@@ -515,7 +524,9 @@ function StorageErrorToast() {
     });
 
     return () => {
-      toast.dismiss();
+      if (toastId) {
+        toast.dismiss(toastId);
+      }
     };
   }, [
     description,
@@ -545,7 +556,7 @@ function SidePanelMigrationToast() {
       return undefined;
     }
 
-    toast({
+    const toastId = toast({
       severity: 'default',
       'data-testid': 'side-panel-migration-toast',
       startAccessory: (
@@ -571,7 +582,9 @@ function SidePanelMigrationToast() {
     });
 
     return () => {
-      toast.dismiss();
+      if (toastId) {
+        toast.dismiss(toastId);
+      }
     };
   }, [dispatch, isSidePanel, showSidePanelMigrationToast, t]);
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ export function showPendingToast(id: string, options: ToastOptions) {`
`11`	`11`	`severity: 'default',`
`12`	`12`	`title: options.title,`
`13`	`13`	`description: options.description,`
	`14`	`+ hasNoTimeout: true,`
`14`	`15`	`'data-testid': options.dataTestId,`
`15`	`16`	`});`
`16`	`17`	`}`