Fix GPS - Resume offline does not update current location after reconnecting by GCyganek · Pull Request #101345 · Expensify/App

GCyganek · 2026-09-16T14:37:55Z

Explanation of Change

The GPS map unmounts when the app goes offline, but its camera state lived in GPSMapView and survived that unmount, so a rebuilt map inherited stale state. Moved the map and that state into a new GPSMapViewContent so a remount reseeds it.

Fixed Issues

$ #99643
PROPOSAL: N/A

Tests

iOS and Android native app:

FAB > Track distance > GPS
Start a new GPS trip
Verify that the map loads and the camera snaps to your location puck.
Pan the map away from your location with a drag gesture (the map stops following you).
Turn off the device's network connection and verify the map is replaced by the pending map view.
Turn the network back on and wait for the map to load again.
Verify that the freshly loaded map snaps immediately to your current location instead of staying at the position you had panned to before going offline.

FAB > Track distance > GPS
Start a GPS trip and wait until at least a few points have been recorded
Turn off the device's network connection, wait for the pending map view, then turn it back on.
Verify that after the map reloads the recorded waypoints and route are still drawn and the camera follows the puck while the trip is active.
Discard the GPS trip.
Verify that the map resumes following your current location.

FAB > Track distance > GPS
Start a GPS trip and wait until at least a few points have been recorded
Stop the GPS trip and verify the recorded route is centered on the map
Turn off the device's network connection, wait for the pending map view, then turn it back on.
Verify that after the map reloads the recorded waypoints and route are still drawn and they're centered on the map
Discard the GPS trip.
Verify that the map starts following your current location.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-09-17.at.15.33.50.mov

iOS: Native

Screen.Recording.2026-09-17.at.15.27.20.mov

codecov · 2026-09-16T14:42:47Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/MapView/GPSMapView.tsx	`77.27% <100.00%> (+74.80%)`	⬆️
...oks/useLocationServicesRemountKey/index.android.ts	`92.85% <92.85%> (ø)`
src/hooks/useLocationServicesRemountKey/index.ts	`0.00% <0.00%> (ø)`
src/components/MapView/GPSMapViewContent.tsx	`2.50% <2.50%> (ø)`
... and 13 files with indirect coverage changes

melvin-bot · 2026-09-17T13:39:28Z

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

GCyganek · 2026-09-18T14:28:41Z

I'm OOO next week so if anything happens here @jmusial will take over

dylanexpensify

Looks good from a product perspective 👍

QichenZhu · 2026-09-21T12:53:39Z

Thanks! I'll test this in the morning.

QichenZhu · 2026-09-22T05:20:18Z

Hi @jmusial, I can still reproduce this bug.

Screen.Recording.2026-09-22.at.5.18.08.PM.mov

jmusial · 2026-09-22T11:38:20Z

Hi @jmusial, I can still reproduce this bug.

Looking into it

jmusial · 2026-09-23T09:24:29Z

@QichenZhu updated PR

Screen.Recording.2026-09-23.at.11.21.32.mov

QichenZhu · 2026-09-24T07:52:43Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
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 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 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)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- 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
- 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 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
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-native-1.mov

android-native-2.mov

android-native-3.mov

android-native-4.mov

Android: mWeb Chrome

iOS: HybridApp

ios-native-1.mov

ios-native-2.mov

ios-native-3.mov

ios-native-4.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

QichenZhu · 2026-09-24T07:23:42Z

+        setRemountKey((key) => key + 1);
+    };
+
+    usePolling(checkLocationServices, CONST.TIMING.LOCATION_UPDATE_INTERVAL, true, CONST.TIMING.USE_DEBOUNCED_STATE_DELAY);


My understanding is that since GPS is already running continuously in the background, the extra battery usage from the polling timer should be small. Is it right?

Sign in to view

+    // Determines if map can be panned to user's detected location without bothering the user. It will return
+    // false if user has already started dragging the map or if there are one or more waypoints present
+    // and the GPS trip is not active or the foreground location permissions are not granted.
+    const shouldFollowUserLocation = !userInteractedWithMap && (noWaypoints || isTrackingGPS) && foregroundLocationPermissionsGranted;


