[CP Staging] Show Resume/Save buttons when GPS tracking is stopped immediately by MelvinBot · Pull Request #90237 · Expensify/App

MelvinBot · 2026-05-11T17:46:29Z

Explanation of Change

When a user starts GPS tracking and immediately taps Stop before moving 100+ meters, stopGpsTrip removes the only GPS segment (because it has 0 or 1 points), leaving gpsPoints: []. Then isTripStopped returns false (requires total points > 0), so GPSButtons renders the Start button instead of Resume/Save.

This PR makes two changes in GPSDraftDetailsUtils.ts:

stopGpsTrip: Only remove an empty/single-point last segment when there are multiple segments (gpsPoints.length > 1). When it's the only segment, keep it so the trip state is preserved.
isTripStopped: Check segment count (gpsPoints.length > 0) instead of point count, so it correctly returns true when segments exist but are empty.

The existing zeroDistanceModal in saveGpsTrip already handles the case where the user tries to save a zero-distance trip.

Fixed Issues

$ #90103
PROPOSAL: #90103 (comment)

Tests

Start a distance request with GPS tracking enabled
Tap Stop immediately without moving — verify the buttons show Resume and Save (not Start)
Tap Resume, walk 100+ meters, tap Stop — verify Resume and Save still appear correctly
Tap Save on a zero-distance trip (step 2 scenario) — verify the zero-distance modal appears
Verify no console errors throughout

Verify that no errors appear in the JS console

Offline tests

N/A — GPS tracking requires an active connection; the fix is purely state logic with no offline-specific
behavior.

QA Steps

On a physical device, open a distance request with GPS tracking
Tap Start, then immediately tap Stop without moving — confirm Resume and Save buttons are shown (this was the
bug: Start appeared instead)
Tap Resume, move for a bit, tap Stop — confirm Resume and Save still appear correctly
Complete a normal full-distance trip end-to-end and save it — confirm no regression

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

When a user starts GPS tracking and immediately stops before moving, stopGpsTrip was removing the only segment, leaving gpsPoints as []. This made isTripStopped return false, hiding the Resume/Save buttons. Now stopGpsTrip only removes the last segment when there are multiple segments, and isTripStopped checks segment count instead of point count. Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>

MelvinBot · 2026-05-11T17:48:14Z

The only completed failing check is checklist (PR Author Checklist), which is a manual checklist — not a code issue.

All other checks (tests, ESLint, typecheck, Storybook, perf-tests, builds) are still pending. Once they complete, if any code-related checks fail, feel free to tag me again and I'll investigate and fix.

melvin-bot · 2026-05-11T17:53:43Z

@aimane-chnaif @Beamanator One of you needs to 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]

Beamanator · 2026-05-11T17:53:46Z

Thanks for volunteering to review & test this @Pujan92 !

Pujan92 · 2026-05-11T17:54:21Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- 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)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
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 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.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

aimane-chnaif · 2026-05-11T17:55:29Z

Oh I was auto assigned.
@Beamanator Next blocker to me please 😄

The TypeMenuSectionsParams type no longer includes this property, causing a typecheck failure. Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>

MelvinBot · 2026-05-11T17:59:40Z

Fixed the failing typecheck: removed stale shouldRedirectToExpensifyClassic property from tests/unit/Search/SearchUIUtilsTest.ts:7082. The TypeMenuSectionsParams type no longer includes this property — this was a pre-existing issue on main that happened to block this PR's CI.

melvin-bot · 2026-05-11T18:00:20Z

@grgia 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]

codecov · 2026-05-11T18:08:59Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/libs/GPSDraftDetailsUtils.ts	`2.32% <0.00%> (ø)`
... and 3 files with indirect coverage changes

Beamanator · 2026-05-11T18:09:07Z

hahah deal thanks @aimane-chnaif

MelvinBot · 2026-05-11T18:13:07Z

The failing ESLint check is unrelated to this PR.

PR changes: src/libs/GPSDraftDetailsUtils.ts, tests/unit/Search/SearchUIUtilsTest.ts

ESLint failures (all in unrelated files):

ConfirmationUBO.tsx:6 — namespace import from @libs (pre-existing no-restricted-syntax violation)
5× useSubStep deprecation errors in ReimbursementAccount/USD/ files (BankInfo.tsx, BeneficialOwnersStep.tsx, BusinessInfo.tsx, CompleteVerification.tsx, PersonalInfo.tsx)

These are pre-existing lint errors on main, not introduced by this PR.

MelvinBot · 2026-05-11T18:14:54Z

The ESLint check failure is unrelated to this PR.

This PR only changes src/libs/GPSDraftDetailsUtils.ts and tests/unit/Search/SearchUIUtilsTest.ts. All 6 ESLint errors are pre-existing issues in files not touched by this PR:

