From ef227c1d45b24bd899e86ad423f0ded72d216df3 Mon Sep 17 00:00:00 2001
From: roo hutton <roo.hutton@overleaf.com>
Date: Thu, 3 Jul 2025 13:09:19 +0100
Subject: [PATCH] Merge pull request #26799 from
 overleaf/rh-resolve-deleted-email

Clear loading state after deleting email address

GitOrigin-RevId: 7422a7e223ba430459afa862f10c2b2fd9038306
---
 .../settings/components/emails/actions/remove.tsx         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/web/frontend/js/features/settings/components/emails/actions/remove.tsx b/services/web/frontend/js/features/settings/components/emails/actions/remove.tsx
index 136efc04e4..36123cdd1e 100644
--- a/services/web/frontend/js/features/settings/components/emails/actions/remove.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/actions/remove.tsx
@@ -37,7 +37,7 @@ type RemoveProps = {
 
 function Remove({ userEmailData, deleteEmailAsync }: RemoveProps) {
   const { t } = useTranslation()
-  const { state, deleteEmail, resetLeaversSurveyExpiration } =
+  const { state, deleteEmail, resetLeaversSurveyExpiration, setLoading } =
     useUserEmailsContext()
   const isManaged = getMeta('ol-isManagedAccount')
 
@@ -62,8 +62,12 @@ function Remove({ userEmailData, deleteEmailAsync }: RemoveProps) {
       .then(() => {
         deleteEmail(userEmailData.email)
         resetLeaversSurveyExpiration(userEmailData)
+        // Reset the global loading state before this row is unmounted
+        setLoading(false)
+      })
+      .catch(() => {
+        setLoading(false)
       })
-      .catch(() => {})
   }
 
   if (deleteEmailAsync.isLoading) {