Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/AvatarWithDisplayName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ function AvatarWithDisplayName({
)}
</View>

<View style={[styles.flex1, styles.flexColumn, styles.mnw0]}>
<View style={[styles.flex1, styles.flexColumn]}>
{getCustomDisplayName(
shouldUseCustomSearchTitleName,
report,
Expand Down
5 changes: 2 additions & 3 deletions src/components/ParentNavigationSubtitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,11 @@ function ParentNavigationSubtitle({
};

return (
<View style={[styles.flexRow, styles.alignItemsCenter, styles.flexShrink1, styles.mnw0]}>
<View style={[styles.flexRow, styles.alignItemsCenter]}>
{!!statusText && (
<View
style={[
styles.reportStatusContainer,
styles.flexShrink0,
styles.mr1,
{
backgroundColor: statusTextBackgroundColor,
Expand All @@ -142,7 +141,7 @@ function ParentNavigationSubtitle({
</View>
)}
<Text
style={[styles.optionAlternateText, styles.textLabelSupporting, styles.flexShrink1, styles.mnw0, textStyles]}
style={[styles.optionAlternateText, styles.textLabelSupporting, styles.flex1, textStyles]}
numberOfLines={1}
>
{!!reportName && (
Expand Down
28 changes: 12 additions & 16 deletions src/pages/ReportDetailsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -718,14 +718,12 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail
</>
)}
{!isEmptyObject(parentNavigationSubtitleData) && (isMoneyRequestReport || isInvoiceReport || isMoneyRequest || isTaskReport) && (
<View style={[styles.w100, styles.mt1]}>
<ParentNavigationSubtitle
parentNavigationSubtitleData={parentNavigationSubtitleData}
parentReportID={report?.parentReportID}
parentReportActionID={report?.parentReportActionID}
pressableStyles={[styles.mw100]}
/>
</View>
<ParentNavigationSubtitle
parentNavigationSubtitleData={parentNavigationSubtitleData}
parentReportID={report?.parentReportID}
parentReportActionID={report?.parentReportActionID}
pressableStyles={[styles.mt1, styles.mw100]}
/>
)}
</View>
);
Expand Down Expand Up @@ -767,14 +765,12 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail
const shouldShowTitleField = caseID !== CASES.MONEY_REQUEST && !isFieldDisabled && isAdminOwnerApproverOrReportOwner(report, policy);

const nameSectionFurtherDetailsContent = (
<View style={[styles.w100, styles.mt1]}>
<ParentNavigationSubtitle
parentNavigationSubtitleData={parentNavigationSubtitleData}
parentReportID={report?.parentReportID}
parentReportActionID={report?.parentReportActionID}
pressableStyles={[styles.mw100]}
/>
</View>
<ParentNavigationSubtitle
parentNavigationSubtitleData={parentNavigationSubtitleData}
parentReportID={report?.parentReportID}
parentReportActionID={report?.parentReportActionID}
pressableStyles={[styles.mt1, styles.mw100]}
/>
);

const nameSectionTitleField = !!titleField && (
Expand Down