Browse Source

small countries fixes

Viktoriia 11 months ago
parent
commit
7e4f665c99

+ 2 - 7
src/screens/InAppScreens/MapScreen/CountryViewScreen/index.tsx

@@ -72,13 +72,7 @@ const CountryViewScreen: FC<Props> = ({ navigation, route }) => {
   useFocusEffect(
     useCallback(() => {
       const fetchGroups = async () => {
-        let staticGroups = [
-          {
-            key: 'all',
-            title: 'All',
-            series_id: 0
-          }
-        ];
+        let staticGroups = [];
         const routesData = data?.data?.series?.map((item) => ({
           key: item.series_id?.toString(),
           title: item.series_name,
@@ -420,6 +414,7 @@ const CountryViewScreen: FC<Props> = ({ navigation, route }) => {
                 setIsInfoModalVisible={setIsInfoModalVisible}
                 setInfoItem={setInfoItem}
                 disabled={disabled}
+                includeAll={false}
               />
             </>
           ) : null}

+ 4 - 2
src/screens/InAppScreens/MapScreen/RegionViewScreen/TravelSeriesList/index.tsx

@@ -13,7 +13,8 @@ const TravelSeriesList = ({
   handleCheckboxChange,
   setIsInfoModalVisible,
   setInfoItem,
-  disabled
+  disabled,
+  includeAll = true,
 }: {
   series: SeriesData[];
   indexSeries: number;
@@ -22,6 +23,7 @@ const TravelSeriesList = ({
   setIsInfoModalVisible: (value: boolean) => void;
   setInfoItem: (item: SeriesItem) => void;
   disabled: boolean;
+  includeAll?: boolean;
 }) => {
   const renderTravelSeriesItem = (
     { item }: { item: SeriesItem },
@@ -81,7 +83,7 @@ const TravelSeriesList = ({
 
   return (
     <View style={[styles.travelSeriesList]}>
-      {indexSeries === 0
+      {(indexSeries === 0 && includeAll)
         ? series.map((s) => {
             return (
               <View key={s?.series_id} style={{ minHeight: 40, gap: 8, marginBottom: 5 }}>

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

@@ -751,7 +751,7 @@ const MapScreen: React.FC<MapScreenProps> = ({ navigation }) => {
       >
         {renderedGeoJSON}
         {renderMapTiles(tilesBaseURL, localTileDir, 1)}
-        {renderMapTiles(gridUrl, localGridDir, 2)}
+        {type !== 1 && renderMapTiles(gridUrl, localGridDir, 2)}
         {userId &&
           renderMapTiles(type === 1 ? visitedUNTiles : visitedTiles, localVisitedDir, 2, 0.5)}
         {renderMapTiles(dareTiles, localDareDir, 2, 0.5)}