From 8132703860b005f753f18da6c75ddc5f5a0ad4f5 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Mon, 1 Jun 2026 23:16:26 +0700
Subject: [PATCH 01/15] Make Copilot switching discoverable with a dedicated
 Switch button

Replace the implicit avatar/name press affordance on the Accounts header
with an explicit Switch button in the slot previously held by the Status
emoji picker. The avatar and name are no longer pressable, the Copilot
access tooltip now anchors to the Switch button, and the Status entry is
removed from the Accounts header (it already lives on the Profile page).
---
 src/components/AccountSwitcher.tsx         | 117 +++++++++------------
 src/pages/settings/InitialSettingsPage.tsx |  31 ------
 2 files changed, 50 insertions(+), 98 deletions(-)

diff --git a/src/components/AccountSwitcher.tsx b/src/components/AccountSwitcher.tsx
index ae451830defe..15f68ec6e268 100644
--- a/src/components/AccountSwitcher.tsx
+++ b/src/components/AccountSwitcher.tsx
@@ -4,12 +4,10 @@ import React, {useRef, useState} from 'react';
 import {View} from 'react-native';
 import useConfirmModal from '@hooks/useConfirmModal';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {clearDelegatorErrors, connect, disconnect} from '@libs/actions/Delegate';
@@ -26,11 +24,10 @@ import {isTrackingSelector} from '@src/selectors/GPSDraftDetails';
 import type {PersonalDetails} from '@src/types/onyx';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 import Avatar from './Avatar';
-import Icon from './Icon';
+import Button from './Button';
 import {ModalActions} from './Modal/Global/ModalContext';
 import type {PopoverMenuItem} from './PopoverMenu';
 import PopoverMenu from './PopoverMenu';
-import {PressableWithFeedback} from './Pressable';
 import {useProductTrainingContext} from './ProductTrainingContext';
 import Text from './Text';
 import Tooltip from './Tooltip';
@@ -42,10 +39,8 @@ type AccountSwitcherProps = {
 };
 
 function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
-    const icons = useMemoizedLazyExpensifyIcons(['CaretUpDown', 'Checkmark']);
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const styles = useThemeStyles();
-    const theme = useTheme();
     const {localeCompare, translate, formatPhoneNumber} = useLocalize();
     const {isOffline} = useNetwork();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -60,7 +55,7 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
     const [gpsDraftDetails] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS);
 
-    const buttonRef = useRef<HTMLDivElement>(null);
+    const buttonRef = useRef<View>(null);
     const {windowHeight} = useWindowDimensions();
 
     const [shouldShowDelegatorMenu, setShouldShowDelegatorMenu] = useState(false);
