ordering-ui-react-native 0.24.3 → 0.24.4

package/package.json

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

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

@@ -33,9 +33,7 @@ const styles = StyleSheet.create({
 
 const MapViewComponent = (props: MapViewParams) => {
   const {
-    isLoadingBusinessMarkers,
-    markerGroups,
-    customerMarkerGroups,
+    assingnedOrders,
     alertState,
     setAlertState,
     setDriverLocation,
@@ -65,7 +63,7 @@ const MapViewComponent = (props: MapViewParams) => {
     return { lat: userLocation?.latitude, lng: userLocation?.longitude }
   }, [userLocation?.latitude, userLocation?.longitude])
 
-  const haveOrders = Object.values(markerGroups)?.length > 0 && Object.values(customerMarkerGroups)?.length > 0
+  const haveOrders = Object.values(assingnedOrders?.orders)?.length > 0 && assingnedOrders?.orders?.some(order => order?.customer?.id)
   const closeAlert = () => {
     setAlertState({
       open: false,
@@ -165,7 +163,7 @@ const MapViewComponent = (props: MapViewParams) => {
   return (
     <SafeAreaView style={{ flex: 1 }}>
       <View style={{ flex: 1 }}>
-        {(isDeliveryApp || (!isLoadingBusinessMarkers && isFocused)) && !!initialPosition?.latitude && !!initialPosition?.longitude && (
+        {(isDeliveryApp || (!assingnedOrders?.loading && isFocused)) && !!initialPosition?.latitude && !!initialPosition?.longitude && (
           <View style={{ flex: 1 }}>
             <MapView
               ref={mapRef}
@@ -185,20 +183,18 @@ const MapViewComponent = (props: MapViewParams) => {
               onTouchStart={() => (following.current = false)}
             >
               <>
-                {Object.values(markerGroups).map((marker: any) => (
+                {assingnedOrders?.orders.map((marker: any) => (
                   <RenderMarker
                     {...renderMarkerDefaultProps}
-                    key={marker[0]?.business_id}
-                    marker={marker[0]}
-                    orderIds={marker.map((order: any) => order.id).join(', ')}
+                    key={`${marker?.id}_${marker?.business_id}`}
+                    marker={marker}
                   />
                 ))}
-                {Object.values(customerMarkerGroups).map((marker: any) => (
+                {assingnedOrders?.orders.map((marker: any) => (
                   <RenderMarker
                     {...renderMarkerDefaultProps}
-                    key={marker[0]?.customer_id}
-                    marker={marker[0]}
-                    orderIds={marker.map((order: any) => order.id).join(', ')}
+                    key={`${marker?.id}_${marker?.customer_id}`}
+                    marker={marker}
                     customer
                   />
                 ))}

package/themes/business/src/types/index.tsx

@@ -623,7 +623,8 @@ export interface MapViewParams {
   markerGroups: Array<any>,
   customerMarkerGroups: Array<any>,
   alertState: { open: boolean, content: Array<string>, key?: string | null },
-  setAlertState: ({ open, content, key }: { open: boolean, content: Array<string>, key?: string | null }) => void
+  setAlertState: ({ open, content, key }: { open: boolean, content: Array<string>, key?: string | null }) => void,
+  assingnedOrders?: any
 }
 
 export interface ReviewCustomerParams {
@@ -657,7 +658,7 @@ export interface SessionsParams {
 }
 
 export interface RenderMarkerParams {
-  key?: number,
+  key?: string,
   marker: any,
   customer?: boolean,
   orderIds?: Array<number>