Skip to content

Commit 8a7f071

Browse files
Merge pull request #47536 from gijoe0295/gijoe/46373
fix: receipt in dupe detect is removable
2 parents bb382ff + 459b12d commit 8a7f071

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

src/ROUTES.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ const ROUTES = {
985985

986986
TRANSACTION_RECEIPT: {
987987
route: 'r/:reportID/transaction/:transactionID/receipt',
988-
getRoute: (reportID: string, transactionID: string) => `r/${reportID}/transaction/${transactionID}/receipt` as const,
988+
getRoute: (reportID: string, transactionID: string, readonly = false) => `r/${reportID}/transaction/${transactionID}/receipt${readonly ? '?readonly=true' : ''}` as const,
989989
},
990990
TRANSACTION_DUPLICATE_REVIEW_PAGE: {
991991
route: 'r/:threadReportID/duplicates/review',

src/components/ReportActionItem/MoneyRequestView.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,7 @@ function MoneyRequestView({
493493
filename={receiptURIs?.filename}
494494
transaction={transaction}
495495
enablePreviewModal
496+
readonly={readonly}
496497
/>
497498
</View>
498499
)}

src/components/ReportActionItem/ReportActionItemImage.tsx

+7-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ type ReportActionItemImageProps = {
5252

5353
/** Whether the map view should have border radius */
5454
shouldMapHaveBorderRadius?: boolean;
55+
56+
/** Whether the receipt is not editable */
57+
readonly?: boolean;
5558
};
5659

5760
/**
@@ -70,6 +73,7 @@ function ReportActionItemImage({
7073
fileExtension,
7174
filename,
7275
isSingleImage = true,
76+
readonly = false,
7377
shouldMapHaveBorderRadius,
7478
}: ReportActionItemImageProps) {
7579
const styles = useThemeStyles();
@@ -130,7 +134,9 @@ function ReportActionItemImage({
130134
<PressableWithoutFocus
131135
style={[styles.w100, styles.h100, styles.noOutline as ViewStyle]}
132136
onPress={() =>
133-
Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(transactionThreadReport?.reportID ?? report?.reportID ?? '-1', transaction?.transactionID ?? '-1'))
137+
Navigation.navigate(
138+
ROUTES.TRANSACTION_RECEIPT.getRoute(transactionThreadReport?.reportID ?? report?.reportID ?? '-1', transaction?.transactionID ?? '-1', readonly),
139+
)
134140
}
135141
accessibilityLabel={translate('accessibilityHints.viewAttachment')}
136142
accessibilityRole={CONST.ROLE.BUTTON}

src/libs/Navigation/types.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1293,6 +1293,7 @@ type AuthScreensParamList = CentralPaneScreensParamList &
12931293
[SCREENS.TRANSACTION_RECEIPT]: {
12941294
reportID: string;
12951295
transactionID: string;
1296+
readonly?: boolean;
12961297
};
12971298
[SCREENS.CONNECTION_COMPLETE]: undefined;
12981299
};

src/pages/TransactionReceiptPage.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ function TransactionReceipt({transaction, report, reportMetadata = {isLoadingIni
3131
const imageSource = tryResolveUrlFromApiRoot(receiptURIs.image ?? '');
3232

3333
const isLocalFile = receiptURIs.isLocalFile;
34+
const readonly = route.params.readonly ?? false;
3435

3536
const parentReportAction = ReportActionUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
3637
const canEditReceipt = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.RECEIPT);
@@ -58,7 +59,7 @@ function TransactionReceipt({transaction, report, reportMetadata = {isLoadingIni
5859
isAuthTokenRequired={!isLocalFile}
5960
report={report}
6061
isReceiptAttachment
61-
canEditReceipt={canEditReceipt}
62+
canEditReceipt={canEditReceipt && !readonly}
6263
allowDownload={!isEReceipt}
6364
isTrackExpenseAction={isTrackExpenseAction}
6465
originalFileName={receiptURIs?.filename}

0 commit comments

Comments
 (0)