Merge pull request #1188 from isaacphysics/hotfix/rollback-spurious-warning-bugfix

Rollback bugfix to update user on email change

Author: jsharkey13

src/app/state/actions/index.tsx

@@ -277,52 +277,54 @@ export const updateCurrentUser = (
     async function continueSettingsUpdate() {
         const editingOtherUser = currentUser.loggedIn && currentUser.id != updatedUser.id;
 
-        await dispatch(requestCurrentUser() as any);
+        try {
+            dispatch({type: ACTION_TYPE.USER_DETAILS_UPDATE_REQUEST});
+            const currentUser = await api.users.updateCurrent(updatedUser, updatedUserPreferences, passwordCurrent, userContexts);
+            dispatch({type: ACTION_TYPE.USER_DETAILS_UPDATE_RESPONSE_SUCCESS, user: currentUser.data});
 
-        if (!editingOtherUser) {
-        // Invalidate tagged caches that are dependent on the current user's settings
-            dispatch(questionsApi.util.invalidateTags(['CanAttemptQuestionType']) as any);
-        }
+            await dispatch(requestCurrentUser() as any);
 
-        const isFirstLogin = isFirstLoginInPersistence() || false;
-        if (isFirstLogin) {
-            persistence.session.remove(KEY.FIRST_LOGIN);
-            if (redirect) {
-                history.push(persistence.pop(KEY.AFTER_AUTH_PATH) || '/account', {firstLogin: isFirstLogin});
+            if (!editingOtherUser) {
+            // Invalidate tagged caches that are dependent on the current user's settings
+                dispatch(questionsApi.util.invalidateTags(['CanAttemptQuestionType']) as any);
             }
-        } else if (!editingOtherUser) {
-            dispatch(showToast({
-                title: "Account settings updated",
-                body: "Your account settings were updated successfully.",
-                color: "success",
-                timeout: 5000,
-                closable: false,
-            }) as any);
-        } else if (editingOtherUser) {
-            redirect && history.push('/');
-            dispatch(showToast({
-                title: "Account settings updated",
-                body: "The user's account settings were updated successfully.",
-                color: "success",
-                timeout: 5000,
-                closable: false,
-            }) as any);
+
+            const isFirstLogin = isFirstLoginInPersistence() || false;
+            if (isFirstLogin) {
+                persistence.session.remove(KEY.FIRST_LOGIN);
+                if (redirect) {
+                    history.push(persistence.pop(KEY.AFTER_AUTH_PATH) || '/account', {firstLogin: isFirstLogin});
+                }
+            } else if (!editingOtherUser) {
+                dispatch(showToast({
+                    title: "Account settings updated",
+                    body: "Your account settings were updated successfully.",
+                    color: "success",
+                    timeout: 5000,
+                    closable: false,
+                }) as any);
+            } else if (editingOtherUser) {
+                if (redirect) {
+                    history.push('/');
+                }
+                dispatch(showToast({
+                    title: "Account settings updated",
+                    body: "The user's account settings were updated successfully.",
+                    color: "success",
+                    timeout: 5000,
+                    closable: false,
+                }) as any);
+            }
+        } catch (e: any) {
+            dispatch({type: ACTION_TYPE.USER_DETAILS_UPDATE_RESPONSE_FAILURE, errorMessage: extractMessage(e)});
         }
     }
 
     // Confirm email change
     if (currentUser.loggedIn && currentUser.id == updatedUser.id && currentUser.email !== updatedUser.email) {
         showEmailChangeModal();
     } else {
-        try {
-            dispatch({type: ACTION_TYPE.USER_DETAILS_UPDATE_REQUEST});
-            const currentUser = await api.users.updateCurrent(updatedUser, updatedUserPreferences, passwordCurrent, userContexts);
-            dispatch({type: ACTION_TYPE.USER_DETAILS_UPDATE_RESPONSE_SUCCESS, user: currentUser.data});
-            continueSettingsUpdate();
-        }
-        catch (e: any) {
-            dispatch({type: ACTION_TYPE.USER_DETAILS_UPDATE_RESPONSE_FAILURE, errorMessage: extractMessage(e)});
-        }
+        continueSettingsUpdate();
     }
 };