@@ -223,71 +218,59 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
 
     return (
         <>
-            <TooltipToRender {...tooltipProps}>
-                <PressableWithFeedback
-                    accessible
-                    accessibilityLabel={`${translate('common.profile')}, ${displayName}, ${Str.removeSMSDomain(currentUserPersonalDetails?.login ?? '')}`}
-                    onPress={onPressSwitcher}
-                    ref={buttonRef}
-                    interactive={canSwitchAccounts}
-                    pressDimmingValue={canSwitchAccounts ? undefined : 1}
-                    wrapperStyle={[styles.flexGrow1, styles.flex1, styles.mnw0, styles.justifyContentCenter]}
-                    sentryLabel={CONST.SENTRY_LABEL.ACCOUNT_SWITCHER.SHOW_ACCOUNTS}
-                >
-                    <View style={[styles.flexRow, styles.gap3, styles.alignItemsCenter]}>
-                        <Avatar
-                            type={CONST.ICON_TYPE_AVATAR}
-                            size={CONST.AVATAR_SIZE.DEFAULT}
-                            avatarID={currentUserPersonalDetails?.accountID}
-                            source={currentUserPersonalDetails?.avatar}
-                            fallbackIcon={currentUserPersonalDetails.fallbackIcon}
-                        />
-                        <View style={[styles.flex1, styles.flexShrink1, styles.flexBasis0, styles.justifyContentCenter, styles.gap1]}>
-                            <View style={[styles.flexRow, styles.gap1]}>
-                                {doesDisplayNameContainEmojis ? (
-                                    <Text numberOfLines={1}>
-                                        <TextWithEmojiFragment
-                                            message={displayName}
-                                            style={[styles.textBold, styles.textLarge, styles.flexShrink1, styles.lineHeightXLarge]}
-                                        />
-                                    </Text>
-                                ) : (
-                                    <Text
-                                        numberOfLines={1}
-                                        style={[styles.textBold, styles.textLarge, styles.flexShrink1, styles.lineHeightXLarge]}
-                                    >
-                                        {formatPhoneNumber(displayName)}
-                                    </Text>
-                                )}
-                                {!!canSwitchAccounts && (
-                                    <View style={styles.justifyContentCenter}>
-                                        <Icon
-                                            fill={theme.icon}
-                                            src={icons.CaretUpDown}
-                                            height={variables.iconSizeSmall}
-                                            width={variables.iconSizeSmall}
-                                        />
-                                    </View>
-                                )}
-                            </View>
+            <View style={[styles.flexRow, styles.gap3, styles.alignItemsCenter, styles.flexGrow1, styles.flex1, styles.mnw0]}>
+                <View style={[styles.flexRow, styles.gap3, styles.alignItemsCenter, styles.flex1, styles.flexShrink1, styles.mnw0, styles.justifyContentCenter]}>
+                    <Avatar
+                        type={CONST.ICON_TYPE_AVATAR}
+                        size={CONST.AVATAR_SIZE.DEFAULT}
+                        avatarID={currentUserPersonalDetails?.accountID}
+                        source={currentUserPersonalDetails?.avatar}
+                        fallbackIcon={currentUserPersonalDetails.fallbackIcon}
+                    />
+                    <View style={[styles.flex1, styles.flexShrink1, styles.flexBasis0, styles.justifyContentCenter, styles.gap1]}>
+                        {doesDisplayNameContainEmojis ? (
+                            <Text numberOfLines={1}>
+                                <TextWithEmojiFragment
+                                    message={displayName}
+                                    style={[styles.textBold, styles.textLarge, styles.flexShrink1, styles.lineHeightXLarge]}
+                                />
+                            </Text>
+                        ) : (
                             <Text
                                 numberOfLines={1}
-                                style={[styles.colorMuted, styles.fontSizeLabel]}
+                                style={[styles.textBold, styles.textLarge, styles.flexShrink1, styles.lineHeightXLarge]}
                             >
-                                {Str.removeSMSDomain(currentUserPersonalDetails?.login ?? '')}
+                                {formatPhoneNumber(displayName)}
                             </Text>
-                            {!!isDebugModeEnabled && (
-                                <Text
-                                    style={[styles.textLabelSupporting, styles.mt1, styles.w100]}
-                                    numberOfLines={1}
-                                >
-                                    AccountID: {accountID}
-                                </Text>
-                            )}
-                        </View>
+                        )}
+                        <Text
+                            numberOfLines={1}
+                            style={[styles.colorMuted, styles.fontSizeLabel]}
+                        >
+                            {Str.removeSMSDomain(currentUserPersonalDetails?.login ?? '')}
+                        </Text>
+                        {!!isDebugModeEnabled && (
+                            <Text
+                                style={[styles.textLabelSupporting, styles.mt1, styles.w100]}
+                                numberOfLines={1}
+                            >
+                                AccountID: {accountID}
+                            </Text>
+                        )}
                     </View>
-                </PressableWithFeedback>
-            </TooltipToRender>
+                </View>
+                {!!canSwitchAccounts && (
+                    <TooltipToRender {...tooltipProps}>
+                        <Button
+                            small
+                            ref={buttonRef}
+                            text={translate('delegate.switch')}
+                            onPress={onPressSwitcher}
+                            sentryLabel={CONST.SENTRY_LABEL.ACCOUNT_SWITCHER.SHOW_ACCOUNTS}
+                        />
+                    </TooltipToRender>
+                )}
+            </View>
 
             {!!canSwitchAccounts && (
                 <PopoverMenu
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index f2dda79a6e64..1fdd1b7936a9 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -8,17 +8,14 @@ import {View} from 'react-native';
 import type {ValueOf} from 'type-fest';
 import AccountSwitcher from '@components/AccountSwitcher';
 import AccountSwitcherSkeletonView from '@components/AccountSwitcherSkeletonView';
-import Icon from '@components/Icon';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
 import TabBarBottomContent from '@components/Navigation/TabBarBottomContent';
 import TopBarWithLoadingBar from '@components/Navigation/TopBarWithLoadingBar';
-import {PressableWithFeedback} from '@components/Pressable';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
-import Tooltip from '@components/Tooltip';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import useCardFeedErrors from '@hooks/useCardFeedErrors';
@@ -35,7 +32,6 @@ import usePrivateSubscription from '@hooks/usePrivateSubscription';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
-import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {resetExitSurveyForm} from '@libs/actions/ExitSurvey';
 import {closeReactNativeApp} from '@libs/actions/HybridApp';
@@ -52,7 +48,6 @@ import {getProfilePageBrickRoadIndicator, hasDeviceManagementError} from '@libs/
 import type SETTINGS_TO_RHP from '@navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP';
 import {BACKGROUND_LOCATION_TRACKING_TASK_NAME} from '@pages/iou/request/step/IOURequestStepDistanceGPS/const';
 import {stopGpsTripNotification} from '@pages/iou/request/step/IOURequestStepDistanceGPS/GPSNotifications';
-import variables from '@styles/variables';
 import {confirmReadyToOpenApp} from '@userActions/App';
 import {openExternalLink, openOldDotLink} from '@userActions/Link';
 import {hasPaymentMethodError} from '@userActions/PaymentMethods';
@@ -147,12 +142,10 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const tabBarContent = <TabBarBottomContent selectedTab={NAVIGATION_TABS.SETTINGS} />;
     const network = useNetwork();
-    const theme = useTheme();
     const styles = useThemeStyles();
     const {isExecuting, singleExecution} = useSingleExecution();
     const {translate} = useLocalize();
     const focusedRouteName = useNavigationState((state) => findFocusedRoute(state)?.name);
-    const emojiCode = currentUserPersonalDetails?.status?.emojiCode ?? '';
     const isScreenFocused = useIsSidebarRouteActive(NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR, shouldUseNarrowLayout);
     const hasActivatedWallet = ([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM] as string[]).includes(userWallet?.tierName ?? '');
     const hasLockedBankAccount = bankAccountList ? Object.values(bankAccountList).some((bankAccount) => bankAccount.accountData?.state === CONST.BANK_ACCOUNT.STATE.LOCKED) : false;
@@ -508,30 +501,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
             ) : (
                 <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.gap3]}>
                     <AccountSwitcher isScreenFocused={isScreenFocused} />
-                    <Tooltip text={translate('statusPage.status')}>
-                        <PressableWithFeedback
-                            accessibilityLabel={
-                                emojiCode ? `${translate('statusPage.status')}: ${emojiCode}` : `${translate('statusPage.status')}, ${translate('emojiPicker.emojiNotSelected')}`
-                            }
-                            accessibilityRole="button"
-                            accessible
-                            sentryLabel={CONST.SENTRY_LABEL.ACCOUNT.STATUS_PICKER}
-                            onPress={() => Navigation.navigate(ROUTES.SETTINGS_STATUS)}
-                        >
-                            <View style={styles.primaryMediumIcon}>
-                                {emojiCode ? (
-                                    <Text style={styles.primaryMediumText}>{emojiCode}</Text>
-                                ) : (
-                                    <Icon
-                                        src={icons.Emoji}
-                                        width={variables.iconSizeNormal}
-                                        height={variables.iconSizeNormal}
-                                        fill={theme.icon}
-                                    />
-                                )}
-                            </View>
-                        </PressableWithFeedback>
-                    </Tooltip>
                 </View>
             )}
         </View>

