Skip to content

Commit 2ce56b2

Browse files
cristipavalOSBotify
authored andcommitted
Merge pull request #82281 from callstack-internal/fix/82267-per-diem-navigation-issues
[CP Staging] Fix per diem navigation issues (cherry picked from commit fc97cfc) (cherry-picked to staging by lakchote)
1 parent 75e90d3 commit 2ce56b2

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
2020
import {fetchPerDiemRates} from '@libs/actions/Policy/PerDiem';
2121
import {setTransactionReport} from '@libs/actions/Transaction';
2222
import Navigation from '@libs/Navigation/Navigation';
23-
import {getPerDiemCustomUnit, isPolicyAdmin} from '@libs/PolicyUtils';
23+
import {getPerDiemCustomUnit, getPolicyByCustomUnitID, isPolicyAdmin} from '@libs/PolicyUtils';
2424
import {findSelfDMReportID, getPolicyExpenseChat} from '@libs/ReportUtils';
2525
import {shouldRestrictUserBillableActions} from '@libs/SubscriptionUtils';
2626
import variables from '@styles/variables';
@@ -67,7 +67,12 @@ function IOURequestStepDestination({
6767
explicitPolicyID,
6868
ref,
6969
}: IOURequestStepDestinationProps) {
70-
const [policy, policyMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${explicitPolicyID ?? getIOURequestPolicyID(transaction, report)}`, {canBeMissing: false});
70+
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true});
71+
const reportPolicyID = getIOURequestPolicyID(transaction, report);
72+
const policyID = reportPolicyID === CONST.POLICY.ID_FAKE ? getPolicyByCustomUnitID(transaction, allPolicies)?.id : reportPolicyID;
73+
const [policy, policyMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${explicitPolicyID ?? policyID}`, {
74+
canBeMissing: false,
75+
});
7176
const {accountID} = useCurrentUserPersonalDetails();
7277
const policyExpenseReport = policy?.id ? getPolicyExpenseChat(accountID, policy.id) : undefined;
7378
const {top} = useSafeAreaInsets();

0 commit comments

Comments
 (0)