fix: move fetchSoilDataForUser call to PullRequester

Author: garobrik

dev-client/src/screens/SitesScreen/SitesScreen.tsx

@@ -38,7 +38,6 @@ import {Box} from 'terraso-mobile-client/components/NativeBaseAdapters';
 import {positionToCoords} from 'terraso-mobile-client/components/StaticMapView';
 import {useGeospatialContext} from 'terraso-mobile-client/context/GeospatialContext';
 import {SitesScreenContext} from 'terraso-mobile-client/context/SitesScreenContext';
-import {fetchSoilDataForUser} from 'terraso-mobile-client/model/soilData/soilDataGlobalReducer';
 import {AppBar} from 'terraso-mobile-client/navigation/components/AppBar';
 import {ScreenScaffold} from 'terraso-mobile-client/screens/ScreenScaffold';
 import {MapHeader} from 'terraso-mobile-client/screens/SitesScreen/components/MapHeader';
@@ -54,9 +53,8 @@ import {
   siteCallout,
 } from 'terraso-mobile-client/screens/SitesScreen/SitesScreenCallout';
 import {getSitesScreenFilters} from 'terraso-mobile-client/screens/SitesScreen/utils/sitesScreenFilters';
-import {useDispatch, useSelector} from 'terraso-mobile-client/store';
+import {useSelector} from 'terraso-mobile-client/store';
 import {
-  selectCurrentUserID,
   selectSites,
   selectSitesAndUserRoles,
 } from 'terraso-mobile-client/store/selectors';
@@ -65,10 +63,8 @@ export const SitesScreen = memo(() => {
   const siteListBottomSheetRef = useRef<BottomSheet>(null);
   const [mapStyleURL, setMapStyleURL] = useState(Mapbox.StyleURL.Street);
   const [calloutState, setCalloutState] = useState<CalloutState>(noneCallout());
-  const currentUserID = useSelector(selectCurrentUserID);
   const sites = useSelector(selectSites);
   const siteList = useMemo(() => Object.values(sites), [sites]);
-  const dispatch = useDispatch();
   const mapRef = useRef<MapRef>(null);
   const siteProjectRoles = useSelector(selectSitesAndUserRoles);
   const sitesScreenContext = useContext(SitesScreenContext);
@@ -95,12 +91,6 @@ export const SitesScreen = memo(() => {
     [showSiteOnMap, collapseBottomSheet],
   );
 
-  useEffect(() => {
-    if (currentUserID !== undefined) {
-      dispatch(fetchSoilDataForUser(currentUserID));
-    }
-  }, [dispatch, currentUserID]);
-
   const currentUserCoords = useSelector(state => state.map.userLocation.coords);
 
   const [finishedLoading, setFinishedLoading] = useState(false);

dev-client/src/store/sync/PullRequester.tsx

@@ -20,7 +20,8 @@ import {useEffect, useRef} from 'react';
 import _ from 'lodash';
 
 import {setPullRequested} from 'terraso-mobile-client/model/sync/syncSlice';
-import {useDispatch} from 'terraso-mobile-client/store';
+import {useDispatch, useSelector} from 'terraso-mobile-client/store';
+import {selectCurrentUserID} from 'terraso-mobile-client/store/selectors';
 import {
   useDebouncedIsOffline,
   useSyncErrorSiteIds,
@@ -37,6 +38,16 @@ export const PullRequester = () => {
     dispatch(setPullRequested(true));
   }, [dispatch]);
 
+  // Request a pull when we login
+  const currentUserID = useSelector(selectCurrentUserID);
+  const previousCurrentUserID = useRef<string | undefined>(currentUserID);
+  useEffect(() => {
+    if (currentUserID !== undefined && previousCurrentUserID === undefined) {
+      dispatch(setPullRequested(true));
+    }
+    previousCurrentUserID.current = currentUserID;
+  }, [currentUserID, dispatch]);
+
   // Request a pull when we come online
   const isOffline = useDebouncedIsOffline(OFFLINE_DEBOUNCE_MS);
   const wasPreviouslyOffline = useRef<boolean>(isOffline);