Skip to content

Commit c35bdc8

Browse files
committed
Fix Pay Reports page & welcome text styles
1 parent f603a03 commit c35bdc8

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

src/components/ReportActionAvatars/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ function ReportActionAvatars({
172172
<ReportActionAvatar.Single
173173
avatar={primaryAvatar}
174174
size={size}
175-
containerStyles={singleAvatarContainerStyle}
175+
containerStyles={shouldStackHorizontally ? [] : singleAvatarContainerStyle}
176176
shouldShowTooltip={shouldShowTooltip}
177177
accountID={Number(delegateAccountID ?? primaryAvatar.id ?? CONST.DEFAULT_NUMBER_ID)}
178178
delegateAccountID={action?.delegateAccountID}

src/libs/ReportUtils.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3399,6 +3399,7 @@ function getReportActionAvatars({
33993399
const isWorkspaceChatWithoutChatReport = !chatReport && isAWorkspaceChat;
34003400
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
34013401
const usePersonalDetailsAvatars = (isChatReportOnlyProp || isWorkspaceChatWithoutChatReport) && isReportPreviewOrNoAction && !isATripPreview;
3402+
const useNearestReportAvatars = (!accountID || !action) && accountIDs.length === 0;
34023403

34033404
const getIconsWithDefaults = (report: OnyxInputOrEntry<Report>) =>
34043405
getIcons(report, personalDetails, avatar ?? fallbackIcon ?? FallbackAvatar, defaultDisplayName, accountID, policy, invoiceReceiverPolicy);
@@ -3407,7 +3408,9 @@ function getReportActionAvatars({
34073408

34083409
let primaryAvatar;
34093410

3410-
if (isWorkspaceActor || usePersonalDetailsAvatars) {
3411+
if (useNearestReportAvatars) {
3412+
primaryAvatar = getIconsWithDefaults(iouReport ?? chatReport).at(0);
3413+
} else if (isWorkspaceActor || usePersonalDetailsAvatars) {
34113414
primaryAvatar = reportIcons.at(0);
34123415
} else if (delegatePersonalDetails) {
34133416
primaryAvatar = getIconsWithDefaults(iouReport).at(0);
@@ -3426,7 +3429,9 @@ function getReportActionAvatars({
34263429

34273430
let secondaryAvatar;
34283431

3429-
if (usePersonalDetailsAvatars) {
3432+
if (useNearestReportAvatars) {
3433+
secondaryAvatar = getIconsWithDefaults(iouReport ?? chatReport).at(1);
3434+
} else if (usePersonalDetailsAvatars) {
34303435
secondaryAvatar = reportIcons.at(1);
34313436
} else if (isATripPreview) {
34323437
secondaryAvatar = reportIcons.at(0);

src/pages/home/report/ReportActionItemSingle.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ function ReportActionItemSingle({
124124
});
125125

126126
const {login, pendingFields, status} = personalDetails?.[accountID] ?? {};
127-
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
128127

129128
const accountOwnerDetails = getPersonalDetailByEmail(login ?? '');
130129

0 commit comments

Comments
 (0)