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

[CP Staging] fix null coallescing logic #28706

Merged
merged 4 commits into from
Oct 3, 2023
Merged

[CP Staging] fix null coallescing logic #28706

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
619c4f4
fix null coallescing logic
namhihi237 Oct 3, 2023
8380efa
fix lint
namhihi237 Oct 3, 2023
3bc4af6
fix lint
namhihi237 Oct 3, 2023
665a9c2
change clearn condition
namhihi237 Oct 3, 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
4 changes: 2 additions & 2 deletions src/libs/TransactionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ function getCurrency(transaction: Transaction): string {
* Return the merchant field from the transaction, return the modifiedMerchant if present.
*/
function getMerchant(transaction: Transaction): string {
return transaction?.modifiedMerchant ?? transaction?.merchant ?? '';
return (transaction?.modifiedMerchant !== '' ? transaction?.modifiedMerchant : transaction?.merchant) ?? '';
namhihi237 marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down Expand Up @@ -255,7 +255,7 @@ function getTag(transaction: Transaction): string {
* Return the created field from the transaction, return the modifiedCreated if present.
*/
function getCreated(transaction: Transaction): string {
const created = transaction?.modifiedCreated ?? transaction?.created ?? '';
const created = (transaction?.modifiedCreated !== '' ? transaction?.modifiedCreated : transaction?.created) ?? '';
namhihi237 marked this conversation as resolved.
Show resolved Hide resolved
const createdDate = parseISO(created);
if (isValid(createdDate)) {
return format(createdDate, CONST.DATE.FNS_FORMAT_STRING);
Expand Down