Browse Source

visited/not visited fix

Viktoriia 10 months ago
parent
commit
87b9f5e1f4

+ 12 - 4
src/screens/InAppScreens/TravelsScreen/CountriesScreen/index.tsx

@@ -26,7 +26,7 @@ const CountriesScreen = () => {
   const { data, refetch } = useGetSlowQuery(String(token));
   const [megaSelectorVisible, setMegaSelectorVisible] = useState(false);
   const [selectedMega, setSelectedMega] = useState<{ name: string; id: number }>({
-    name: 'ALL',
+    name: 'ALL MEGAREGIONS',
     id: -1
   });
   const [total, setTotal] = useState({ slow: 0, visited: 0 });
@@ -51,10 +51,18 @@ const CountriesScreen = () => {
   }, [slow]);
 
   useEffect(() => {
+    const refetchData = async () => {
+      await refetch().then((res) => {
+        if (res.data) {
+          setSlow(res.data.slow);
+        }
+      });
+    }
+
     if (data && data.result === 'OK') {
       setSearch('');
       if (selectedMega.id === -1) {
-        refetch()
+        refetchData()
       } else {
         setSlow(data?.slow?.filter((item) => item.mega.includes(selectedMega.id)));
       }
@@ -187,10 +195,10 @@ const CountriesScreen = () => {
               style={styles.btnOption}
               onPress={() => {
                 setMegaSelectorVisible(false);
-                setSelectedMega({ name: 'ALL', id: -1 });
+                setSelectedMega({ name: 'ALL MEGAREGIONS', id: -1 });
               }}
             >
-              <Text style={styles.btnOptionText}>ALL</Text>
+              <Text style={styles.btnOptionText}>ALL MEGAREGIONS</Text>
             </TouchableOpacity>
             {data?.megaregions?.map((mega) => (
               <TouchableOpacity

+ 5 - 5
src/screens/InAppScreens/TravelsScreen/DareScreen/index.tsx

@@ -138,16 +138,16 @@ const DareScreen = () => {
             onPress={() => setContentIndex(0)}
             isActive={contentIndex === 0}
           />
-          <CustomButton
-            title="Not visited"
-            onPress={() => setContentIndex(1)}
-            isActive={contentIndex === 1}
-          />
           <CustomButton
             title="Visited"
             onPress={() => setContentIndex(2)}
             isActive={contentIndex === 2}
           />
+          <CustomButton
+            title="Not visited"
+            onPress={() => setContentIndex(1)}
+            isActive={contentIndex === 1}
+          />
           <CustomButton
             title="New"
             onPress={() => setContentIndex(3)}

+ 5 - 5
src/screens/InAppScreens/TravelsScreen/RegionsScreen/index.tsx

@@ -209,16 +209,16 @@ const RegionsScreen = () => {
             onPress={() => setContentIndex(0)}
             isActive={contentIndex === 0}
           />
-          <CustomButton
-            title="Not visited"
-            onPress={() => setContentIndex(1)}
-            isActive={contentIndex === 1}
-          />
           <CustomButton
             title="Visited"
             onPress={() => setContentIndex(2)}
             isActive={contentIndex === 2}
           />
+          <CustomButton
+            title="Not visited"
+            onPress={() => setContentIndex(1)}
+            isActive={contentIndex === 1}
+          />
         </View>
       )}
 

+ 4 - 4
src/screens/InAppScreens/TravelsScreen/SeriesItemScreen/index.tsx

@@ -82,16 +82,16 @@ export const SeriesItemScreen = ({ route }: { route: any }) => {
 
   const [routes] = useState([
     { key: 'all', title: 'All items' },
-    { key: 'new', title: 'New' },
+    { key: 'checked', title: 'Ticked' },
     { key: 'unchecked', title: 'Unticked' },
-    { key: 'checked', title: 'Ticked' }
+    { key: 'new', title: 'New' },
   ]);
 
   const handleIndexChange = (index: number) => {
     let dataToFilter = [...seriesData];
 
     switch (index) {
-      case 1:
+      case 3:
         dataToFilter = dataToFilter
           .map((group) => ({
             ...group,
@@ -108,7 +108,7 @@ export const SeriesItemScreen = ({ route }: { route: any }) => {
           }))
           .filter((group) => group.items.length > 0);
         break;
-      case 3:
+      case 1:
         dataToFilter = dataToFilter
           .map((group) => ({
             ...group,