ordering-ui-react-native 0.22.47 → 0.22.48

package/package.json

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

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

@@ -378,8 +378,8 @@ export const DriverMap = (props: GoogleMapsParams) => {
               <>
                 <Marker
                   coordinate={{
-                    latitude: destination.latitude,
-                    longitude: destination.longitude
+                    latitude: typeof destination?.latitude !== 'object' ? destination?.latitude : 0,
+                    longitude: typeof destination?.longitude !== 'object' ? destination?.latitude : 0
                   }}
                   title={location.title}>
                   <Icon
@@ -397,8 +397,8 @@ export const DriverMap = (props: GoogleMapsParams) => {
                   </View>
                 </Marker>
                 <Marker coordinate={{
-                  latitude: parsedUserLocation.latitude,
-                  longitude: parsedUserLocation.longitude
+                  latitude: typeof parsedUserLocation?.latitude !== 'object' ? parsedUserLocation?.latitude : 0,
+                  longitude: typeof parsedUserLocation?.longitude !== 'object' ? parsedUserLocation?.latitude : 0
                 }}>
                   <View style={styles.driverIcon}>
                     <OIcon
@@ -413,8 +413,8 @@ export const DriverMap = (props: GoogleMapsParams) => {
             ) : (
               <Marker
                 coordinate={{
-                  latitude: parsedUserLocation.latitude,
-                  longitude: parsedUserLocation.longitude
+                  latitude: typeof parsedUserLocation?.latitude !== 'object' ? parsedUserLocation?.latitude : 0,
+                  longitude: typeof parsedUserLocation?.longitude !== 'object' ? parsedUserLocation?.latitude : 0
                 }}
                 title={markerTitle || t('YOUR_LOCATION', 'Your Location')}
               />

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

@@ -55,10 +55,13 @@ const MapViewComponent = (props: MapViewParams) => {
     if (mapRef.current) {
       mapRef.current.fitToCoordinates(
         [
-          { latitude: location.latitude ?? 0, longitude: location.longitude ?? 0},
           {
-            latitude: userLocation?.latitude,
-            longitude: userLocation?.longitude,
+            latitude: typeof location?.latitude !== 'object' ? location?.latitude : 0,
+            longitude: typeof location?.longitude !== 'object' ? location?.latitude : 0
+          },
+          {
+            latitude: typeof userLocation?.latitude !== 'object' ? userLocation?.latitude : 0,
+            longitude: typeof userLocation?.longitude !== 'object' ? userLocation?.latitude : 0
           },
         ],
         {
@@ -133,8 +136,8 @@ const MapViewComponent = (props: MapViewParams) => {
   const RenderMarker = ({ marker, customer, orderIds }: { marker: any, customer?: boolean, orderIds?: Array<number> }) => {
     const markerRef = useRef<any>()
 
-    let coordinateLat = (customer ? marker?.customer?.location?.lat : marker?.business?.location?.lat) ?? initialPosition?.latitude
-    let coordinateLng = (customer ? marker?.customer?.location?.lng : marker?.business?.location?.lng) ?? initialPosition?.longitude
+    let coordinateLat = (customer ? marker?.customer?.location?.lat || 0 : marker?.business?.location?.lat || 0) ?? (initialPosition?.latitude || 0)
+    let coordinateLng = (customer ? marker?.customer?.location?.lng || 0 : marker?.business?.location?.lng || 0) ?? (initialPosition?.longitude || 0)
 
     useEffect(() => {
       if (