浏览代码

country=>region fixes

Viktoriia 21 小时之前
父节点
当前提交
0a8c427be9

+ 1 - 1
src/components/RegionPopup/index.tsx

@@ -213,7 +213,7 @@ const RegionPopup: React.FC<RegionPopupProps> = ({
             {userData?.visited &&
             userData?.type !== 'dare' &&
             !disabled &&
-            userData?.visited_regions <= 1 ? (
+            (userData?.visited_regions <= 1 || userData?.type === 'nm') ? (
               <TouchableOpacity
                 onPress={
                   userData?.type === 'countries'

+ 2 - 0
src/contexts/RegionContext.tsx

@@ -213,6 +213,8 @@ export const RegionProvider = ({ children }: { children: React.ReactNode }) => {
                     updatedItem.slow11 = Number(dataItem.slow11) as 0 | 1;
                     updatedItem.slow31 = Number(dataItem.slow31) as 0 | 1;
                     updatedItem.slow101 = Number(dataItem.slow101) as 0 | 1;
+                    updatedItem.visited_regions = Number(dataItem?.visited_regions) as 0 | 1;
+                    updatedItem.info_text = dataItem?.info_text;
 
                     return updatedItem;
                   }

+ 2 - 0
src/modules/api/countries/countries-api.tsx

@@ -99,6 +99,8 @@ export interface PostGetUserDataReturn extends ResponseType {
     slow11: 0 | 1;
     slow31: 0 | 1;
     slow101: 0 | 1;
+    info_text: string;
+    visited_regions: number;
   };
 }
 

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

@@ -1799,7 +1799,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
                 setIsWarningModalVisible(true);
                 return;
               }
-              handleUpdateSlow(id, v, undefined, undefined, undefined);
+              handleUpdateSlow(id, v, s11, s31, s101);
 
               const updatedIds = countriesVisited.includes(id)
                 ? countriesVisited.filter((visitedId) => visitedId !== id)