From 2c55c33f97847b3cca060313717c92e43132ea4d Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Fri, 12 Jun 2026 13:24:34 +0700
Subject: [PATCH 02/15] Remove unused Emoji lazy icon entry

---
 src/pages/settings/InitialSettingsPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 1fdd1b7936a9..d9d5ff71692a 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -115,7 +115,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
         'Lightbulb',
         'Lock',
         'Users',
-        'Emoji',
         'CreditCard',
         'Wallet',
         'Bolt',

From f441a093eea0e113e6825ad1d4959a454672ec55 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Fri, 12 Jun 2026 13:29:07 +0700
Subject: [PATCH 03/15] Remove dead styles and orphaned status-picker Sentry
 label

---
 src/CONST/index.ts                         | 1 -
 src/pages/settings/InitialSettingsPage.tsx | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index e077fbdfda6c..6819598c2fe8 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -8258,7 +8258,6 @@ const CONST = {
             COPILOT: 'Account-Copilot',
             SECURITY: 'Account-Security',
             SUBSCRIPTION: 'Account-Subscription',
-            STATUS_PICKER: 'Account-StatusPicker',
         },
         DISCOVER_SECTION: {
             TEST_DRIVE: 'DiscoverSection-TestDrive',
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index a39ea0c4c2e6..799544445b69 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -498,7 +498,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                     reasonAttributes={skeletonReasonAttributes}
                 />
             ) : (
-                <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.gap3]}>
+                <View style={[styles.flexRow, styles.alignItemsCenter]}>
                     <AccountSwitcher isScreenFocused={isScreenFocused} />
                 </View>
             )}

From 20154489ef6a9d5d43257937195b209275f7480d Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Fri, 12 Jun 2026 14:06:04 +0700
Subject: [PATCH 04/15] Add UI tests for AccountSwitcher Switch button

---
 tests/ui/AccountSwitcherTest.tsx | 150 +++++++++++++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 tests/ui/AccountSwitcherTest.tsx

diff --git a/tests/ui/AccountSwitcherTest.tsx b/tests/ui/AccountSwitcherTest.tsx
new file mode 100644
index 000000000000..fd34090da655
--- /dev/null
+++ b/tests/ui/AccountSwitcherTest.tsx
@@ -0,0 +1,150 @@
+import {PortalProvider} from '@gorhom/portal';
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+import AccountSwitcher from '@components/AccountSwitcher';
+import ComposeProviders from '@components/ComposeProviders';
+import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+jest.mock('@components/ProductTrainingContext', () => ({
+    useProductTrainingContext: (): {
+        renderProductTrainingTooltip: () => null;
+        shouldShowProductTrainingTooltip: boolean;
+        hideProductTrainingTooltip: () => void;
+    } => ({
+        renderProductTrainingTooltip: () => null,
+        shouldShowProductTrainingTooltip: false,
+        hideProductTrainingTooltip: () => {},
+    }),
+}));
+
+// ReanimatedModal calls onModalHide via the native Modal's onDismiss callback,
+// which doesn't fire in tests because animations are disabled.
+// This mock renders visible modal content synchronously instead.
+jest.mock('@components/Modal/ReanimatedModal', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {useEffect, useRef}: {useEffect: typeof React.useEffect; useRef: typeof React.useRef} = require('react');
+
+    return function MockReanimatedModal({isVisible, onModalHide, children}: {isVisible: boolean; onModalHide?: () => void; children: React.ReactNode}) {
+        const wasVisible = useRef<boolean>(isVisible);
+
+        useEffect(() => {
+            if (wasVisible.current && !isVisible) {
+                onModalHide?.();
+            }
+            wasVisible.current = isVisible;
+        }, [isVisible, onModalHide]);
+
+        if (!isVisible) {
+            return null;
+        }
+
+        return children as React.ReactElement;
+    };
+});
+
+TestHelper.setupGlobalFetchMock();
+
+const CURRENT_USER_ACCOUNT_ID = 1;
+const CURRENT_USER_EMAIL = 'test@user.com';
+const CURRENT_USER_DISPLAY_NAME = 'Test User';
+const DELEGATOR_ACCOUNT_ID = 2;
+const DELEGATOR_EMAIL = 'delegator@example.com';
+const DELEGATOR_DISPLAY_NAME = 'Delegator User';
+const SWITCH_BUTTON_TEXT = 'Switch';
+const POPOVER_HEADER_TEXT = 'Switch accounts:';
+
+function renderAccountSwitcher() {
+    return render(
+        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, CurrentReportIDContextProvider, CurrentUserPersonalDetailsProvider]}>
+            <PortalProvider>
+                <AccountSwitcher isScreenFocused />
+            </PortalProvider>
+        </ComposeProviders>,
+    );
+}
+
+async function addDelegator() {
+    await act(async () => {
+        await Onyx.merge(ONYXKEYS.ACCOUNT, {
+            delegatedAccess: {
+                delegators: [{email: DELEGATOR_EMAIL, role: CONST.DELEGATE_ROLE.ALL}],
+            },
+        });
+        await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+            [DELEGATOR_ACCOUNT_ID]: {
+                accountID: DELEGATOR_ACCOUNT_ID,
+                login: DELEGATOR_EMAIL,
+                displayName: DELEGATOR_DISPLAY_NAME,
+            },
+        });
+    });
+    await waitForBatchedUpdatesWithAct();
+}
+
+describe('AccountSwitcher', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await TestHelper.signInWithTestUser(CURRENT_USER_ACCOUNT_ID, CURRENT_USER_EMAIL);
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    afterEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('does not show the Switch button when the user cannot switch accounts', async () => {
+        renderAccountSwitcher();
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.getByText(CURRENT_USER_DISPLAY_NAME)).toBeOnTheScreen();
+        expect(screen.getByText(CURRENT_USER_EMAIL)).toBeOnTheScreen();
+        expect(screen.queryByText(SWITCH_BUTTON_TEXT)).toBeNull();
+    });
+
+    it('shows the Switch button when the user has delegators', async () => {
+        await addDelegator();
+
+        renderAccountSwitcher();
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.getByText(SWITCH_BUTTON_TEXT)).toBeOnTheScreen();
+    });
+
+    it('opens the account switcher popover when the Switch button is pressed', async () => {
+        await addDelegator();
+
+        renderAccountSwitcher();
+        await waitForBatchedUpdatesWithAct();
+
+        fireEvent.press(screen.getByText(SWITCH_BUTTON_TEXT));
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.getByText(POPOVER_HEADER_TEXT)).toBeOnTheScreen();
+        expect(screen.getByTestId(`PopoverMenuItem-${DELEGATOR_DISPLAY_NAME}`)).toBeOnTheScreen();
+    });
+
+    it('does not open the account switcher popover when the name or email is pressed', async () => {
+        await addDelegator();
+
+        renderAccountSwitcher();
+        await waitForBatchedUpdatesWithAct();
+
+        fireEvent.press(screen.getByText(CURRENT_USER_DISPLAY_NAME));
+        fireEvent.press(screen.getByText(CURRENT_USER_EMAIL));
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.queryByText(POPOVER_HEADER_TEXT)).toBeNull();
+    });
+});

