Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reintroduce receipt recovery skipping distance requests #32562

Merged
merged 8 commits into from
Jan 3, 2024
Merged

Reintroduce receipt recovery skipping distance requests #32562

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e30ceb
Reintroduce receipt recovery skipping distance requests
Gonals Dec 6, 2023
3ed998a
ensure we use the right filename
Gonals Dec 6, 2023
d654bdf
text style
Gonals Dec 6, 2023
c3885d7
Merge branch 'main' into alberto-fixReceiptError
Gonals Dec 15, 2023
40e937f
typescript
Gonals Dec 15, 2023
8c9139a
use isScanRequest
Gonals Dec 20, 2023
f94c41f
imports
Gonals Dec 20, 2023
d9007f3
Merge branch 'main' into alberto-fixReceiptError
Gonals Dec 27, 2023
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
6 changes: 3 additions & 3 deletions src/components/DotIndicatorMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles}: DotIndica
key={i}
style={styles.offlineFeedback.text}
>
<Text style={[styles.optionAlternateText, styles.textLabelSupporting]}>{Localize.translateLocal('iou.error.receiptFailureMessage')}</Text>
<Text style={[styles.optionAlternateText, styles.textLabelSupporting, styles.link]}>{Localize.translateLocal('iou.error.saveFileMessage')}</Text>
<Text style={[styles.optionAlternateText, styles.textLabelSupporting]}>{Localize.translateLocal('iou.error.loseFileMessage')}</Text>
<Text style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage)]}>{Localize.translateLocal('iou.error.receiptFailureMessage')}</Text>
<Text style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage), styles.link]}>{Localize.translateLocal('iou.error.saveFileMessage')}</Text>
<Text style={[StyleUtils.getDotIndicatorTextStyles(isErrorMessage)]}>{Localize.translateLocal('iou.error.loseFileMessage')}</Text>
</Text>
</PressableWithoutFeedback>
) : (
Expand Down
27 changes: 21 additions & 6 deletions src/libs/actions/IOU.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,20 @@ function resetMoneyRequestInfo(id = '') {
});
}

/**
* Helper function to get the receipt error for money requests, or the generic error if there's no receipt
*
* @param {Object} receipt
* @param {String} filename
* @param {Boolean} [isDistance]
* @returns {Object}
*/
function getReceiptError(receipt, filename, isDistance = false) {
return _.isEmpty(receipt) || isDistance
? ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage')
: ErrorUtils.getMicroSecondOnyxErrorObject({error: CONST.IOU.RECEIPT_ERROR, source: receipt.source, filename});
}

function buildOnyxDataForMoneyRequest(
chatReport,
iouReport,
Expand All @@ -294,6 +308,7 @@ function buildOnyxDataForMoneyRequest(
isNewChatReport,
isNewIOUReport,
) {
const isDistance = TransactionUtils.isDistanceRequest(transaction);
Gonals marked this conversation as resolved.
Show resolved Hide resolved
const optimisticData = [
{
// Use SET for new reports because it doesn't exist yet, is faster and we need the data to be available when we navigate to the chat page
Expand Down Expand Up @@ -497,7 +512,7 @@ function buildOnyxDataForMoneyRequest(
...(isNewChatReport
? {
[chatCreatedAction.reportActionID]: {
errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
errors: getReceiptError(transaction.receipt, transaction.filename || transaction.receipt.filename, isDistance),
},
[reportPreviewAction.reportActionID]: {
errors: ErrorUtils.getMicroSecondOnyxError(null),
Expand All @@ -506,7 +521,7 @@ function buildOnyxDataForMoneyRequest(
: {
[reportPreviewAction.reportActionID]: {
created: reportPreviewAction.created,
errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
errors: getReceiptError(transaction.receipt, transaction.filename || transaction.receipt.filename, isDistance),
},
}),
},
Expand All @@ -518,15 +533,15 @@ function buildOnyxDataForMoneyRequest(
...(isNewIOUReport
? {
[iouCreatedAction.reportActionID]: {
errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
errors: getReceiptError(transaction.receipt, transaction.filename || transaction.receipt.filename, isDistance),
},
[iouAction.reportActionID]: {
errors: ErrorUtils.getMicroSecondOnyxError(null),
},
}
: {
[iouAction.reportActionID]: {
errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
errors: getReceiptError(transaction.receipt, transaction.filename || transaction.receipt.filename, isDistance),
},
}),
},
Expand Down Expand Up @@ -1676,7 +1691,7 @@ function startSplitBill(participants, currentUserLogin, currentUserAccountID, co
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${splitChatReport.reportID}`,
value: {
[splitIOUReportAction.reportActionID]: {
errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
errors: getReceiptError(receipt, filename),
},
},
});
Expand All @@ -1699,7 +1714,7 @@ function startSplitBill(participants, currentUserLogin, currentUserAccountID, co
errors: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
},
[splitIOUReportAction.reportActionID]: {
errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
errors: getReceiptError(receipt, filename),
},
},
},
Expand Down
Loading