Skip to content

Commit 1cdaee5

Browse files
authored
Merge pull request Expensify#65290 from nyomanjyotisa/issue-64290
2 parents 3401ab2 + c9b2df7 commit 1cdaee5

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

src/components/ReportActionItem/MoneyRequestView.tsx

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -808,28 +808,6 @@ function MoneyRequestView({report, shouldShowAnimatedBackground, readonly = fals
808808
/>
809809
</OfflineWithFeedback>
810810
)}
811-
{!!parentReportID && (
812-
<OfflineWithFeedback pendingAction={getPendingFieldAction('reportID')}>
813-
<MenuItemWithTopDescription
814-
shouldShowRightIcon={canEditReport}
815-
title={getReportName(parentReport) || parentReport?.reportName}
816-
description={translate('common.report')}
817-
style={[styles.moneyRequestMenuItem]}
818-
titleStyle={styles.flex1}
819-
onPress={() => {
820-
if (!canEditReport || !report?.reportID || !transaction?.transactionID) {
821-
return;
822-
}
823-
Navigation.navigate(
824-
ROUTES.MONEY_REQUEST_STEP_REPORT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID, report.reportID, getReportRHPActiveRoute()),
825-
);
826-
}}
827-
interactive={canEditReport}
828-
shouldRenderAsHTML
829-
/>
830-
</OfflineWithFeedback>
831-
)}
832-
{/* Note: "Billable" toggle and "View trip details" should be always the last two items */}
833811
{shouldShowBillable && (
834812
<View style={[styles.flexRow, styles.optionRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8]}>
835813
<View>
@@ -852,6 +830,28 @@ function MoneyRequestView({report, shouldShowAnimatedBackground, readonly = fals
852830
/>
853831
</View>
854832
)}
833+
{!!parentReportID && (
834+
<OfflineWithFeedback pendingAction={getPendingFieldAction('reportID')}>
835+
<MenuItemWithTopDescription
836+
shouldShowRightIcon={canEditReport}
837+
title={getReportName(parentReport) || parentReport?.reportName}
838+
description={translate('common.report')}
839+
style={[styles.moneyRequestMenuItem]}
840+
titleStyle={styles.flex1}
841+
onPress={() => {
842+
if (!canEditReport || !report?.reportID || !transaction?.transactionID) {
843+
return;
844+
}
845+
Navigation.navigate(
846+
ROUTES.MONEY_REQUEST_STEP_REPORT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID, report.reportID, getReportRHPActiveRoute()),
847+
);
848+
}}
849+
interactive={canEditReport}
850+
shouldRenderAsHTML
851+
/>
852+
</OfflineWithFeedback>
853+
)}
854+
{/* Note: "View trip details" should be always the last item */}
855855
{shouldShowViewTripDetails && (
856856
<MenuItem
857857
title={translate('travel.viewTripDetails')}

0 commit comments

Comments
 (0)