From 4128e85a23e65dfb2023b08a8cd29ad36429f912 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Fri, 12 Jun 2026 16:01:45 +0700
Subject: [PATCH 05/15] Avoid unsafe type assertion in ReanimatedModal test
 mock

---
 tests/ui/AccountSwitcherTest.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/ui/AccountSwitcherTest.tsx b/tests/ui/AccountSwitcherTest.tsx
index fd34090da655..33dc1b41f490 100644
--- a/tests/ui/AccountSwitcherTest.tsx
+++ b/tests/ui/AccountSwitcherTest.tsx
@@ -30,9 +30,9 @@ jest.mock('@components/ProductTrainingContext', () => ({
 // This mock renders visible modal content synchronously instead.
 jest.mock('@components/Modal/ReanimatedModal', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const {useEffect, useRef}: {useEffect: typeof React.useEffect; useRef: typeof React.useRef} = require('react');
+    const {useEffect, useRef, createElement, Fragment}: typeof React = require('react');
 
-    return function MockReanimatedModal({isVisible, onModalHide, children}: {isVisible: boolean; onModalHide?: () => void; children: React.ReactNode}) {
+    function MockReanimatedModal({isVisible, onModalHide, children}: {isVisible: boolean; onModalHide?: () => void; children: React.ReactNode}) {
         const wasVisible = useRef<boolean>(isVisible);
 
         useEffect(() => {
@@ -46,8 +46,10 @@ jest.mock('@components/Modal/ReanimatedModal', () => {
             return null;
         }
 
-        return children as React.ReactElement;
-    };
+        return createElement(Fragment, null, children);
+    }
+    MockReanimatedModal.displayName = 'ReanimatedModal';
+    return MockReanimatedModal;
 });
 
 TestHelper.setupGlobalFetchMock();

From 69b09117f5f722a59dfaffb80481b39bf088d9e8 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Fri, 12 Jun 2026 16:20:18 +0700
Subject: [PATCH 06/15] Simplify ReanimatedModal test mock so it compiles with
 React Compiler

---
 tests/ui/AccountSwitcherTest.tsx | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/tests/ui/AccountSwitcherTest.tsx b/tests/ui/AccountSwitcherTest.tsx
index 33dc1b41f490..de3d312769b3 100644
--- a/tests/ui/AccountSwitcherTest.tsx
+++ b/tests/ui/AccountSwitcherTest.tsx
@@ -25,30 +25,19 @@ jest.mock('@components/ProductTrainingContext', () => ({
     }),
 }));
 
-// ReanimatedModal calls onModalHide via the native Modal's onDismiss callback,
-// which doesn't fire in tests because animations are disabled.
-// This mock renders visible modal content synchronously instead.
+// ReanimatedModal animates its content in, which doesn't work in tests because
+// animations are disabled. This mock renders visible modal content synchronously instead.
 jest.mock('@components/Modal/ReanimatedModal', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const {useEffect, useRef, createElement, Fragment}: typeof React = require('react');
-
-    function MockReanimatedModal({isVisible, onModalHide, children}: {isVisible: boolean; onModalHide?: () => void; children: React.ReactNode}) {
-        const wasVisible = useRef<boolean>(isVisible);
-
-        useEffect(() => {
-            if (wasVisible.current && !isVisible) {
-                onModalHide?.();
-            }
-            wasVisible.current = isVisible;
-        }, [isVisible, onModalHide]);
+    const {createElement, Fragment}: typeof React = require('react');
 
+    function MockReanimatedModal({isVisible, children}: {isVisible: boolean; children: React.ReactNode}) {
         if (!isVisible) {
             return null;
         }
 
         return createElement(Fragment, null, children);
     }
-    MockReanimatedModal.displayName = 'ReanimatedModal';
     return MockReanimatedModal;
 });
 

From 1fb32dcbe60a9b59704fc21ee12d5e6e59bb0edd Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Mon, 15 Jun 2026 00:49:29 +0700
Subject: [PATCH 07/15] Wrap Switch button in a View so the Copilot access
 tooltip shows on hover

---
 src/components/AccountSwitcher.tsx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/AccountSwitcher.tsx b/src/components/AccountSwitcher.tsx
index 15f68ec6e268..646a0ad69f28 100644
--- a/src/components/AccountSwitcher.tsx
+++ b/src/components/AccountSwitcher.tsx
@@ -261,13 +261,16 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
                 </View>
                 {!!canSwitchAccounts && (
                     <TooltipToRender {...tooltipProps}>
-                        <Button
-                            small
-                            ref={buttonRef}
-                            text={translate('delegate.switch')}
-                            onPress={onPressSwitcher}
-                            sentryLabel={CONST.SENTRY_LABEL.ACCOUNT_SWITCHER.SHOW_ACCOUNTS}
-                        />
+                        {/* View wrapper forwards the hover events Tooltip injects; Button doesn't pass them to its underlying pressable, so the tooltip wouldn't show without it */}
+                        <View>
+                            <Button
+                                small
+                                ref={buttonRef}
+                                text={translate('delegate.switch')}
+                                onPress={onPressSwitcher}
+                                sentryLabel={CONST.SENTRY_LABEL.ACCOUNT_SWITCHER.SHOW_ACCOUNTS}
+                            />
+                        </View>
                     </TooltipToRender>
                 )}
             </View>

From db7935f87c40baa34521c50408816ef6315d868b Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Mon, 15 Jun 2026 01:30:13 +0700
Subject: [PATCH 08/15] Add justification to eslint-disable in AccountSwitcher
 test mock

---
 tests/ui/AccountSwitcherTest.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ui/AccountSwitcherTest.tsx b/tests/ui/AccountSwitcherTest.tsx
index de3d312769b3..b359b665c718 100644
--- a/tests/ui/AccountSwitcherTest.tsx
+++ b/tests/ui/AccountSwitcherTest.tsx
@@ -28,7 +28,7 @@ jest.mock('@components/ProductTrainingContext', () => ({
 // ReanimatedModal animates its content in, which doesn't work in tests because
 // animations are disabled. This mock renders visible modal content synchronously instead.
 jest.mock('@components/Modal/ReanimatedModal', () => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- require() returns an untyped module; the typeof React annotation on the destructure enforces the expected shape
     const {createElement, Fragment}: typeof React = require('react');
 
     function MockReanimatedModal({isVisible, children}: {isVisible: boolean; children: React.ReactNode}) {

From 16f4ed439869cd1b1f839b61948e01167303ca2c Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Wed, 17 Jun 2026 21:40:28 +0700
Subject: [PATCH 09/15] Update Copilot switcher tooltip copy to match design

---
 src/languages/en.ts | 2 +-
 src/languages/es.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 08010d9e5caf..57d11a904a8d 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9618,7 +9618,7 @@ const translations = {
         // https://github.com/Expensify/App/issues/57045#issuecomment-2701455668
         conciergeLHNGBR: '<tooltip>Get started <strong>here!</strong></tooltip>',
         saveSearchTooltip: '<tooltip><strong>Rename your saved searches</strong> here!</tooltip>',
-        accountSwitcher: '<tooltip>Access your <strong>Copilot accounts</strong> here</tooltip>',
+        accountSwitcher: '<tooltip>You can now <strong>copilot</strong> to another account</tooltip>',
         outstandingFilter: '<tooltip>Filter for expenses\nthat <strong>need approval</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>Send this receipt to\n<strong>complete the test drive!</strong></tooltip>',
         gpsTooltip: "<tooltip>GPS tracking in progress! When you're done, stop tracking below.</tooltip>",
diff --git a/src/languages/es.ts b/src/languages/es.ts
index b659f80eaff5..2b81698190f4 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9716,7 +9716,7 @@ ${amount} para ${merchant} - ${date}`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>¡Comienza <strong>aquí</strong>!</tooltip>',
         saveSearchTooltip: '<tooltip><strong>Renombra tus búsquedas guardadas</strong> aquí</tooltip>',
-        accountSwitcher: '<tooltip>Accede a tus <strong>cuentas copiloto</strong> aquí</tooltip>',
+        accountSwitcher: '<tooltip>Ahora puedes hacer de <strong>copiloto</strong> en otra cuenta</tooltip>',
         outstandingFilter: '<tooltip>Filtra los gastos\nque <strong>necesitan aprobación</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>¡Envía este recibo para\n<strong>completar la prueba</strong>!</tooltip>',
         gpsTooltip: '<tooltip>¡Seguimiento por GPS en curso! Cuando termines, detén el seguimiento a continuación.</tooltip>',

From 1d1e05343968f7344aed27688a310f7827ea0ccd Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Fri, 19 Jun 2026 21:43:13 +0700
Subject: [PATCH 10/15] Add caret to the Switch button to match the design
 mockup

---
 src/components/AccountSwitcher.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/AccountSwitcher.tsx b/src/components/AccountSwitcher.tsx
index 43e916904a20..727d7a1bd7b3 100644
--- a/src/components/AccountSwitcher.tsx
+++ b/src/components/AccountSwitcher.tsx
@@ -4,6 +4,7 @@ import React, {useRef, useState} from 'react';
 import {View} from 'react-native';
 import useConfirmModal from '@hooks/useConfirmModal';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
@@ -40,6 +41,7 @@ type AccountSwitcherProps = {
 
 function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const icons = useMemoizedLazyExpensifyIcons(['CaretUpDown']);
     const styles = useThemeStyles();
     const {localeCompare, translate, formatPhoneNumber} = useLocalize();
     const {isOffline} = useNetwork();
@@ -269,6 +271,8 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
                                 text={translate('delegate.switch')}
                                 onPress={onPressSwitcher}
                                 sentryLabel={CONST.SENTRY_LABEL.ACCOUNT_SWITCHER.SHOW_ACCOUNTS}
+                                shouldShowRightIcon
+                                iconRight={icons.CaretUpDown}
                             />
                         </View>
                     </TooltipToRender>

From dad4870eea30654e58628e989782734da76814c6 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Fri, 19 Jun 2026 22:02:01 +0700
Subject: [PATCH 11/15] Keep the first-time copilot tooltip visible until
 dismissed

---
 src/components/AccountSwitcher.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/AccountSwitcher.tsx b/src/components/AccountSwitcher.tsx
index 727d7a1bd7b3..1e2321782128 100644
--- a/src/components/AccountSwitcher.tsx
+++ b/src/components/AccountSwitcher.tsx
@@ -119,6 +119,9 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
               shiftHorizontal: variables.accountSwitcherTooltipShiftHorizontal,
               wrapperStyle: styles.productTrainingTooltipWrapper,
               onTooltipPress: onPressSwitcher,
+              // The switcher lives in the settings sidebar, which isn't the navigation-focused screen on wide layouts.
+              // Without this the educational tooltip is suppressed (it relies on the screen being focused), so keep it shown until dismissed.
+              shouldHideOnNavigate: false,
           }
         : {
               text: translate('delegate.copilotAccess'),

From 370a7c2ffe454f4eb15bb3c516f1913ed75391bc Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Sat, 20 Jun 2026 04:29:06 +0700
Subject: [PATCH 12/15] Align copilot tooltip with mockup: open leftward into
 the sidebar and drop the bold on copilot

---
 src/components/AccountSwitcher.tsx | 4 +++-
 src/languages/en.ts                | 2 +-
 src/languages/es.ts                | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/AccountSwitcher.tsx b/src/components/AccountSwitcher.tsx
index 1e2321782128..32e4c55e77c6 100644
--- a/src/components/AccountSwitcher.tsx
+++ b/src/components/AccountSwitcher.tsx
@@ -112,7 +112,9 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
               shouldRender: shouldShowProductTrainingTooltip,
               renderTooltipContent: renderProductTrainingTooltip,
               anchorAlignment: {
-                  horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+                  // Right-align so the tooltip opens leftward into the sidebar (matching the design mockup),
+                  // instead of overflowing past the Switch button into the central pane.
+                  horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
                   vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
               },
               shiftVertical: variables.accountSwitcherTooltipShiftVertical,
diff --git a/src/languages/en.ts b/src/languages/en.ts
index ae736fa98142..26510b00b862 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9655,7 +9655,7 @@ const translations = {
         // https://github.com/Expensify/App/issues/57045#issuecomment-2701455668
         conciergeLHNGBR: '<tooltip>Get started <strong>here!</strong></tooltip>',
         saveSearchTooltip: '<tooltip><strong>Rename your saved searches</strong> here!</tooltip>',
-        accountSwitcher: '<tooltip>You can now <strong>copilot</strong> to another account</tooltip>',
+        accountSwitcher: '<tooltip>You can now copilot to another account</tooltip>',
         outstandingFilter: '<tooltip>Filter for expenses\nthat <strong>need approval</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>Send this receipt to\n<strong>complete the test drive!</strong></tooltip>',
         gpsTooltip: "<tooltip>GPS tracking in progress! When you're done, stop tracking below.</tooltip>",
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 2be50b2dc90b..da6d9b1b8362 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9747,7 +9747,7 @@ ${amount} para ${merchant} - ${date}`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>¡Comienza <strong>aquí</strong>!</tooltip>',
         saveSearchTooltip: '<tooltip><strong>Renombra tus búsquedas guardadas</strong> aquí</tooltip>',
-        accountSwitcher: '<tooltip>Ahora puedes hacer de <strong>copiloto</strong> en otra cuenta</tooltip>',
+        accountSwitcher: '<tooltip>Ahora puedes hacer de copiloto en otra cuenta</tooltip>',
         outstandingFilter: '<tooltip>Filtra los gastos\nque <strong>necesitan aprobación</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>¡Envía este recibo para\n<strong>completar la prueba</strong>!</tooltip>',
         gpsTooltip: '<tooltip>¡Seguimiento por GPS en curso! Cuando termines, detén el seguimiento a continuación.</tooltip>',

From 596d766cdbcb9c469223a47341ef2af59bfa46e4 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Sat, 20 Jun 2026 04:39:39 +0700
Subject: [PATCH 13/15] Apply reviewer copy feedback: 'copilot into another
 account!'

---
 src/languages/en.ts | 2 +-
 src/languages/es.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 26510b00b862..384ab3fe9609 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9655,7 +9655,7 @@ const translations = {
         // https://github.com/Expensify/App/issues/57045#issuecomment-2701455668
         conciergeLHNGBR: '<tooltip>Get started <strong>here!</strong></tooltip>',
         saveSearchTooltip: '<tooltip><strong>Rename your saved searches</strong> here!</tooltip>',
-        accountSwitcher: '<tooltip>You can now copilot to another account</tooltip>',
+        accountSwitcher: '<tooltip>You can now copilot into another account!</tooltip>',
         outstandingFilter: '<tooltip>Filter for expenses\nthat <strong>need approval</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>Send this receipt to\n<strong>complete the test drive!</strong></tooltip>',
         gpsTooltip: "<tooltip>GPS tracking in progress! When you're done, stop tracking below.</tooltip>",
diff --git a/src/languages/es.ts b/src/languages/es.ts
index da6d9b1b8362..04c97db1e5c9 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9747,7 +9747,7 @@ ${amount} para ${merchant} - ${date}`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>¡Comienza <strong>aquí</strong>!</tooltip>',
         saveSearchTooltip: '<tooltip><strong>Renombra tus búsquedas guardadas</strong> aquí</tooltip>',
-        accountSwitcher: '<tooltip>Ahora puedes hacer de copiloto en otra cuenta</tooltip>',
+        accountSwitcher: '<tooltip>¡Ahora puedes hacer de copiloto en otra cuenta!</tooltip>',
         outstandingFilter: '<tooltip>Filtra los gastos\nque <strong>necesitan aprobación</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>¡Envía este recibo para\n<strong>completar la prueba</strong>!</tooltip>',
         gpsTooltip: '<tooltip>¡Seguimiento por GPS en curso! Cuando termines, detén el seguimiento a continuación.</tooltip>',

From abc4170a7611aac124191c33739f28423df92408 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Thu, 2 Jul 2026 18:59:01 +0700
Subject: [PATCH 14/15] Apply Polyglot Parrot translations for the copilot
 switcher tooltip

---
 src/languages/de.ts      | 2 +-
 src/languages/es.ts      | 2 +-
 src/languages/fr.ts      | 2 +-
 src/languages/it.ts      | 2 +-
 src/languages/ja.ts      | 2 +-
 src/languages/nl.ts      | 2 +-
 src/languages/pl.ts      | 2 +-
 src/languages/pt-BR.ts   | 2 +-
 src/languages/zh-hans.ts | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index f17722b7add5..5b89f0ae09ff 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9877,7 +9877,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>Beginne <strong>hier!</strong></tooltip>',
         saveSearchTooltip: '<tooltip><strong>Benenne deine gespeicherten Suchen um</strong> – hier!</tooltip>',
-        accountSwitcher: '<tooltip>Greifen Sie hier auf Ihre <strong>Copilot-Konten</strong> zu</tooltip>',
+        accountSwitcher: '<tooltip>Sie können jetzt als Copilot in ein anderes Konto einsteigen!</tooltip>',
         outstandingFilter: '<tooltip>Nach Ausgaben filtern,\ndie <strong>genehmigt werden müssen</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>Sende diese Quittung, um\n<strong>die Probefahrt abzuschließen!</strong></tooltip>',
         gpsTooltip: '<tooltip>GPS-Tracking läuft! Wenn du fertig bist, stoppe die Aufzeichnung unten.</tooltip>',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e63ee67c5e94..245e34b2eefb 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -10032,7 +10032,7 @@ ${amount} para ${merchant} - ${date}`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>¡Comienza <strong>aquí</strong>!</tooltip>',
         saveSearchTooltip: '<tooltip><strong>Renombra tus búsquedas guardadas</strong> aquí</tooltip>',
-        accountSwitcher: '<tooltip>Accede a tus <strong>cuentas copiloto</strong> aquí</tooltip>',
+        accountSwitcher: '<tooltip>¡Ahora puedes copilotar en otra cuenta!</tooltip>',
         outstandingFilter: '<tooltip>Filtra los gastos\nque <strong>necesitan aprobación</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>¡Envía este recibo para\n<strong>completar la prueba</strong>!</tooltip>',
         gpsTooltip: '<tooltip>¡Seguimiento por GPS en curso! Cuando termines, detén el seguimiento a continuación.</tooltip>',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 29892da03c46..227ca0bfef93 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9909,7 +9909,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>Commencez <strong>ici&nbsp;!</strong></tooltip>',
         saveSearchTooltip: '<tooltip><strong>Renommez vos recherches enregistrées</strong> ici !</tooltip>',
-        accountSwitcher: '<tooltip>Accédez à vos <strong>comptes Copilot</strong> ici</tooltip>',
+        accountSwitcher: '<tooltip>Vous pouvez désormais copiloter un autre compte&nbsp;!</tooltip>',
         outstandingFilter: '<tooltip>Filtrer les dépenses\nqui <strong>doivent être approuvées</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>Envoyez ce reçu pour\n<strong>terminer l’essai !</strong></tooltip>',
         gpsTooltip: '<tooltip>Suivi GPS en cours ! Lorsque vous avez terminé, arrêtez le suivi ci-dessous.</tooltip>',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 551bc9378e3d..6fecbdf0d715 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9864,7 +9864,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>Inizia <strong>qui!</strong></tooltip>',
         saveSearchTooltip: '<tooltip><strong>Rinomina qui le ricerche salvate</strong>!</tooltip>',
-        accountSwitcher: '<tooltip>Accedi ai tuoi <strong>account Copilot</strong> qui</tooltip>',
+        accountSwitcher: '<tooltip>Ora puoi fare da copilota in un altro account!</tooltip>',
         outstandingFilter: '<tooltip>Filtra per le spese\nche <strong>necessitano di approvazione</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>Invia questa ricevuta per\n<strong>completare il test drive!</strong></tooltip>',
         gpsTooltip: '<tooltip>Tracciamento GPS in corso! Quando hai finito, interrompi il tracciamento qui sotto.</tooltip>',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 3414a8235f3d..07fa4258dc95 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9734,7 +9734,7 @@ ${reportName}`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>まずは<strong>こちらから！</strong></tooltip>',
         saveSearchTooltip: '<tooltip>保存済み検索の<strong>名前を変更</strong>しましょう！</tooltip>',
-        accountSwitcher: '<tooltip>ここから<strong>Copilot アカウント</strong>にアクセスできます</tooltip>',
+        accountSwitcher: '<tooltip>他のアカウントにコパイロットとして入ることができるようになりました！</tooltip>',
         outstandingFilter: '<tooltip><strong>承認が必要な</strong>経費を絞り込む</tooltip>',
         scanTestDriveTooltip: '<tooltip>このレシートを送信して\n<strong>試用を完了しましょう！</strong></tooltip>',
         gpsTooltip: '<tooltip>GPS追跡を実行中です！完了したら、下で追跡を停止してください。</tooltip>',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 13170135bd07..dbbbf667117d 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9834,7 +9834,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>Begin <strong>hier!</strong></tooltip>',
         saveSearchTooltip: '<tooltip><strong>Hernoem hier je opgeslagen zoekopdrachten</strong>!</tooltip>',
-        accountSwitcher: '<tooltip>Krijg hier toegang tot je <strong>Copilot-accounts</strong></tooltip>',
+        accountSwitcher: '<tooltip>Je kunt nu copilot worden in een ander account!</tooltip>',
         outstandingFilter: '<tooltip>Filter voor uitgaven\ndie <strong>goedkeuring nodig hebben</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>Stuur deze bon om\n<strong>de proefrit te voltooien!</strong></tooltip>',
         gpsTooltip: '<tooltip>GPS-tracking bezig! Als je klaar bent, stop dan hieronder met bijhouden.</tooltip>',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 90d8149ca8b8..51a8cad31656 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9815,7 +9815,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>Rozpocznij <strong>tutaj!</strong></tooltip>',
         saveSearchTooltip: '<tooltip><strong>Zmień nazwę zapisanych wyszukiwań</strong> tutaj!</tooltip>',
-        accountSwitcher: '<tooltip>Uzyskaj tutaj dostęp do <strong>kont Copilot</strong></tooltip>',
+        accountSwitcher: '<tooltip>Teraz możesz dołączyć jako kopilot do innego konta!</tooltip>',
         outstandingFilter: '<tooltip>Filtruj wydatki,\nktóre <strong>wymagają zatwierdzenia</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>Wyślij ten paragon, aby\n<strong>zakończyć jazdę próbną!</strong></tooltip>',
         gpsTooltip: '<tooltip>Śledzenie GPS w toku! Gdy skończysz, zatrzymaj śledzenie poniżej.</tooltip>',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 6dacd068ac0d..d7ae930c5114 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9820,7 +9820,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>Comece <strong>aqui!</strong></tooltip>',
         saveSearchTooltip: '<tooltip><strong>Renomeie suas buscas salvas</strong> aqui!</tooltip>',
-        accountSwitcher: '<tooltip>Acesse suas <strong>contas Copilot</strong> aqui</tooltip>',
+        accountSwitcher: '<tooltip>Agora você pode fazer copiloto em outra conta!</tooltip>',
         outstandingFilter: '<tooltip>Filtrar despesas\nque <strong>precisam de aprovação</strong></tooltip>',
         scanTestDriveTooltip: '<tooltip>Envie este recibo para\n<strong>concluir o test drive!</strong></tooltip>',
         gpsTooltip: '<tooltip>Rastreamento por GPS em andamento! Quando terminar, pare o rastreamento abaixo.</tooltip>',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index b1981ae5943b..a179830c7365 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -9542,7 +9542,7 @@ ${reportName}`,
     productTrainingTooltip: {
         conciergeLHNGBR: '<tooltip>从<strong>这里</strong>开始！</tooltip>',
         saveSearchTooltip: '<tooltip>在这里<strong>重命名已保存的搜索</strong>！</tooltip>',
-        accountSwitcher: '<tooltip>在此访问你的<strong>Copilot 账户</strong></tooltip>',
+        accountSwitcher: '<tooltip>您现在可以协同操作另一位用户的账户了！</tooltip>',
         outstandingFilter: '<tooltip>筛选<strong>待审批</strong>的报销</tooltip>',
         scanTestDriveTooltip: '<tooltip>发送此收据以\n<strong>完成试用体验！</strong></tooltip>',
         gpsTooltip: '<tooltip>正在进行 GPS 跟踪！完成后，请在下方停止跟踪。</tooltip>',

From ddb3e8645daa6577b18a4b9cec67ce83efa754a4 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Mon, 6 Jul 2026 14:45:59 +0700
Subject: [PATCH 15/15] Format AccountSwitcherTest with oxfmt

---
 tests/ui/AccountSwitcherTest.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/ui/AccountSwitcherTest.tsx b/tests/ui/AccountSwitcherTest.tsx
index b359b665c718..56c240ae7edb 100644
--- a/tests/ui/AccountSwitcherTest.tsx
+++ b/tests/ui/AccountSwitcherTest.tsx
@@ -1,15 +1,20 @@
-import {PortalProvider} from '@gorhom/portal';
 import {act, fireEvent, render, screen} from '@testing-library/react-native';
-import React from 'react';
-import Onyx from 'react-native-onyx';
+
 import AccountSwitcher from '@components/AccountSwitcher';
 import ComposeProviders from '@components/ComposeProviders';
 import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
 import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
+
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+
+import {PortalProvider} from '@gorhom/portal';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';