Merge branch 'dev' of https://git.nomadmania.travel/Viktoriia/nomadmania-app into new-maps

app.config.ts

@@ -24,7 +24,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   owner: 'nomadmaniaou',
   scheme: 'nm',
   // Should be updated after every production release (deploy to AppStore/PlayMarket)
-  version: '2.0.22',
+  version: '2.0.23',
   // Should be updated after every dependency change
   runtimeVersion: '1.5',
   orientation: 'portrait',
@@ -113,7 +113,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
       'CAMERA',
       'MODIFY_AUDIO_SETTINGS'
     ],
-    versionCode: 75 // next version submitted to Google Play needs to be higher than that 2.0.22
+    versionCode: 76 // next version submitted to Google Play needs to be higher than that 2.0.23
   },
   plugins: [
     [

src/components/HorizontalTabView/index.tsx

@@ -38,7 +38,7 @@ export const HorizontalTabView = ({
       renderLabel={({ route, focused }) => (
         <>
           <View style={[styles.tabLabelContainer, focused ? styles.tabLabelFocused : null]}>
-            {route.icon ? (
+            {route.icon === 'ban' ? (
               <BanIcon width={15} height={15} fill={focused ? Colors.WHITE : Colors.DARK_BLUE} />
             ) : (
               <Text style={[styles.label, focused ? styles.labelFocused : null]}>

src/screens/InAppScreens/MapScreen/CountryViewScreen/index.tsx

@@ -226,7 +226,7 @@ const CountryViewScreen: FC<Props> = ({ navigation, route }) => {
       </TouchableOpacity>
 
       <ScrollView
-        contentContainerStyle={{ flexGrow: 1 }}
+        contentContainerStyle={{}}
         nestedScrollEnabled={true}
         showsVerticalScrollIndicator={false}
       >

src/screens/InAppScreens/MapScreen/RegionViewScreen/index.tsx

@@ -345,7 +345,7 @@ const RegionViewScreen: FC<Props> = ({ navigation, route }) => {
       </TouchableOpacity>
 
       <ScrollView
-        contentContainerStyle={{ flexGrow: 1 }}
+        contentContainerStyle={{}}
         nestedScrollEnabled={true}
         showsVerticalScrollIndicator={false}
       >

src/screens/InAppScreens/MapScreen/style.tsx

@@ -68,17 +68,14 @@ export const styles = StyleSheet.create({
     borderRadius: 9,
     borderColor: 'white',
     backgroundColor: '#ED9334',
-    scale: 1,
-    shadow: {
-      shadowColor: "#212529",
-      shadowOffset: {
-        width: 0,
-        height: 4,
-      },
-      shadowOpacity: 0.12,
-      shadowRadius: 8,
-      elevation: 5,
+    shadowColor: "#212529",
+    shadowOffset: {
+      width: 0,
+      height: 4,
     },
+    shadowOpacity: 0.12,
+    shadowRadius: 8,
+    elevation: 5,
   },
   searchContainer: {
     flexDirection: 'row',