ordering-ui-react-native 0.23.74-test → 0.23.74-test3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.23.74-test",
+  "version": "0.23.74-test3",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/MapView/index.tsx

@@ -143,20 +143,17 @@ const MapViewComponent = (props: MapViewParams) => {
     let coordinateLat = (customer
       ? typeof marker?.customer?.location?.lat === 'number' && !Number.isNaN(marker?.customer?.location?.lat)
         ? marker?.customer?.location?.lat
-        : initialPosition?.latitude || 0
+        : 0
       : typeof marker?.business?.location?.lat === 'number' && !Number.isNaN(marker?.business?.location?.lat)
         ? marker?.business?.location?.lat
-        : initialPosition?.latitude || 0
-    ) ?? 0;
-
+        : 0) ?? (initialPosition?.latitude || 0)
     let coordinateLng = (customer
       ? typeof marker?.customer?.location?.lng === 'number' && !Number.isNaN(marker?.customer?.location?.lng)
         ? marker?.customer?.location?.lng
-        : initialPosition?.longitude || 0
+        : 0
       : typeof marker?.business?.location?.lng === 'number' && !Number.isNaN(marker?.business?.location?.lng)
         ? marker?.business?.location?.lng
-        : initialPosition?.longitude || 0
-    ) ?? 0;
+        : 0) ?? (initialPosition?.longitude || 0)
 
     useEffect(() => {
       if (
@@ -254,7 +251,7 @@ const MapViewComponent = (props: MapViewParams) => {
   return (
     <SafeAreaView style={{ flex: 1 }}>
       <View style={{ flex: 1 }}>
-        {!isLoadingBusinessMarkers && isFocused && (
+        {!isLoadingBusinessMarkers && isFocused ? (
           <View style={{ flex: 1 }}>
             <MapView
               ref={mapRef}
@@ -274,42 +271,44 @@ const MapViewComponent = (props: MapViewParams) => {
               onTouchStart={() => (following.current = false)}
             >
               <>
-                {Object.values(markerGroups).map((marker: any) => (
+                {Object.values(markerGroups).length ? (Object.values(markerGroups).map((marker: any) => (
                   <RenderMarker
                     key={marker[0]?.business_id}
                     marker={marker[0]}
                     orderIds={marker.map((order: any) => order.id).join(', ')}
                   />
-                ))}
-                {Object.values(customerMarkerGroups).map((marker: any) => (
+                ))) : null}
+                {Object.values(customerMarkerGroups).length ? (Object.values(customerMarkerGroups).map((marker: any) => (
                   <RenderMarker
                     key={marker[0]?.customer_id}
                     marker={marker[0]}
                     orderIds={marker.map((order: any) => order.id).join(', ')}
                     customer
                   />
-                ))}
-                <Marker
-                  coordinate={{
-                    latitude: typeof location.lat === 'number' && !Number.isNaN(location.lat) ? location.lat : 0,
-                    longitude: typeof location.lng === 'number' && !Number.isNaN(location.lng) ? location.lng : 0,
-                  }}
-                  title={t('YOUR_LOCATION', 'Your Location')}
-                >
-                  <Icon
-                    name="map-marker"
-                    size={50}
-                    color={theme.colors.primary}
-                  />
-                  <View style={styles.view}>
-                    <OIcon
-                      style={styles.image}
-                      src={{ uri: user.photo }}
-                      width={25}
-                      height={25}
+                ))) : null}
+                {typeof location.lat === 'number' && !Number.isNaN(location.lat) && typeof location.lng === 'number' && !Number.isNaN(location.lng) ? (
+                  <Marker
+                    coordinate={{
+                      latitude: typeof location.lat === 'number' && !Number.isNaN(location.lat) ? location.lat : 0,
+                      longitude: typeof location.lng === 'number' && !Number.isNaN(location.lng) ? location.lng : 0,
+                    }}
+                    title={t('YOUR_LOCATION', 'Your Location')}
+                  >
+                    <Icon
+                      name="map-marker"
+                      size={50}
+                      color={theme.colors.primary}
                     />
-                  </View>
-                </Marker>
+                    <View style={styles.view}>
+                      <OIcon
+                        style={styles.image}
+                        src={{ uri: user.photo }}
+                        width={25}
+                        height={25}
+                      />
+                    </View>
+                  </Marker>
+                ) : null}
               </>
             </MapView>
             <OFab
@@ -333,7 +332,7 @@ const MapViewComponent = (props: MapViewParams) => {
               }}
             />
           </View>
-        )}
+        ) : null}
       </View>
       <View>
         <Alert