Skip to content

Commit c1c609f

Browse files
JakubKorytkoJakubKorytko
committed
Use better names for profile navigation wrapper prop
1 parent 617b218 commit c1c609f

3 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎src/components/ReportActionAvatars/ReportActionAvatar.tsx‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ type AvatarSizeToStyles = typeof CONST.AVATAR_SIZE.SMALL | typeof CONST.AVATAR_S
6565

6666
type AvatarSizeToStylesMap = Record<AvatarSizeToStyles, AvatarStyles>;
6767

68-
function ProfileAvatar(props: Parameters<typeof Avatar>[0] & {useOriginal?: boolean}) {
68+
function ProfileAvatar(props: Parameters<typeof Avatar>[0] & {useProfileNavigationWrapper?: boolean}) {
6969
const {translate} = useLocalize();
70-
const {avatarID, useOriginal, type} = props;
70+
const {avatarID, useProfileNavigationWrapper, type} = props;
7171

72-
if (useOriginal) {
72+
if (!useProfileNavigationWrapper) {
7373
return (
7474
/* eslint-disable-next-line react/jsx-props-no-spreading */
75-
<Avatar {...{...props, useOriginal: undefined}} />
75+
<Avatar {...{...props, useProfileNavigationWrapper: undefined}} />
7676
);
7777
}
7878

@@ -92,7 +92,7 @@ function ProfileAvatar(props: Parameters<typeof Avatar>[0] & {useOriginal?: bool
9292
accessibilityRole={CONST.ROLE.BUTTON}
9393
>
9494
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
95-
<Avatar {...{...props, useOriginal: undefined}} />
95+
<Avatar {...{...props, useProfileNavigationWrapper: undefined}} />
9696
</PressableWithoutFocus>
9797
);
9898
}
@@ -106,7 +106,7 @@ function ReportActionAvatarSingle({
106106
accountID,
107107
fallbackIcon,
108108
isInReportAction,
109-
useProfileAvatar,
109+
useProfileNavigationWrapper,
110110
}: {
111111
avatar: IconType | undefined;
112112
size: ValueOf<typeof CONST.AVATAR_SIZE>;
@@ -116,7 +116,7 @@ function ReportActionAvatarSingle({
116116
delegateAccountID?: number;
117117
fallbackIcon?: AvatarSource;
118118
isInReportAction?: boolean;
119-
useProfileAvatar?: boolean;
119+
useProfileNavigationWrapper?: boolean;
120120
}) {
121121
const StyleUtils = useStyleUtils();
122122
const avatarContainerStyles = StyleUtils.getContainerStyles(size, isInReportAction);
@@ -133,7 +133,7 @@ function ReportActionAvatarSingle({
133133
>
134134
<View>
135135
<ProfileAvatar
136-
useOriginal={!useProfileAvatar}
136+
useProfileNavigationWrapper={useProfileNavigationWrapper}
137137
containerStyles={containerStyles ?? avatarContainerStyles}
138138
source={avatar?.source}
139139
type={avatar?.type ?? CONST.ICON_TYPE_AVATAR}
@@ -157,7 +157,7 @@ function ReportActionAvatarSubscript({
157157
noRightMarginOnContainer,
158158
subscriptAvatarBorderColor,
159159
subscriptCardFeed,
160-
useProfileAvatars,
160+
useProfileNavigationWrapper,
161161
}: {
162162
primaryAvatar: IconType;
163163
secondaryAvatar: IconType;
@@ -166,7 +166,7 @@ function ReportActionAvatarSubscript({
166166
noRightMarginOnContainer?: boolean;
167167
subscriptAvatarBorderColor?: ColorValue;
168168
subscriptCardFeed?: CompanyCardFeed | typeof CONST.EXPENSIFY_CARD.BANK;
169-
useProfileAvatars?: boolean;
169+
useProfileNavigationWrapper?: boolean;
170170
}) {
171171
const theme = useTheme();
172172
const styles = useThemeStyles();
@@ -209,7 +209,7 @@ function ReportActionAvatarSubscript({
209209
>
210210
<View>
211211
<ProfileAvatar
212-
useOriginal={!useProfileAvatars}
212+
useProfileNavigationWrapper={useProfileNavigationWrapper}
213213
containerStyles={StyleUtils.getWidthAndHeightStyle(StyleUtils.getAvatarSize(size || CONST.AVATAR_SIZE.DEFAULT))}
214214
source={primaryAvatar.source}
215215
size={size}
@@ -234,7 +234,7 @@ function ReportActionAvatarSubscript({
234234
dataSet={{dragArea: false}}
235235
>
236236
<ProfileAvatar
237-
useOriginal={!useProfileAvatars}
237+
useProfileNavigationWrapper={useProfileNavigationWrapper}
238238
iconAdditionalStyles={[
239239
StyleUtils.getAvatarBorderWidth(isSmall ? CONST.AVATAR_SIZE.SMALL_SUBSCRIPT : subscriptAvatarSize),
240240
StyleUtils.getBorderColorStyle(subscriptAvatarBorderColor ?? theme.componentBG),
@@ -309,13 +309,13 @@ function ReportActionAvatarMultipleHorizontal({
309309
icons: unsortedIcons,
310310
isInReportAction,
311311
sort: sortAvatars,
312-
useProfileAvatars,
312+
useProfileNavigationWrapper,
313313
}: HorizontalStacking & {
314314
size: ValueOf<typeof CONST.AVATAR_SIZE>;
315315
shouldShowTooltip: boolean;
316316
icons: IconType[];
317317
isInReportAction: boolean;
318-
useProfileAvatars?: boolean;
318+
useProfileNavigationWrapper?: boolean;
319319
}) {
320320
const theme = useTheme();
321321
const styles = useThemeStyles();
@@ -381,7 +381,7 @@ function ReportActionAvatarMultipleHorizontal({
381381
>
382382
<View style={[StyleUtils.getHorizontalStackedAvatarStyle(index, overlapSize), StyleUtils.getAvatarBorderRadius(size, icon.type)]}>
383383
<ProfileAvatar
384-
useOriginal={!useProfileAvatars}
384+
useProfileNavigationWrapper={useProfileNavigationWrapper}
385385
iconAdditionalStyles={[
386386
StyleUtils.getHorizontalStackedAvatarBorderStyle({
387387
theme,
@@ -450,7 +450,7 @@ function ReportActionAvatarMultipleDiagonal({
450450
useMidSubscriptSize,
451451
secondaryAvatarContainerStyle,
452452
isHovered = false,
453-
useProfileAvatars,
453+
useProfileNavigationWrapper,
454454
}: {
455455
size: ValueOf<typeof CONST.AVATAR_SIZE>;
456456
shouldShowTooltip: boolean;
@@ -459,7 +459,7 @@ function ReportActionAvatarMultipleDiagonal({
459459
useMidSubscriptSize: boolean;
460460
secondaryAvatarContainerStyle?: StyleProp<ViewStyle>;
461461
isHovered?: boolean;
462-
useProfileAvatars?: boolean;
462+
useProfileNavigationWrapper?: boolean;
463463
}) {
464464
const theme = useTheme();
465465
const styles = useThemeStyles();
@@ -527,7 +527,7 @@ function ReportActionAvatarMultipleDiagonal({
527527
{/* View is necessary for tooltip to show for multiple avatars in LHN */}
528528
<View>
529529
<ProfileAvatar
530-
useOriginal={!useProfileAvatars}
530+
useProfileNavigationWrapper={useProfileNavigationWrapper}
531531
source={icons.at(0)?.source ?? WorkspaceBuilding}
532532
size={avatarSize}
533533
imageStyles={[singleAvatarStyle]}
@@ -557,7 +557,7 @@ function ReportActionAvatarMultipleDiagonal({
557557
>
558558
<View>
559559
<ProfileAvatar
560-
useOriginal={!useProfileAvatars}
560+
useProfileNavigationWrapper={useProfileNavigationWrapper}
561561
source={icons.at(1)?.source ?? WorkspaceBuilding}
562562
size={avatarSize}
563563
imageStyles={[singleAvatarStyle]}

‎src/components/ReportActionAvatars/index.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ type ReportActionAvatarsProps = {
5353
subscriptCardFeed?: CompanyCardFeed | typeof CONST.EXPENSIFY_CARD.BANK;
5454

5555
/** Whether we want to be redirected to profile on avatars click */
56-
useProfileAvatars?: boolean;
56+
useProfileNavigationWrapper?: boolean;
5757
};
5858

5959
/**
@@ -80,7 +80,7 @@ function ReportActionAvatars({
8080
secondaryAvatarContainerStyle,
8181
useMidSubscriptSizeForMultipleAvatars = false,
8282
isInReportAction = false,
83-
useProfileAvatars,
83+
useProfileNavigationWrapper,
8484
}: ReportActionAvatarsProps) {
8585
const accountIDs = passedAccountIDs.filter((accountID) => accountID !== CONST.DEFAULT_NUMBER_ID);
8686

@@ -130,7 +130,7 @@ function ReportActionAvatars({
130130
noRightMarginOnContainer={noRightMarginOnSubscriptContainer}
131131
subscriptAvatarBorderColor={subscriptAvatarBorderColor}
132132
subscriptCardFeed={subscriptCardFeed}
133-
useProfileAvatars={useProfileAvatars}
133+
useProfileNavigationWrapper={useProfileNavigationWrapper}
134134
/>
135135
);
136136
}
@@ -144,7 +144,7 @@ function ReportActionAvatars({
144144
icons={icons}
145145
isInReportAction={isInReportAction}
146146
shouldShowTooltip={shouldShowTooltip}
147-
useProfileAvatars={useProfileAvatars}
147+
useProfileNavigationWrapper={useProfileNavigationWrapper}
148148
/>
149149
);
150150
}
@@ -159,7 +159,7 @@ function ReportActionAvatars({
159159
useMidSubscriptSize={useMidSubscriptSizeForMultipleAvatars}
160160
secondaryAvatarContainerStyle={secondaryAvatarContainerStyle}
161161
isHovered={isHovered}
162-
useProfileAvatars={useProfileAvatars}
162+
useProfileNavigationWrapper={useProfileNavigationWrapper}
163163
/>
164164
);
165165
}
@@ -173,7 +173,7 @@ function ReportActionAvatars({
173173
accountID={Number(delegateAccountID ?? primaryAvatar.id ?? CONST.DEFAULT_NUMBER_ID)}
174174
delegateAccountID={source.action?.delegateAccountID}
175175
fallbackIcon={primaryAvatar.fallbackIcon}
176-
useProfileAvatar={useProfileAvatars}
176+
useProfileNavigationWrapper={useProfileNavigationWrapper}
177177
/>
178178
);
179179
}

‎src/pages/ReportDetailsPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail
576576
<ReportActionAvatars
577577
noRightMarginOnSubscriptContainer
578578
size={CONST.AVATAR_SIZE.X_LARGE}
579-
useProfileAvatars
579+
useProfileNavigationWrapper
580580
singleAvatarContainerStyle={[]}
581581
reportID={report?.reportID ?? moneyRequestReport?.reportID}
582582
/>

0 commit comments

Comments
 (0)