Skip to content

Commit 444b47e

Browse files
committed
format phone number in MemberListItemHeader
1 parent 95a7b94 commit 444b47e

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

src/components/SelectionList/Search/MemberListItemHeader.tsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ import Checkbox from '@components/Checkbox';
55
import type {ListItem, TransactionMemberGroupListItemType} from '@components/SelectionList/types';
66
import TextWithTooltip from '@components/TextWithTooltip';
77
import UserDetailsTooltip from '@components/UserDetailsTooltip';
8+
import useLocalize from '@hooks/useLocalize';
89
import useThemeStyles from '@hooks/useThemeStyles';
10+
import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
11+
import {getDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
912
import CONST from '@src/CONST';
1013

1114
type MemberListItemHeaderProps<TItem extends ListItem> = {
@@ -24,10 +27,12 @@ type MemberListItemHeaderProps<TItem extends ListItem> = {
2427

2528
function MemberListItemHeader<TItem extends ListItem>({member: memberItem, onCheckboxPress, isDisabled, canSelectMultiple}: MemberListItemHeaderProps<TItem>) {
2629
const styles = useThemeStyles();
30+
const {translate} = useLocalize();
2731

28-
// s77rt add total cell, action cell and collapse/expand button
32+
const formattedDisplayName = formatPhoneNumber(getDisplayNameOrDefault(memberItem));
33+
const formattedLogin = formatPhoneNumber(memberItem.login ?? '');
2934

30-
// s77rt remove sms domain
35+
// s77rt add total cell, action cell and collapse/expand button
3136

3237
return (
3338
<View>
@@ -38,7 +43,7 @@ function MemberListItemHeader<TItem extends ListItem>({member: memberItem, onChe
3843
onPress={() => onCheckboxPress?.(memberItem as unknown as TItem)}
3944
isChecked={memberItem.isSelected}
4045
disabled={!!isDisabled || memberItem.isDisabledCheckbox}
41-
accessibilityLabel={memberItem.text ?? ''}
46+
accessibilityLabel={translate('common.select')}
4247
/>
4348
)}
4449
<View style={[styles.flexRow, styles.gap3]}>
@@ -47,18 +52,18 @@ function MemberListItemHeader<TItem extends ListItem>({member: memberItem, onChe
4752
<Avatar
4853
source={memberItem.avatar}
4954
type={CONST.ICON_TYPE_AVATAR}
50-
name={memberItem.displayName ?? memberItem.login}
55+
name={formattedDisplayName}
5156
avatarID={memberItem.accountID}
5257
/>
5358
</View>
5459
</UserDetailsTooltip>
5560
<View style={[styles.gapHalf]}>
5661
<TextWithTooltip
57-
text={memberItem.displayName ?? memberItem.login ?? ''}
62+
text={formattedDisplayName}
5863
style={[styles.optionDisplayName, styles.sidebarLinkTextBold, styles.pre]}
5964
/>
6065
<TextWithTooltip
61-
text={memberItem.login ?? ''}
66+
text={formattedLogin || formattedDisplayName}
6267
style={[styles.textLabelSupporting, styles.lh16, styles.pre]}
6368
/>
6469
</View>

0 commit comments

Comments
 (0)