Sign in to view

+        setLastLocation({longitude: coords.longitude, latitude: coords.latitude});
+    };
+
+    const shouldFollowFallbackLocation = noWaypoints && !foregroundLocationPermissionsGranted;


Sign in to view

+                />
+
+                {/** Show fallback location if foreground location permissions are not granted */}
+                {!foregroundLocationPermissionsGranted && (


QichenZhu · 2026-09-24T07:50:00Z

+                        // Only spend the immediate transition once follow mode has actually been reached. A transition
+                        // that ended in failure (e.g. no location fix arrived) also reports `from.kind === 'transition'`,
+                        // and clearing the flag there would leave the camera with the default, time-boxed transition and
+                        // nothing to fall back on, because the JS layer discards every camera stop while following.


I don't quite understand this comment. Could you rephrase it?

QichenZhu · 2026-09-24T07:56:44Z

NAB: The map doesn't draw a track after the location changes. Same issue in staging.

nab.mov

QichenZhu · 2026-09-24T14:57:51Z

Sign in to view


+type GPSMapViewContentProps = Omit<GPSMapViewProps, 'accessToken'> & {
+    /** Whether the foreground location permissions are granted */
+    foregroundLocationPermissionsGranted: boolean;


NVM, the parent component guarantees the value is not null, so the child doesn't need to handle the case.

jmusial · 2026-09-24T15:11:21Z

@QichenZhu sorry didn't have time today to address comments - will do tomorrow

francoisl · 2026-09-24T17:24:39Z

@jmusial do you want me to hold off until you address the last PR comments? Looks like they're mostly small stuff like rephrasing comments

Reset map state when it unmounts

df3beb3

melvin-bot Bot assigned GCyganek Sep 16, 2026

GCyganek marked this pull request as ready for review September 17, 2026 13:39

GCyganek requested review from a team as code owners September 17, 2026 13:39

melvin-bot Bot requested review from QichenZhu and dylanexpensify September 17, 2026 13:39

melvin-bot Bot requested review from a team and removed request for a team September 17, 2026 13:39

github-actions Bot reviewed Sep 17, 2026

View reviewed changes

Comment thread src/components/MapView/GPSMapViewContent.tsx Outdated

Fix comment

75aa0e1

dylanexpensify previously approved these changes Sep 18, 2026

View reviewed changes

Merge branch 'main' into @GCyganek/gps/fix-offline-online-transitions

355c86e

jmusial dismissed dylanexpensify’s stale review via 355c86e September 21, 2026 07:46

jmusial added 2 commits September 23, 2026 10:37

Merge branch 'main' into @GCyganek/gps/fix-offline-online-transitions

2714db4

Recreate GPS map once Location services come back on Android

eba8511

QichenZhu suggested changes Sep 24, 2026

View reviewed changes

QichenZhu reviewed Sep 24, 2026

View reviewed changes

QichenZhu approved these changes Sep 24, 2026

View reviewed changes

melvin-bot Bot requested a review from francoisl September 24, 2026 14:58

francoisl approved these changes Sep 24, 2026

View reviewed changes

Conversation

GCyganek commented Sep 16, 2026 • edited 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!

codecov Bot commented Sep 16, 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!

melvin-bot Bot commented Sep 17, 2026

Uh oh!

Uh oh!

GCyganek commented Sep 18, 2026

Uh oh!

dylanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

QichenZhu commented Sep 21, 2026

Uh oh!

QichenZhu commented Sep 22, 2026

Uh oh!

jmusial commented Sep 22, 2026

Uh oh!

jmusial commented Sep 23, 2026

Uh oh!

QichenZhu commented Sep 24, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

QichenZhu Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

QichenZhu Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

QichenZhu commented Sep 24, 2026

Uh oh!

This comment was marked as resolved.

Uh oh!

QichenZhu Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial commented Sep 24, 2026

Uh oh!

francoisl commented Sep 24, 2026

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

GCyganek commented Sep 16, 2026 •

edited

Loading

codecov Bot commented Sep 16, 2026 •

edited by github-actions Bot

Loading