link to shop

assets/icons/bag.svg

@@ -0,0 +1,3 @@
+<svg width="14" height="16" viewBox="0 0 14 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 3.5C5 2.39687 5.89687 1.5 7 1.5C8.10312 1.5 9 2.39687 9 3.5V5H5V3.5ZM3.5 5H1.5C0.671875 5 0 5.67188 0 6.5V13C0 14.6562 1.34375 16 3 16H11C12.6562 16 14 14.6562 14 13V6.5C14 5.67188 13.3281 5 12.5 5H10.5V3.5C10.5 1.56562 8.93437 0 7 0C5.06563 0 3.5 1.56562 3.5 3.5V5ZM4.25 6.5C4.44891 6.5 4.63968 6.57902 4.78033 6.71967C4.92098 6.86032 5 7.05109 5 7.25C5 7.44891 4.92098 7.63968 4.78033 7.78033C4.63968 7.92098 4.44891 8 4.25 8C4.05109 8 3.86032 7.92098 3.71967 7.78033C3.57902 7.63968 3.5 7.44891 3.5 7.25C3.5 7.05109 3.57902 6.86032 3.71967 6.71967C3.86032 6.57902 4.05109 6.5 4.25 6.5ZM9 7.25C9 7.05109 9.07902 6.86032 9.21967 6.71967C9.36032 6.57902 9.55109 6.5 9.75 6.5C9.94891 6.5 10.1397 6.57902 10.2803 6.71967C10.421 6.86032 10.5 7.05109 10.5 7.25C10.5 7.44891 10.421 7.63968 10.2803 7.78033C10.1397 7.92098 9.94891 8 9.75 8C9.55109 8 9.36032 7.92098 9.21967 7.78033C9.07902 7.63968 9 7.44891 9 7.25Z" fill="#0F3F4F"/>
+</svg>

src/components/MenuDrawer/index.tsx

@@ -17,6 +17,7 @@ import UserXMark from '../../../assets/icons/user-xmark.svg';
 import InfoIcon from 'assets/icons/info-solid.svg';
 import BellIcon from 'assets/icons/notifications/bell-solid.svg';
 import SharingIcon from 'assets/icons/location-sharing.svg';
+import BagIcon from 'assets/icons/bag.svg';
 
 import { APP_VERSION } from 'src/constants';
 import { useNotification } from 'src/contexts/NotificationContext';
@@ -123,6 +124,12 @@ export const MenuDrawer = (props: any) => {
               }
             />
           )}
+          <MenuButton
+            label="Shop"
+            icon={<BagIcon fill={Colors.DARK_BLUE} width={20} height={20} />}
+            red={false}
+            buttonFn={() => Linking.openURL('https://nomadmania.com/product-category/merchandise/')}
+          />
         </View>
 
         <View style={styles.bottomMenu}>

src/components/MenuDrawer/styles.tsx

@@ -7,12 +7,10 @@ export const styles = StyleSheet.create({
     marginHorizontal: '10%'
   },
   logoContainer: {
-    flex: 1,
     justifyContent: 'center',
     alignItems: 'center'
   },
   bottomMenu: {
-    flex: 1,
     justifyContent: 'flex-end'
   },
   logo: {

src/screens/InAppScreens/MapScreen/index.tsx

@@ -401,6 +401,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
 
           const cachedUrl = await ExpoImage.getCachePathAsync(img);
           const cachedUrlVisited = await ExpoImage.getCachePathAsync(imgVisited);
+
           if (!cachedUrl || !cachedUrlVisited) {
             ExpoImage.prefetch([img, imgVisited]);
           }
@@ -428,7 +429,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
             feature.properties.icon_key = user_id;
           }
 
-          if (avatarPath) {
+          if (avatarPath && !images[user_id]) {
             const cachedUrls = await ExpoImage.getCachePathAsync(avatarUrl.uri);
             if (!cachedUrls) {
               ExpoImage.prefetch([`${API_HOST}${avatarPath}`]);
@@ -1373,7 +1374,6 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
               id="nomads_circle_outline"
               filter={['!', ['has', 'point_count']]}
               aboveLayerID={Platform.OS === 'android' ? 'place-continent' : undefined}
-              belowLayerID="nomads_symbol"
               style={{
                 circleRadius: ['interpolate', ['linear'], ['zoom'], 0, 15, 5, 18, 10, 21, 15, 24, 20, 27],
                 circleColor: 'rgba(255, 126, 0, 1)',
@@ -1385,7 +1385,7 @@ const MapScreen: any = ({ navigation, route }: { navigation: any; route: any })
             <MapLibreGL.SymbolLayer
               id="nomads_symbol"
               filter={['!', ['has', 'point_count']]}
-              aboveLayerID={Platform.OS === 'android' ? 'place-continent' : undefined}
+              aboveLayerID={"nomads_circle_outline"}
               style={{
                 iconImage: ['get', 'icon_key'],
                 iconSize: [