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
2 changes: 2 additions & 0 deletions src/libs/actions/IOU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3956,6 +3956,7 @@ function getUpdateMoneyRequestParams(
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
value: {
...transaction,
pendingFields: clearedPendingFields,
isLoading: false,
errorFields,
Expand Down Expand Up @@ -4191,6 +4192,7 @@ function getUpdateTrackExpenseParams(
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
value: {
...transaction,
pendingFields: clearedPendingFields,
isLoading: false,
errorFields,
Expand Down
118 changes: 118 additions & 0 deletions tests/actions/IOUTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5092,4 +5092,122 @@ describe('actions/IOU', () => {
expect(calculateDiffAmount(fakeReport, updatedTransaction, fakeTransaction)).toBeNull();
});
});

describe('updateMoneyRequestAmountAndCurrency', () => {
it('update the amount of the money request successfully', async () => {
const fakeReport: Report = {
...createRandomReport(1),
type: CONST.REPORT.TYPE.EXPENSE,
policyID: '1',
stateNum: CONST.REPORT.STATE_NUM.APPROVED,
statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
managerID: RORY_ACCOUNT_ID,
};
const fakeTransaction: Transaction = {
...createRandomTransaction(1),
reportID: fakeReport.reportID,
amount: 100,
currency: 'USD',
};

await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${fakeTransaction.transactionID}`, fakeTransaction);

mockFetch?.pause?.();

updateMoneyRequestAmountAndCurrency({
transactionID: fakeTransaction.transactionID,
transactionThreadReportID: fakeReport.reportID,
amount: 20000,
currency: CONST.CURRENCY.USD,
taxAmount: 0,
taxCode: '',
policy: {
id: '123',
role: 'user',
type: CONST.POLICY.TYPE.TEAM,
name: '',
owner: '',
outputCurrency: '',
isPolicyExpenseChatEnabled: false,
},
policyTagList: {},
policyCategories: {},
});

await waitForBatchedUpdates();
mockFetch?.succeed?.();
await mockFetch?.resume?.();

const updatedTransaction = await new Promise<OnyxEntry<Transaction>>((resolve) => {
const connection = Onyx.connect({
key: ONYXKEYS.COLLECTION.TRANSACTION,
waitForCollectionCallback: true,
callback: (transactions) => {
Onyx.disconnect(connection);
const newTransaction = transactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${fakeTransaction.transactionID}`];
resolve(newTransaction);
},
});
});
expect(updatedTransaction?.modifiedAmount).toBe(20000);
});

it('update the amount of the money request failed', async () => {
const fakeReport: Report = {
...createRandomReport(1),
type: CONST.REPORT.TYPE.EXPENSE,
policyID: '1',
stateNum: CONST.REPORT.STATE_NUM.APPROVED,
statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
managerID: RORY_ACCOUNT_ID,
};
const fakeTransaction: Transaction = {
...createRandomTransaction(1),
reportID: fakeReport.reportID,
amount: 100,
currency: 'USD',
};

await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${fakeTransaction.transactionID}`, fakeTransaction);

mockFetch?.pause?.();

updateMoneyRequestAmountAndCurrency({
transactionID: fakeTransaction.transactionID,
transactionThreadReportID: fakeReport.reportID,
amount: 20000,
currency: CONST.CURRENCY.USD,
taxAmount: 0,
taxCode: '',
policy: {
id: '123',
role: 'user',
type: CONST.POLICY.TYPE.TEAM,
name: '',
owner: '',
outputCurrency: '',
isPolicyExpenseChatEnabled: false,
},
policyTagList: {},
policyCategories: {},
});

await waitForBatchedUpdates();
mockFetch?.fail?.();
await mockFetch?.resume?.();

const updatedTransaction = await new Promise<OnyxEntry<Transaction>>((resolve) => {
const connection = Onyx.connect({
key: ONYXKEYS.COLLECTION.TRANSACTION,
waitForCollectionCallback: true,
callback: (transactions) => {
Onyx.disconnect(connection);
const newTransaction = transactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${fakeTransaction.transactionID}`];
resolve(newTransaction);
},
});
});
expect(updatedTransaction?.modifiedAmount).toBe(0);
});
});
});
1 change: 1 addition & 0 deletions tests/utils/collections/transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@ export default function createRandomTransaction(index: number): Transaction {
receipt: {},
reimbursable: randBoolean(),
hasEReceipt: randBoolean(),
modifiedAmount: 0,
};
}