Skip to content
Merged
5 changes: 3 additions & 2 deletions src/libs/actions/IOU/MoneyRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import CONST from '@src/CONST';
import type {TranslationParameters, TranslationPaths} from '@src/languages/types';
import type {Route} from '@src/ROUTES';
import ROUTES from '@src/ROUTES';
import type {Beta, IntroSelected, LastSelectedDistanceRates, PersonalDetailsList, Policy, QuickAction, Report, Transaction, TransactionViolation} from '@src/types/onyx';
import type {Beta, IntroSelected, LastSelectedDistanceRates, PersonalDetailsList, Policy, QuickAction, RecentWaypoint, Report, Transaction, TransactionViolation} from '@src/types/onyx';
import type {ReportAttributes, ReportAttributesDerivedValue} from '@src/types/onyx/DerivedValues';
import type {Participant} from '@src/types/onyx/IOU';
import type {Unit} from '@src/types/onyx/Policy';
Expand Down Expand Up @@ -146,6 +146,7 @@ type MoneyRequestStepDistanceNavigationParams = {
odometerEnd?: number;
odometerDistance?: number;
betas: OnyxEntry<Beta[]>;
recentWaypoints: OnyxEntry<RecentWaypoint[]>;
unit?: Unit;
personalOutputCurrency?: string;
};
Expand Down Expand Up @@ -534,13 +535,13 @@ function handleMoneyRequestStepDistanceNavigation({
odometerEnd,
odometerDistance,
betas,
recentWaypoints,
unit,
personalOutputCurrency,
}: MoneyRequestStepDistanceNavigationParams) {
const isManualDistance = manualDistance !== undefined;
const isOdometerDistance = odometerDistance !== undefined;
const isGPSDistance = gpsDistance !== undefined && gpsCoordinates !== undefined;
const recentWaypoints = getRecentWaypoints();

if (transaction?.splitShares && !isManualDistance && !isOdometerDistance) {
resetSplitShares(transaction);
Expand Down
2 changes: 2 additions & 0 deletions src/pages/iou/request/step/IOURequestStepDistance.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ function IOURequestStepDistance({
selfDMReport,
policyForMovingExpenses,
betas,
recentWaypoints,
});
}, [
iouType,
Expand Down Expand Up @@ -372,6 +373,7 @@ function IOURequestStepDistance({
policyForMovingExpenses,
selfDMReport,
betas,
recentWaypoints,
]);

const getError = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ function IOURequestStepDistanceGPS({

const shouldSkipConfirmation = !skipConfirmation || !report?.reportID ? false : !(isArchived || isPolicyExpenseChatUtils(report));

const [recentWaypoints] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);
const navigateToNextStep = () => {
const gpsCoordinates = getGPSCoordinates(gpsDraftDetails);
const distance = getGPSConvertedDistance(gpsDraftDetails, unit);
Expand Down Expand Up @@ -120,6 +121,7 @@ function IOURequestStepDistanceGPS({
selfDMReport,
policyForMovingExpenses,
betas,
recentWaypoints,
unit,
personalOutputCurrency: personalPolicy?.outputCurrency,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@
selfDMReport,
policyForMovingExpenses,
betas,
recentWaypoints,
unit,
personalOutputCurrency: personalPolicy?.outputCurrency,
});
Expand Down Expand Up @@ -290,7 +291,7 @@
}

navigateToNextPage(value);
}, [navigateToNextPage, translate, report, iouType, currentUserAccountIDParam]);

Check warning on line 294 in src/pages/iou/request/step/IOURequestStepDistanceManual.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

React Hook useCallback has unnecessary dependencies: 'currentUserAccountIDParam', 'iouType', and 'report'. Either exclude them or remove the dependency array

useEffect(() => {
if (isLoadingSelectedTab) {
Expand Down
2 changes: 2 additions & 0 deletions src/pages/iou/request/step/IOURequestStepDistanceMap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ function IOURequestStepDistanceMap({
selfDMReport,
policyForMovingExpenses,
betas,
recentWaypoints,
});
}, [
iouType,
Expand Down Expand Up @@ -364,6 +365,7 @@ function IOURequestStepDistanceMap({
policyForMovingExpenses,
selfDMReport,
betas,
recentWaypoints,
]);

const getError = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ function IOURequestStepDistanceOdometer({
odometerEnd: end,
odometerDistance: calculatedDistance,
betas,
recentWaypoints,
unit,
personalOutputCurrency: personalPolicy?.outputCurrency,
});
Expand Down
12 changes: 5 additions & 7 deletions tests/actions/IOU/MoneyRequestTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {QuickAction} from '@src/types/onyx';
import type {QuickAction, RecentWaypoint} from '@src/types/onyx';
import type {SplitShares} from '@src/types/onyx/Transaction';
import * as IOU from '../../../src/libs/actions/IOU';
import * as Split from '../../../src/libs/actions/IOU/Split';
Expand Down Expand Up @@ -737,6 +737,7 @@ describe('MoneyRequest', () => {
quickAction: fakeQuickAction,
selfDMReport,
betas: [CONST.BETAS.ALL],
recentWaypoints: [] as RecentWaypoint[],
};
const splitShares: SplitShares = {
[firstSplitParticipantID]: {
Expand All @@ -748,6 +749,7 @@ describe('MoneyRequest', () => {
};

beforeEach(async () => {
baseParams.recentWaypoints = (await getOnyxValue(ONYXKEYS.NVP_RECENT_WAYPOINTS)) ?? [];
await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${fakeReport.reportID}`, {
...fakeReport,
participants: {
Expand Down Expand Up @@ -800,8 +802,6 @@ describe('MoneyRequest', () => {

expect(Split.resetSplitShares).not.toHaveBeenCalled();

const recentWaypoints = (await getOnyxValue(ONYXKEYS.NVP_RECENT_WAYPOINTS)) ?? [];

expect(IOU.trackExpense).toHaveBeenCalledWith({
report: baseParams.report,
isDraftPolicy: false,
Expand Down Expand Up @@ -837,7 +837,7 @@ describe('MoneyRequest', () => {
currentUserAccountIDParam: baseParams.currentUserAccountID,
currentUserEmailParam: baseParams.currentUserLogin,
quickAction: baseParams.quickAction,
recentWaypoints,
recentWaypoints: baseParams.recentWaypoints,
betas: [CONST.BETAS.ALL],
});

Expand Down Expand Up @@ -865,8 +865,6 @@ describe('MoneyRequest', () => {
waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
});

const recentWaypoints = (await getOnyxValue(ONYXKEYS.NVP_RECENT_WAYPOINTS)) ?? [];

expect(IOU.trackExpense).toHaveBeenCalledWith(
expect.objectContaining({
report: baseParams.report,
Expand Down Expand Up @@ -902,7 +900,7 @@ describe('MoneyRequest', () => {
currentUserAccountIDParam: baseParams.currentUserAccountID,
currentUserEmailParam: baseParams.currentUserLogin,
quickAction: baseParams.quickAction,
recentWaypoints,
recentWaypoints: baseParams.recentWaypoints,
}),
);
});
Expand Down
Loading