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
4 changes: 2 additions & 2 deletions src/components/MoneyRequestConfirmationListFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ function MoneyRequestConfirmationListFooter({
// Determine if the merchant error should be displayed
const shouldDisplayMerchantError = isMerchantRequired && (shouldDisplayFieldError || formError === 'iou.error.invalidMerchant') && isMerchantEmpty;
const shouldDisplayDistanceRateError = formError === 'iou.error.invalidRate';
const showReceiptEmptyState = shouldShowReceiptEmptyState(iouType, action, policy, isPerDiemRequest);
const showReceiptEmptyState = shouldShowReceiptEmptyState(iouType, action, policy, isPerDiemRequest, isManualDistanceRequest);
// The per diem custom unit
const perDiemCustomUnit = getPerDiemCustomUnit(policy);
const {
Expand Down Expand Up @@ -976,7 +976,7 @@ function MoneyRequestConfirmationListFooter({
<View style={styles.dividerLine} />
</>
)}
{(!shouldShowMap || isManualDistanceRequest) && (
{!shouldShowMap && (
<View style={!hasReceiptImageOrThumbnail && !showReceiptEmptyState ? undefined : styles.mv3}>
{hasReceiptImageOrThumbnail
? receiptThumbnailContent
Expand Down
3 changes: 0 additions & 3 deletions src/libs/API/parameters/CreateDistanceRequestParams.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import type {Receipt} from '@src/types/onyx/Transaction';

type CreateDistanceRequestParams = {
transactionID: string;
chatReportID: string;
Expand All @@ -13,7 +11,6 @@ type CreateDistanceRequestParams = {
createdIOUReportActionID?: string;
reportPreviewReportActionID?: string;
category?: string;
receipt?: Receipt;
tag?: string;
taxCode?: string;
taxAmount?: number;
Expand Down
6 changes: 4 additions & 2 deletions src/libs/IOUUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,17 @@ function isMovingTransactionFromTrackExpense(action?: IOUAction) {
return false;
}

function shouldShowReceiptEmptyState(iouType: IOUType, action: IOUAction, policy: OnyxInputOrEntry<Policy> | SearchPolicy, isPerDiemRequest: boolean) {
function shouldShowReceiptEmptyState(iouType: IOUType, action: IOUAction, policy: OnyxInputOrEntry<Policy> | SearchPolicy, isPerDiemRequest: boolean, isManualDistanceRequest: boolean) {
// Determine when to show the receipt empty state:
// - Show for pay, submit or track expense types
// - Hide for per diem requests
// - Hide when submitting a track expense to a non-paid group policy (personal users)
// - Hide for manual distance requests because attaching a receipt before creating the expense will trigger Smartscan but distance request amount depends on the distance traveled and mileage rate
return (
(iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK || iouType === CONST.IOU.TYPE.PAY) &&
!isPerDiemRequest &&
(!isMovingTransactionFromTrackExpense(action) || isPaidGroupPolicy(policy))
(!isMovingTransactionFromTrackExpense(action) || isPaidGroupPolicy(policy)) &&
!isManualDistanceRequest
);
}

Expand Down
5 changes: 1 addition & 4 deletions src/libs/actions/IOU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,6 @@ type DistanceRequestTransactionParams = BaseTransactionParams & {
validWaypoints?: WaypointCollection;
splitShares?: SplitShares;
distance?: number;
receipt?: Receipt;
};

type CreateDistanceRequestInformation = {
Expand Down Expand Up @@ -7930,7 +7929,6 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
customUnitRateID = '',
splitShares = {},
attendees,
receipt,
} = transactionParams;

// If the report is an iou or expense report, we should get the linked chat report to be passed to the getMoneyRequestInformation function
Expand Down Expand Up @@ -8034,7 +8032,7 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
comment,
created,
merchant,
receipt: receipt ?? optimisticReceipt,
receipt: !isManualDistanceRequest ? optimisticReceipt : undefined,
category,
tag,
taxCode,
Expand Down Expand Up @@ -8066,7 +8064,6 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
reportPreviewReportActionID: reportPreviewAction.reportActionID,
waypoints: JSON.stringify(sanitizedWaypoints),
distance,
receipt,
created,
category,
tag,
Expand Down
4 changes: 1 addition & 3 deletions src/pages/iou/request/step/IOURequestStepConfirmation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,6 @@ function IOURequestStepConfirmation({
billable: transaction.billable,
reimbursable: transaction.reimbursable,
attendees: transaction.comment?.attendees,
receipt: isManualDistanceRequest ? receiptFiles[transaction.transactionID] : undefined,
},
backToReport,
});
Expand All @@ -750,7 +749,6 @@ function IOURequestStepConfirmation({
transactionTaxCode,
transactionTaxAmount,
customUnitRateID,
receiptFiles,
backToReport,
],
);
Expand Down Expand Up @@ -1158,7 +1156,7 @@ function IOURequestStepConfirmation({
showPreviousTransaction();
};

const showReceiptEmptyState = shouldShowReceiptEmptyState(iouType, action, policy, isPerDiemRequest);
const showReceiptEmptyState = shouldShowReceiptEmptyState(iouType, action, policy, isPerDiemRequest, isManualDistanceRequest);

const shouldShowSmartScanFields =
!!transaction?.receipt?.isTestDriveReceipt || (isMovingTransactionFromTrackExpense ? transaction?.amount !== 0 : requestType !== CONST.IOU.REQUEST_TYPE.SCAN);
Expand Down