Close git action toast before triggering follow-up action

- Dismiss the success toast before handling Push/Open PR/Create PR CTA clicks - Prevent stale result toasts from lingering while starting the next git action

Julius Marminge committed 9 months ago

Commit 37cd7be1 parent aa6412c1 file · +15 −3Browse files

Unified · Split

apps/web/src/components/GitActionsControl.tsx+15−3

           (action === "commit_push" || action === "commit_push_pr") && !!prUrl;
         const shouldOfferCreatePrCta =
           action === "commit_push" && !prUrl && result.push.status === "pushed";
+        const closeResultToast = () => {
+          toastManager.close(progressToastId);
+        };
         toastManager.update(progressToastId, {
           type: "success",
             ? {
                 actionProps: {
                   children: "Push",
-                  onClick: () => void runGitActionWithToast({ action: "commit_push" }),
+                  onClick: () => {
+                    closeResultToast();
+                    void runGitActionWithToast({ action: "commit_push" });
+                  },
                 },
               }
             : shouldOfferOpenPrCta
               ? {
                   actionProps: {
                     children: "Open PR",
-                    onClick: () => void api?.shell.openExternal(prUrl),
+                    onClick: () => {
+                      closeResultToast();
+                      void api?.shell.openExternal(prUrl);
+                    },
                   },
                 }
               : shouldOfferCreatePrCta
                 ? {
                     actionProps: {
                       children: "Create PR",
-                      onClick: () => setActiveDialogAction("create_pr"),
+                      onClick: () => {
+                        closeResultToast();
+                        setActiveDialogAction("create_pr");
+                      },
                     },
                   }
                 : {}),