fix: update the avatar name when account is switched (#3834)

Author: ChitlangeSahas

src/accounts/context/userAccount.tsx

@@ -28,6 +28,10 @@ import {isFlagEnabled} from 'src/shared/utils/featureFlag'
 import {useHistory} from 'react-router-dom'
 import {getErrorMessage} from 'src/utils/api'
 
+// Actions
+import {setMe} from 'src/me/actions/creators'
+import {MeState} from 'src/me/reducers'
+
 export type Props = {
   children: JSX.Element
 }
@@ -158,6 +162,16 @@ export const UserAccountProvider: FC<Props> = React.memo(({children}) => {
         // change the name, and reset the active accts:
         userAccounts[activeIndex].name = newName
         setUserAccounts(userAccounts)
+
+        if (
+          isFlagEnabled('multiAccount') &&
+          isFlagEnabled('avatarNameForMultiAccountFix')
+        ) {
+          const name = resp.data.name
+          const id = resp.data.id.toString()
+          // update the state
+          dispatch(setMe({name, id} as MeState))
+        }
       }
     } catch (error) {
       dispatch(notify(accountRenameError(oldName)))

src/me/actions/thunks/index.ts

@@ -5,7 +5,7 @@ import {Dispatch} from 'react'
 
 // API
 import {getMe as apiGetApiMe} from 'src/client'
-import {getMe as apiGetQuartzMe} from 'src/client/unityRoutes'
+import {getAccounts, getMe as apiGetQuartzMe} from 'src/client/unityRoutes'
 // Utils
 import {gaEvent, updateReportingContext} from 'src/cloud/utils/reporting'
 import {isFlagEnabled} from 'src/shared/utils/featureFlag'
@@ -28,12 +28,27 @@ export const getMe = () => async (
   getState: GetState
 ) => {
   try {
-    const resp = await apiGetApiMe({})
+    let user
 
-    if (resp.status !== 200) {
-      throw new Error(resp.data.message)
+    if (
+      isFlagEnabled('multiAccount') &&
+      isFlagEnabled('avatarNameForMultiAccountFix')
+    ) {
+      const resp = await getAccounts({})
+
+      if (resp.status !== 200) {
+        throw new Error(resp.data.message)
+      }
+      user = resp.data.find(account => account.isActive)
+    } else {
+      const resp = await apiGetApiMe({})
+
+      if (resp.status !== 200) {
+        throw new Error(resp.data.message)
+      }
+      user = resp.data
     }
-    const user = resp.data
+
     updateReportingContext({userID: user.id, userEmail: user.name})
 
     gaEvent('cloudAppUserDataReady', {