Преглед изворни кода

small fix for trips + nm popup

Viktoriia пре 1 недеља
родитељ
комит
7f5a3af924

+ 13 - 1
src/screens/InAppScreens/MapScreen/RegionViewScreen/index.tsx

@@ -54,7 +54,7 @@ const RegionViewScreen: FC<Props> = ({ navigation, route }) => {
   const [series, setSeries] = useState<SeriesData[]>([]);
   const [photos, setPhotos] = useState<PhotosData[]>([]);
   const [name, setName] = useState(['', '']);
-  const { data } =
+  const { data, refetch: refetchData, isFetchedAfterMount } =
     type === 'nm'
       ? useGetNmRegionDataQuery(regionId, type === 'nm', token && token)
       : useGetDareRegionDataQuery(regionId, type === 'dare', token && token);
@@ -139,6 +139,18 @@ const RegionViewScreen: FC<Props> = ({ navigation, route }) => {
     }, [data])
   );
 
+  useFocusEffect(
+    useCallback(() => {
+      refetchData()
+    }, [navigation, token])
+  );
+
+  useEffect(() => {
+    if (data && data.data) {
+      setRegionData({ ...(data?.data || {}), type });
+    }
+  }, [isFetchedAfterMount])
+
   const handleCheckboxChange = useCallback(
     async (item: SeriesItem, double: boolean, seriesId: number) => {
       setSeries((currentData) => {

+ 3 - 0
src/screens/InAppScreens/MapScreen/index.tsx

@@ -625,6 +625,9 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
         refetchVisitedCountries();
         refetchVisitedDare();
       }
+      if (userData && type === 'regions') {
+        handleClosePopup();
+      }
     }, [navigation, token])
   );