Merge pull request Expensify#69000 from allgandalf/fix/66494

Remove Onyx.connect() for the key: ONYXKEYS.CREDENTIALS in src/libs/actions/Delegate.ts

Author: danieldoglas

src/components/AccountSwitcher.tsx

@@ -47,6 +47,8 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
     const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
     const [accountID] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false, selector: accountIDSelector});
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED, {canBeMissing: true});
+    const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS, {canBeMissing: true});
+
     const buttonRef = useRef<HTMLDivElement>(null);
     const {windowHeight} = useWindowDimensions();
 
@@ -158,7 +160,7 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
                             close(() => setShouldShowOfflineModal(true));
                             return;
                         }
-                        connect({email, delegatedAccess: account?.delegatedAccess});
+                        connect({email, delegatedAccess: account?.delegatedAccess, credentials});
                     },
                 });
             });

src/libs/Navigation/AppNavigator/AuthScreens.tsx

@@ -178,7 +178,7 @@ function AuthScreens() {
     const {toggleSearch} = useSearchRouterContext();
     const currentUrl = getCurrentUrl();
     const delegatorEmail = getSearchParamFromUrl(currentUrl, 'delegatorEmail');
-
+    const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS, {canBeMissing: true});
     const [account] = useOnyx(ONYXKEYS.ACCOUNT, {
         canBeMissing: true,
     });
@@ -275,7 +275,7 @@ function AuthScreens() {
         // or returning from background. If so, we'll assume they have some app data already and we can call reconnectApp() instead of openApp() and connect() for delegator from OldDot.
         if (SessionUtils.didUserLogInDuringSession() || delegatorEmail) {
             if (delegatorEmail) {
-                connect({email: delegatorEmail, delegatedAccess: account?.delegatedAccess, isFromOldDot: true})
+                connect({email: delegatorEmail, delegatedAccess: account?.delegatedAccess, credentials, isFromOldDot: true})
                     ?.then((success) => {
                         App.setAppLoading(!!success);
                     })

src/libs/actions/Delegate.ts

@@ -20,12 +20,6 @@ import {getCurrentUserAccountID} from './Report';
 import updateSessionAuthTokens from './Session/updateSessionAuthTokens';
 import updateSessionUser from './Session/updateSessionUser';
 
-let credentials: Credentials = {};
-Onyx.connect({
-    key: ONYXKEYS.CREDENTIALS,
-    callback: (value) => (credentials = value ?? {}),
-});
-
 let stashedCredentials: Credentials = {};
 Onyx.connect({
     key: ONYXKEYS.STASHED_CREDENTIALS,
@@ -76,6 +70,10 @@ type WithDelegatedAccess = {
     delegatedAccess: DelegatedAccess | undefined;
 };
 
+type WithCredentials = {
+    credentials: Credentials | undefined;
+};
+
 type WithEmail = {
     email: string;
 };
@@ -116,7 +114,7 @@ type UpdateDelegateRoleParams = WithEmail & WithRole & WithValidateCode & WithDe
 type IsConnectedAsDelegateParams = WithDelegatedAccess;
 
 // Connect as delegate
-type ConnectParams = WithEmail & WithDelegatedAccess & WithOldDotFlag;
+type ConnectParams = WithEmail & WithDelegatedAccess & WithOldDotFlag & WithCredentials;
 
 // Clear pending action for role update
 type ClearDelegateRolePendingActionParams = WithEmail & WithDelegatedAccess;
@@ -125,12 +123,12 @@ type ClearDelegateRolePendingActionParams = WithEmail & WithDelegatedAccess;
  * Connects the user as a delegate to another account.
  * Returns a Promise that resolves to true on success, false on failure, or undefined if not applicable.
  */
-function connect({email, delegatedAccess, isFromOldDot = false}: ConnectParams) {
+function connect({email, delegatedAccess, credentials, isFromOldDot = false}: ConnectParams) {
     if (!delegatedAccess?.delegators && !isFromOldDot) {
         return;
     }
 
-    Onyx.set(ONYXKEYS.STASHED_CREDENTIALS, credentials);
+    Onyx.set(ONYXKEYS.STASHED_CREDENTIALS, credentials ?? {});
     Onyx.set(ONYXKEYS.STASHED_SESSION, session);
 
     const previousAccountID = getCurrentUserAccountID();