fix: Don't remember last location when permissions are denied

techmatters · Nov 11, 2024 · 72ae8d2 · 72ae8d2
1 parent 2373d90
commit 72ae8d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/dev-client/src/screens/BottomTabsScreen.tsx b/dev-client/src/screens/BottomTabsScreen.tsx
@@ -78,6 +78,8 @@ export const BottomTabsScreen = memo(() => {
       locationManager.addListener(listener);
 
       return () => locationManager.removeListener(listener);
+    } else {
+      dispatch(updateLocation({coords: null, accuracyM: null}));
     }
   }, [dispatch, locationPermissions?.granted]);
 

diff --git a/dev-client/src/screens/SitesScreen/SitesScreen.tsx b/dev-client/src/screens/SitesScreen/SitesScreen.tsx
@@ -98,7 +98,9 @@ export const SitesScreen = memo(() => {
     }
   }, [dispatch, currentUserID]);
 
-  const currentUserCoords = useSelector(state => state.map.userLocation.coords);
+  const currentUserCoords = useSelector(
+    state => state.map.userLocation?.coords,
+  );
 
   const [finishedLoading, setFinishedLoading] = useState(false);
   const [finishedInitialCameraMove, setFinishedInitialCameraMove] =

diff --git a/dev-client/src/screens/SitesScreen/components/CustomUserLocation.tsx b/dev-client/src/screens/SitesScreen/components/CustomUserLocation.tsx
@@ -55,6 +55,7 @@ export const CustomUserLocation = ({
   const userLocation = useSelector(state => state.map.userLocation);
 
   const feature = useMemo(() => {
+    // Coords should be null when permissions are not granted
     if (userLocation.coords === null) {
       return null;
     }