Skip to content

Commit a7182c3

Browse files
JS00001OSBotify
authored andcommitted
Merge pull request #92061 from dukenv0307/fix/92026
Tag shows empty state, Tax rate does not show all rates when creating expense from FAB (cherry picked from commit ed5d6ff) (cherry-picked to staging by mountiny)
1 parent 7b19b75 commit a7182c3

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

src/pages/iou/request/step/IOURequestStepTag.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import usePolicyForTransaction from '@hooks/usePolicyForTransaction';
1616
import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
1717
import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
1818
import useThemeStyles from '@hooks/useThemeStyles';
19-
import {setMoneyRequestTag} from '@libs/actions/IOU/MoneyRequest';
19+
import {getIOURequestPolicyID, setMoneyRequestTag} from '@libs/actions/IOU/MoneyRequest';
2020
import {setDraftSplitTransaction} from '@libs/actions/IOU/Split';
2121
import {updateMoneyRequestTag} from '@libs/actions/IOU/UpdateMoneyRequest';
2222
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
@@ -51,9 +51,11 @@ function IOURequestStepTag({
5151
const isSplitBill = iouType === CONST.IOU.TYPE.SPLIT;
5252
const isSplitExpense = iouType === CONST.IOU.TYPE.SPLIT_EXPENSE;
5353
const isEditingSplit = (isSplitBill || isSplitExpense) && isEditing;
54+
55+
const [participantReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(transaction?.participants?.at(0)?.reportID)}`);
5456
const {policy: policyFromTransaction} = usePolicyForTransaction({
5557
transaction,
56-
reportPolicyID: report?.policyID,
58+
reportPolicyID: getIOURequestPolicyID(transaction, report?.policyID ? report : participantReport),
5759
action,
5860
iouType,
5961
isPerDiemRequest: isPerDiemRequest(transaction),

src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {isMovingTransactionFromTrackExpense} from '@libs/IOUUtils';
1616
import Navigation from '@libs/Navigation/Navigation';
1717
import type {TaxRatesOption} from '@libs/TaxOptionsListUtils';
1818
import {calculateTaxAmount, getAmount, getCurrency, getTaxRateTitle, getTaxValue} from '@libs/TransactionUtils';
19-
import {setMoneyRequestTaxRateValues} from '@userActions/IOU/MoneyRequest';
19+
import {getIOURequestPolicyID, setMoneyRequestTaxRateValues} from '@userActions/IOU/MoneyRequest';
2020
import {setDraftSplitTransaction} from '@userActions/IOU/Split';
2121
import {updateMoneyRequestTaxRate} from '@userActions/IOU/UpdateMoneyRequest';
2222
import CONST from '@src/CONST';
@@ -49,7 +49,9 @@ function IOURequestStepTaxRatePage({
4949
}: IOURequestStepTaxRatePageProps) {
5050
const {translate} = useLocalize();
5151
const {getCurrencyDecimals} = useCurrencyListActions();
52-
const {policy} = usePolicyForTransaction({transaction, reportPolicyID: report?.policyID, action, iouType});
52+
53+
const [participantReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(transaction?.participants?.at(0)?.reportID)}`);
54+
const {policy} = usePolicyForTransaction({transaction, reportPolicyID: getIOURequestPolicyID(transaction, report?.policyID ? report : participantReport), action, iouType});
5355

5456
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policy?.id}`);
5557
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`);

0 commit comments

Comments
 (0)