Skip to content

Commit dd47eff

Browse files
committed
Rename fallbackUsername to fallbackDisplayName
1 parent 0671e81 commit dd47eff

3 files changed

Lines changed: 21 additions & 21 deletions

File tree

src/components/ReportActionAvatars/ReportActionAvatar.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function ReportActionAvatarSingle({
107107
fallbackIcon,
108108
isInReportAction,
109109
useProfileNavigationWrapper,
110-
fallbackUsername,
110+
fallbackDisplayName,
111111
}: {
112112
avatar: IconType | undefined;
113113
size: ValueOf<typeof CONST.AVATAR_SIZE>;
@@ -118,7 +118,7 @@ function ReportActionAvatarSingle({
118118
fallbackIcon?: AvatarSource;
119119
isInReportAction?: boolean;
120120
useProfileNavigationWrapper?: boolean;
121-
fallbackUsername?: string;
121+
fallbackDisplayName?: string;
122122
}) {
123123
const StyleUtils = useStyleUtils();
124124
const avatarContainerStyles = StyleUtils.getContainerStyles(size, isInReportAction);
@@ -130,7 +130,7 @@ function ReportActionAvatarSingle({
130130
icon={avatar}
131131
fallbackUserDetails={{
132132
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
133-
displayName: fallbackUsername || avatar?.name,
133+
displayName: fallbackDisplayName || avatar?.name,
134134
}}
135135
shouldRender={shouldShowTooltip}
136136
>
@@ -160,7 +160,7 @@ function ReportActionAvatarSubscript({
160160
noRightMarginOnContainer,
161161
subscriptAvatarBorderColor,
162162
subscriptCardFeed,
163-
fallbackUsername,
163+
fallbackDisplayName,
164164
useProfileNavigationWrapper,
165165
}: {
166166
primaryAvatar: IconType;
@@ -170,7 +170,7 @@ function ReportActionAvatarSubscript({
170170
noRightMarginOnContainer?: boolean;
171171
subscriptAvatarBorderColor?: ColorValue;
172172
subscriptCardFeed?: CompanyCardFeed | typeof CONST.EXPENSIFY_CARD.BANK;
173-
fallbackUsername?: string;
173+
fallbackDisplayName?: string;
174174
useProfileNavigationWrapper?: boolean;
175175
}) {
176176
const theme = useTheme();
@@ -210,7 +210,7 @@ function ReportActionAvatarSubscript({
210210
icon={primaryAvatar}
211211
fallbackUserDetails={{
212212
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
213-
displayName: fallbackUsername || primaryAvatar.name,
213+
displayName: fallbackDisplayName || primaryAvatar.name,
214214
}}
215215
>
216216
<View>
@@ -316,13 +316,13 @@ function ReportActionAvatarMultipleHorizontal({
316316
isInReportAction,
317317
sort: sortAvatars,
318318
useProfileNavigationWrapper,
319-
fallbackUsername,
319+
fallbackDisplayName,
320320
}: HorizontalStacking & {
321321
size: ValueOf<typeof CONST.AVATAR_SIZE>;
322322
shouldShowTooltip: boolean;
323323
icons: IconType[];
324324
isInReportAction: boolean;
325-
fallbackUsername?: string;
325+
fallbackDisplayName?: string;
326326
useProfileNavigationWrapper?: boolean;
327327
}) {
328328
const theme = useTheme();
@@ -384,7 +384,7 @@ function ReportActionAvatarMultipleHorizontal({
384384
icon={icon}
385385
fallbackUserDetails={{
386386
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
387-
displayName: fallbackUsername || icon.name,
387+
displayName: fallbackDisplayName || icon.name,
388388
}}
389389
shouldRender={shouldShowTooltip}
390390
>
@@ -460,7 +460,7 @@ function ReportActionAvatarMultipleDiagonal({
460460
secondaryAvatarContainerStyle,
461461
isHovered = false,
462462
useProfileNavigationWrapper,
463-
fallbackUsername,
463+
fallbackDisplayName,
464464
}: {
465465
size: ValueOf<typeof CONST.AVATAR_SIZE>;
466466
shouldShowTooltip: boolean;
@@ -470,7 +470,7 @@ function ReportActionAvatarMultipleDiagonal({
470470
secondaryAvatarContainerStyle?: StyleProp<ViewStyle>;
471471
isHovered?: boolean;
472472
useProfileNavigationWrapper?: boolean;
473-
fallbackUsername?: string;
473+
fallbackDisplayName?: string;
474474
}) {
475475
const theme = useTheme();
476476
const styles = useThemeStyles();
@@ -532,7 +532,7 @@ function ReportActionAvatarMultipleDiagonal({
532532
icon={icons.at(0)}
533533
fallbackUserDetails={{
534534
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
535-
displayName: fallbackUsername || icons.at(0)?.name,
535+
displayName: fallbackDisplayName || icons.at(0)?.name,
536536
}}
537537
shouldRender={shouldShowTooltip}
538538
>
@@ -564,7 +564,7 @@ function ReportActionAvatarMultipleDiagonal({
564564
icon={icons.at(1)}
565565
fallbackUserDetails={{
566566
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
567-
displayName: fallbackUsername || icons.at(1)?.name,
567+
displayName: fallbackDisplayName || icons.at(1)?.name,
568568
}}
569569
shouldRender={shouldShowTooltip}
570570
>

src/components/ReportActionAvatars/index.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ type ReportActionAvatarsProps = {
5555
/** Whether we want to be redirected to profile on avatars click */
5656
useProfileNavigationWrapper?: boolean;
5757

58-
/** Username used as a fallback for avatar tooltip */
59-
fallbackUsername?: string;
58+
/** Display name used as a fallback for avatar tooltip */
59+
fallbackDisplayName?: string;
6060
};
6161

6262
/**
@@ -84,7 +84,7 @@ function ReportActionAvatars({
8484
useMidSubscriptSizeForMultipleAvatars = false,
8585
isInReportAction = false,
8686
useProfileNavigationWrapper,
87-
fallbackUsername,
87+
fallbackDisplayName,
8888
}: ReportActionAvatarsProps) {
8989
const accountIDs = passedAccountIDs.filter((accountID) => accountID !== CONST.DEFAULT_NUMBER_ID);
9090

@@ -135,7 +135,7 @@ function ReportActionAvatars({
135135
subscriptAvatarBorderColor={subscriptAvatarBorderColor}
136136
subscriptCardFeed={subscriptCardFeed}
137137
useProfileNavigationWrapper={useProfileNavigationWrapper}
138-
fallbackUsername={fallbackUsername}
138+
fallbackDisplayName={fallbackDisplayName}
139139
/>
140140
);
141141
}
@@ -150,7 +150,7 @@ function ReportActionAvatars({
150150
isInReportAction={isInReportAction}
151151
shouldShowTooltip={shouldShowTooltip}
152152
useProfileNavigationWrapper={useProfileNavigationWrapper}
153-
fallbackUsername={fallbackUsername}
153+
fallbackDisplayName={fallbackDisplayName}
154154
/>
155155
);
156156
}
@@ -165,7 +165,7 @@ function ReportActionAvatars({
165165
useMidSubscriptSize={useMidSubscriptSizeForMultipleAvatars}
166166
secondaryAvatarContainerStyle={secondaryAvatarContainerStyle}
167167
isHovered={isHovered}
168-
fallbackUsername={fallbackUsername}
168+
fallbackDisplayName={fallbackDisplayName}
169169
useProfileNavigationWrapper={useProfileNavigationWrapper}
170170
/>
171171
);
@@ -180,7 +180,7 @@ function ReportActionAvatars({
180180
accountID={Number(delegateAccountID ?? primaryAvatar.id ?? CONST.DEFAULT_NUMBER_ID)}
181181
delegateAccountID={source.action?.delegateAccountID}
182182
fallbackIcon={primaryAvatar.fallbackIcon}
183-
fallbackUsername={fallbackUsername}
183+
fallbackDisplayName={fallbackDisplayName}
184184
useProfileNavigationWrapper={useProfileNavigationWrapper}
185185
/>
186186
);

src/components/SelectionList/UserListItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function UserListItem<TItem extends ListItem>({
112112
accountIDs={[Number(item.accountID)]}
113113
policyID={!item.reportID && !item.accountID ? item.policyID : undefined}
114114
singleAvatarContainerStyle={[styles.actionAvatar, styles.mr3]}
115-
fallbackUsername={item.text ?? item.alternateText ?? undefined}
115+
fallbackDisplayName={item.text ?? item.alternateText ?? undefined}
116116
/>
117117
)}
118118
<View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStretch, styles.optionRow]}>

0 commit comments

Comments
 (0)