Skip to content

[No QA] Add details for distance requests in MoneyRequestView #24589

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

Merged
tgolen merged 9 commits into from
Aug 22, 2023
Merged

[No QA] Add details for distance requests in MoneyRequestView #24589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8f7ab26
add distance menu item
arosiclair Aug 15, 2023
5c64db9
get custom unit and mileage rate and use distance text stub
arosiclair Aug 15, 2023
8de53ea
add isDistanceRequest stub
arosiclair Aug 15, 2023
acdf45d
use transaction merchant instead of recomputing the distance text
arosiclair Aug 15, 2023
19f12dd
Merge branch 'andrewli-displayreceipts' of github.com:Expensify/App i…
arosiclair Aug 18, 2023
28ebdc4
Merge branch 'main' of github.com:Expensify/App into arosiclair-dista…
arosiclair Aug 22, 2023
35d08c4
use existing merchant menu item for distance
arosiclair Aug 22, 2023
6c8815b
add isDistanceRequest implementation
arosiclair Aug 22, 2023
afd3240
remove disabled for merchant/distance item
arosiclair Aug 22, 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
5 changes: 5 additions & 0 deletions src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,11 @@ const CONST = {
DARK: 'dark',
SYSTEM: 'system',
},
TRANSACTION: {
TYPE: {
CUSTOM_UNIT: 'customUnit',
},
},
JSON_CODE: {
SUCCESS: 200,
BAD_REQUEST: 400,
Expand Down
5 changes: 3 additions & 2 deletions src/components/ReportActionItem/MoneyRequestView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction.receipt.source, transaction.filename);
}

const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);

return (
<View>
<View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth), StyleUtils.getMinimumHeight(CONST.EMPTY_STATE_BACKGROUND.MONEY_REPORT.MIN_HEIGHT)]}>
Expand Down Expand Up @@ -162,10 +164,9 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
</OfflineWithFeedback>
<OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.merchant') || lodashGet(transaction, 'pendingAction')}>
<MenuItemWithTopDescription
description={translate('common.merchant')}
description={isDistanceRequest ? translate('tabSelector.distance') : translate('common.merchant')}

@parasharrajat parasharrajat Aug 22, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest that we move tabSelector.distance key to under common in translations because it is just a word and might be used in multiple places.

@arosiclair arosiclair Aug 22, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually that would break this code so we should probably not move it. We could add another entry under common but duplicating it doesn't feel right.

@tgolen tgolen Aug 22, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arosiclair Can you please create a follow-up issue to clean this up?

@arosiclair arosiclair Aug 22, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done: #25722

title={transactionMerchant}
shouldShowRightIcon={false}
disabled
/>
</OfflineWithFeedback>
{shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}
Expand Down
14 changes: 14 additions & 0 deletions src/libs/TransactionUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,19 @@ function isReceiptBeingScanned(transaction) {
return transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANREADY || transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANNING;
}

/**
* @param {Object} transaction
* @param {String} transaction.type
* @param {Object} [transaction.customUnit]
* @param {String} [transaction.customUnit.name]
* @returns {Boolean}
*/
function isDistanceRequest(transaction) {
const type = lodashGet(transaction, 'comment.type');
const customUnitName = lodashGet(transaction, 'comment.customUnit.name');
return type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && customUnitName === CONST.CUSTOM_UNITS.NAME_DISTANCE;
}

export {
buildOptimisticTransaction,
getUpdatedTransaction,
Expand All @@ -256,4 +269,5 @@ export {
getAllReportTransactions,
hasReceipt,
isReceiptBeingScanned,
isDistanceRequest,
};