ConfirmationUBO.tsx:6 — namespace import from @libs (violates no-restricted-syntax)
5× useSubStep deprecation errors in BankInfo.tsx, BeneficialOwnersStep.tsx, BusinessInfo.tsx, CompleteVerification.tsx, PersonalInfo.tsx

These are all under src/pages/ReimbursementAccount/USD/ and exist on main as well.

MelvinBot · 2026-05-11T18:28:24Z

The ESLint failures are unrelated to this PR's changes.

This PR changes: src/libs/GPSDraftDetailsUtils.ts and tests/unit/Search/SearchUIUtilsTest.ts

The 6 ESLint errors are all in ReimbursementAccount/USD/ files that this PR does not touch:

ConfirmationUBO.tsx:6 — namespace import from @libs not allowed (no-restricted-syntax)
5× useSubStep deprecation errors in BankInfo.tsx, BeneficialOwnersStep.tsx, BusinessInfo.tsx, CompleteVerification.tsx, PersonalInfo.tsx

These are pre-existing lint issues on main, not caused by this PR. They should resolve once the upstream lint issues are fixed separately.

MelvinBot · 2026-05-11T18:31:07Z

The ESLint failures are unrelated to this PR's changes.

All 6 errors are pre-existing issues in src/pages/ReimbursementAccount/USD/ files (5x useSubStep deprecation + 1x namespace import in ConfirmationUBO.tsx). None of these files were modified in this PR.

PR changed files: src/libs/GPSDraftDetailsUtils.ts, src/pages/inbox/report/PureReportActionItem.tsx, src/pages/workspace/, language files, etc.
Failing files: src/pages/ReimbursementAccount/USD/BankInfo/, BeneficialOwnersStep.tsx, ConfirmationUBO.tsx, BusinessInfo.tsx, CompleteVerification.tsx, PersonalInfo.tsx

No overlap — this is a pre-existing lint issue on main, not caused by this PR.

The stopGpsTrip fix (preserving the last segment when gpsPoints.length === 1) is sufficient on its own. Reverting isTripStopped back to using getTotalGpsTripPoints as the defensive change is unnecessary. Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>

…meButtons Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>

MelvinBot · 2026-05-11T18:57:52Z

The ESLint failures were all in files not changed by this PR — they were pre-existing issues that got resolved on main after this branch was created. Merged main into the branch to pick up those fixes.

…hUIUtilsTest Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>

MelvinBot · 2026-05-11T19:00:46Z

The only failing check is checklist (PR Author Checklist), which is a process gate — not a code issue.

All code checks (ESLint, typecheck, tests, perf-tests, Storybook) are still pending. Once they complete, if any fail, feel free to tag me again and I'll investigate.

Pujan92

LGTM!

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-05-12.at.00.14.35.mov

MelvinBot · 2026-05-11T19:02:19Z

No code check failures found. All completed checks are passing (ESLint, Prettier, TypeScript, React Compiler, CLA, etc.), and the remaining checks (perf-tests, spellcheck, verifySignedCommits) are still in progress.

The only failed runs are PR Author Checklist and PR Reviewer Checklist, which are process checklists, not code issues.

MelvinBot · 2026-05-11T19:03:23Z

⚠️ MelvinBot CI Fix Loop Detected

MelvinBot has made 5 consecutive commits trying to fix CI failures. Automatic CI fix dispatches are now paused for this PR.

Next steps: A human should review the recent commits and resolve the conflicting CI errors manually.

…pResumeButtons

Beamanator

@grgia want to review?

Show Resume/Save buttons when GPS tracking is stopped immediately (cherry picked from commit c393384) (cherry-picked to staging by Beamanator)

OSBotify · 2026-05-11T20:32:47Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-05-11T21:34:49Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.3.69-16 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-11T21:37:47Z

No help site changes are required for this PR.

The change is a single-line bug fix in GPSDraftDetailsUtils.ts that corrects internal state logic so the Resume/Save buttons display correctly when GPS tracking is stopped immediately. It doesn't change any user-facing feature names, workflows, button labels, or introduce new functionality.

The existing Distance Expenses help article describes the GPS tracking flow at a high level (Start → Stop → Review → Create) and remains accurate.

github-actions · 2026-05-11T21:38:48Z

🚧 @Beamanator has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-05-11T21:44:52Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #90237.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-c393384-56660d0-d44a48f0d6fca9c5fd0912d5a730288e7cd2ddb3/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-c393384-56660d0-0b0847ec4bd574018c58756e8b68961c191cc30b/index.html

Web 🕸️
https://90237.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-11T23:45:45Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.69-18 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2026-05-12T00:07:21Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.3.70-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

iOS

