ordering-ui-react-native 0.12.13 → 0.12.14

package/package.json

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

package/src/components/GoogleMap/index.tsx

@@ -41,7 +41,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
     ERROR_NOT_FOUND_ADDRESS: 'Sorry, we couldn\'t find an address',
     ERROR_MAX_LIMIT_LOCATION_TO: 'Sorry, You can only set the position to'
   }
-  const MARKERS = locations && locations.map((location: { lat: number, lng: number }) => {
+  let MARKERS = locations && locations.map((location: { lat: number, lng: number }) => {
     return {
       latitude: location.lat,
       longitude: location.lng
@@ -176,6 +176,17 @@ export const GoogleMap = (props: GoogleMapsParams) => {
     return () => clearInterval(interval)
   }, [locations])
 
+  useEffect(() => {
+    if(!locations) return
+    locations[0] = {...locations[0], lat: location.lat, lng: location.lng}
+    MARKERS = locations && locations.map((location: { lat: number, lng: number }) => {
+      return {
+        latitude: location.lat,
+        longitude: location.lng
+      }
+    })
+  }, [location])
+
   return (
     <>
       <MapView

package/src/components/OrderDetails/index.tsx

@@ -208,7 +208,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
   }, [messagesReadList])
 
-  const locations = [
+  let locations = [
     { ...order?.driver?.location, title: t('DRIVER', 'Driver'), icon: order?.driver?.photo || 'https://res.cloudinary.com/demo/image/fetch/c_thumb,g_face,r_max/https://www.freeiconspng.com/thumbs/driver-icon/driver-icon-14.png' },
     { ...order?.business?.location, title: order?.business?.name, icon: order?.business?.logo || theme.images.dummies.businessLogo },
     { ...order?.customer?.location, title: t('YOUR_LOCATION', 'Your Location'), icon: order?.customer?.photo || 'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png' }
@@ -216,7 +216,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
   useEffect(() => {
     if (driverLocation) {
-      locations[0] = driverLocation
+      locations[0] = {...locations[0], lat: driverLocation.lat, lng: driverLocation.lng}
     }
   }, [driverLocation])
 
@@ -361,9 +361,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   {order?.driver?.location && parseInt(order?.status) === 9 && (
                     <Map>
                       <GoogleMap
-                        location={order?.driver?.location}
+                        location={driverLocation ?? order?.driver?.location}
                         locations={locations}
-                        readOnly
                       />
                     </Map>
                   )}