Skip to content

Account Switcher fix emojis cut-off #61111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MariaHCD merged 2 commits into from
Jun 5, 2025
Merged

Account Switcher fix emojis cut-off #61111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95b68fb
fix iOS emojis cut-off
ChavdaSachin May 23, 2025
e51ed1f
Merge remote-tracking branch 'upstream/main' into fix-61030/AccountSw…
ChavdaSachin May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/components/AccountSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {clearDelegatorErrors, connect, disconnect} from '@libs/actions/Delegate'
import {close} from '@libs/actions/Modal';
import {getLatestError} from '@libs/ErrorUtils';
import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
import TextWithEmojiFragment from '@pages/home/report/comment/TextWithEmojiFragment';
import variables from '@styles/variables';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
Expand Down Expand Up @@ -53,6 +54,8 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {

const isActingAsDelegate = !!account?.delegatedAccess?.delegate;
const canSwitchAccounts = delegators.length > 0 || isActingAsDelegate;
const displayName = currentUserPersonalDetails?.displayName ?? '';
const doesDisplayNameContainEmojis = new RegExp(CONST.REGEX.EMOJIS, CONST.REGEX.EMOJIS.flags.concat('g')).test(displayName);

const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip, hideProductTrainingTooltip} = useProductTrainingContext(
CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.ACCOUNT_SWITCHER,
Expand Down Expand Up @@ -189,12 +192,21 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
/>
<View style={[styles.flex1, styles.flexShrink1, styles.flexBasis0, styles.justifyContentCenter, styles.gap1]}>
<View style={[styles.flexRow, styles.gap1]}>
<Text
numberOfLines={1}
style={[styles.textBold, styles.textLarge, styles.flexShrink1, styles.lineHeightXLarge]}
>
{currentUserPersonalDetails?.displayName}
</Text>
{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]}
>
{displayName}
</Text>
)}
{!!canSwitchAccounts && (
<View style={styles.justifyContentCenter}>
<Icon
Expand Down