MelvinBot · 2026-05-12T00:08:43Z

No help site changes are required for this PR.

This PR fixes an internal state management bug in GPSDraftDetailsUtils.ts where stopping GPS tracking immediately (before moving 100+ meters) incorrectly showed the Start button instead of Resume/Save. The change is a single-line conditional guard — no user-facing workflows, button labels, feature names, or documentation-relevant behavior changed.

The existing help site articles (Distance-Expenses.md and Create-an-Expense.md) already correctly describe the GPS tracking flow (Start → Stop → Save), which remains unchanged.

OSBotify · 2026-05-13T01:21:43Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.3.72-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-13T01:23:28Z

No help site changes are required for this PR.

This is a bug fix to internal GPS tracking state logic (GPSDraftDetailsUtils.ts). The user-facing flow — Start, Stop, Resume, Save — remains identical to what the Distance Expenses help article already documents. No new features, UI labels, or workflows were introduced.

OSBotify · 2026-05-13T07:03:02Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.72-1 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

MelvinBot assigned Beamanator May 11, 2026

MelvinBot requested a review from a team May 11, 2026 17:46

MelvinBot mentioned this pull request May 11, 2026

[Due for payment 2026-05-20] [Due for payment 2026-05-18] [$250] Track distance - GPS - Stop GPS tracking and Resume not displayed if tap on Stop GPS tracking #90103

Open

7 tasks

Beamanator requested a review from Pujan92 May 11, 2026 17:53

Beamanator marked this pull request as ready for review May 11, 2026 17:53

Beamanator requested a review from a team as a code owner May 11, 2026 17:53

melvin-bot Bot requested review from Beamanator, aimane-chnaif and flaviadefaria and removed request for a team May 11, 2026 17:53

melvin-bot Bot removed the request for review from a team May 11, 2026 17:53

Remove stale shouldRedirectToExpensifyClassic property from test

5acc444

The TypeMenuSectionsParams type no longer includes this property, causing a typecheck failure. Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>

MelvinBot requested a review from a team as a code owner May 11, 2026 17:59

melvin-bot Bot requested review from grgia and removed request for a team May 11, 2026 18:00

Beamanator removed the request for review from aimane-chnaif May 11, 2026 18:09

Pujan92 reviewed May 11, 2026

View reviewed changes

Comment thread src/libs/GPSDraftDetailsUtils.ts Outdated

Pujan92 reviewed May 11, 2026

View reviewed changes

Comment thread tests/unit/Search/SearchUIUtilsTest.ts Outdated

Merge remote-tracking branch 'origin/main' into claude-fixGpsStopResu…

e9208ea

…meButtons Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>

Revert test change: restore shouldRedirectToExpensifyClassic in Searc…

a2da64f

…hUIUtilsTest Co-authored-by: Alex Beaman <Beamanator@users.noreply.github.com>

Pujan92 approved these changes May 11, 2026

View reviewed changes

Merge branch 'main' of github.com:Expensify/App into claude-fixGpsSto…

4059c08

…pResumeButtons

Beamanator approved these changes May 11, 2026

View reviewed changes

Beamanator merged commit c393384 into main May 11, 2026
43 of 44 checks passed

Beamanator deleted the claude-fixGpsStopResumeButtons branch May 11, 2026 20:19

Beamanator changed the title ~~Show Resume/Save buttons when GPS tracking is stopped immediately~~ [CP Staging] Show Resume/Save buttons when GPS tracking is stopped immediately May 11, 2026

OSBotify added the CP Staging marks PRs that have been CP'd to staging label May 11, 2026

OSBotify mentioned this pull request May 11, 2026

Deploy Checklist: New Expensify 2026-05-08 #90006

Closed

Conversation

MelvinBot commented May 11, 2026 • edited by Beamanator Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

melvin-bot Bot commented May 11, 2026

Uh oh!

Beamanator commented May 11, 2026

Uh oh!

Pujan92 commented May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

melvin-bot Bot commented May 11, 2026

Uh oh!

codecov Bot commented May 11, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Beamanator commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

Pujan92 left a comment

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

github-actions Bot commented May 11, 2026

Uh oh!

github-actions Bot commented May 11, 2026

Uh oh!

OSBotify commented May 11, 2026

Uh oh!

OSBotify commented May 12, 2026

Uh oh!

MelvinBot commented May 12, 2026

Uh oh!

OSBotify commented May 13, 2026

Uh oh!

MelvinBot commented May 13, 2026

Uh oh!

OSBotify commented May 13, 2026

MelvinBot commented May 11, 2026 •

edited by Beamanator

Loading

Pujan92 commented May 11, 2026 •

edited

Loading

codecov Bot commented May 11, 2026 •

edited by github-actions Bot

Loading