Derive the distance draft expense type from the selected tab

[wildan-m]

Explanation of Change

Tapping a Start or Stop waypoint on the Map tab opens the "Not here" page instead of the waypoint editor once an Odometer expense has been created earlier in the session. Leaving the flow clears the draft expense, so reopening it has to derive the expense type again — and that derivation preferred the last distance expense the user created over the tab that is actually on screen. The tab navigator restores the tab that was last selected, so the two disagree as soon as someone creates an Odometer expense and later switches to Map: the visible tab is Map, but the draft is rebuilt as an Odometer expense, which carries no waypoints. The Map tab renders placeholder Start and Stop rows regardless of the underlying draft, so the list looks normal until a row is tapped and the editor finds no waypoints to open.

Deriving the type from the selected tab keeps the rebuilt draft aligned with the tab the navigator is showing, so a Map tab always sits over a map expense with its waypoints seeded. The last-created type stays as the next fallback, so opening the flow before any tab has been selected still lands on the type used last.

Fixed Issues

$ #92598
PROPOSAL: #92598 (comment)

Tests

1. Open a workspace that has distance rates enabled, and open its workspace chat.
2. Open an expense report in that chat.
3. Tap the + icon > Track expense > select the Odometer tab, and create an odometer expense by uploading the start and end images.
4. Close the RHP to go back to the report view, then open the report again.
5. Tap the + icon > Track expense > select the Map tab, then close the RHP.
6. Tap the + icon > Track expense again, and tap either the Start or Stop waypoint.
7. Verify the waypoint editor opens and the "Not here" page does not appear.
8. Verify the remembered-tab behavior still works: switch to the Odometer tab, close and reopen Track expense, and confirm it opens on the Odometer tab with the odometer fields.

• Verify that no errors appear in the JS console

Offline tests

The rebuilt draft expense is derived entirely from locally stored values, so the behavior is unchanged offline. Turn off the network connection and repeat the steps above; the waypoint editor still opens on the Map tab.

QA Steps

Same as tests.

• Verify that no errors appear in the JS console

PR Author Checklist

• I linked the correct issue in the ### Fixed Issues section above
• I wrote clear testing steps that cover the changes made in this PR
  • I added steps for local testing in the Tests section
  • I added steps for the expected offline behavior in the Offline steps section
  • I added steps for Staging and/or Production testing in the QA steps section
  • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
  • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
• I included screenshots or videos for tests on all platforms
• I ran the tests on all platforms & verified they passed on:
  • Android: Native
  • Android: mWeb Chrome
  • iOS: Native
  • iOS: mWeb Safari
  • MacOS: Chrome / Safari
• I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
• I followed proper code patterns (see Reviewing the code)
  • I verified that comments were added to code that is not self explanatory
  • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
  • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
• If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
• I followed the guidelines as stated in the Review Guidelines
• I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
• If a new CSS style is added I verified that:
  • A similar style doesn't already exist
  • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
• If new assets were added or existing ones were modified, I verified that:
  • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
  • The assets load correctly across all supported platforms.
• If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
• If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
• If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
• If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
• If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
  • I verified that all the inputs inside a form are aligned with each other.
  • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
• I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
• If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native

Kapture.2026-07-29.at.23.38.56.mp4

Android: mWeb Chrome

Kapture.2026-07-29.at.23.42.39.mp4

iOS: Native

Kapture.2026-07-29.at.23.24.56.mp4

iOS: mWeb Safari

Kapture.2026-07-29.at.23.28.51.mp4

MacOS: Chrome / Safari

Kapture.2026-07-29.at.22.18.58.mp4

[melvin-bot]

@linhvovan29546 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]