Skip to content

Retype a leftover non-distance draft as distance on the distance start page #104792

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

Merged
roryabraham merged 5 commits into from
Oct 27, 2026
Merged

Retype a leftover non-distance draft as distance on the distance start page #104792

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b48cfa4
Retype a leftover non-distance draft as distance on the distance star…
aimane-chnaif Oct 22, 2026
c22dfe3
Merge branch 'Expensify:main' into fix-101340
aimane-chnaif Oct 23, 2026
16fe279
Merge branch 'Expensify:main' into fix-101340
aimane-chnaif Oct 23, 2026
ae8bf01
Merge branch 'main' of https://github.com/aimane-chnaif/Expensify int…
aimane-chnaif Oct 27, 2026
946edac
Revert unrelated GitHub Actions bundle changes
aimane-chnaif Oct 27, 2026
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
9 changes: 7 additions & 2 deletions src/pages/iou/request/DistanceRequestStartPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {isMapOrGPSRequired} from '@libs/PolicyDistanceRatesUtils';
import {getActivePolicies, isGroupPolicy} from '@libs/PolicyUtils';
import {getPayeeName, isExpenseReport, isPolicyExpenseChat, isSelfDM} from '@libs/ReportUtils';
import {endSpan} from '@libs/telemetry/activeSpans';
import {isDistanceRequest} from '@libs/TransactionUtils';

import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';

Expand Down Expand Up @@ -99,8 +100,12 @@ function DistanceRequestStartPage({
[CONST.IOU.TYPE.CREATE]: translate('iou.trackDistance'),
};

// A draft left by another flow (e.g. a Manual expense before a home-screen shortcut) keeps its non-distance type,
// and the reset skips a type that already matches. Ignore it so the reset retypes the draft as distance.
const draftRequestType = isDistanceRequest(transaction) ? transaction?.iouRequestType : undefined;

let transactionRequestType;
if (!transaction?.iouRequestType) {
if (!draftRequestType) {
// The tab navigator renders whichever tab was last selected, so the draft has to be typed from that
// same value. Preferring the last-created distance type instead rebuilds the draft as Odometer under
// a visible Map tab, leaving it without waypoints so tapping one opens the "Not here" page.
Expand All @@ -115,7 +120,7 @@ function DistanceRequestStartPage({
transactionRequestType = rememberedRequestType;
}
} else {
transactionRequestType = transaction.iouRequestType;
transactionRequestType = draftRequestType;
}

const resetIOUTypeIfChanged = useResetIOUType({
Expand Down
Loading