ordering-ui-react-native 0.15.66-test → 0.15.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.15.66-test",
+  "version": "0.15.66",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",
@@ -90,7 +90,7 @@
     "react-native-linear-gradient": "^2.5.6",
     "react-native-loading-spinner-overlay": "^2.0.0",
     "react-native-map-link": "^2.8.2",
-    "react-native-maps": "0.31.1",
+    "react-native-maps": "^0.28.0",
     "react-native-modal-dropdown": "^1.0.1",
     "react-native-onesignal": "^4.1.1",
     "react-native-paper": "^4.7.2",

package/themes/original/src/components/GoogleMap/index.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react'
 import { Dimensions, StyleSheet, View, Platform } from 'react-native';
-import MapView, { PROVIDER_DEFAULT, PROVIDER_GOOGLE, Marker, Region, enableLatestRenderer} from 'react-native-maps'
+import MapView, { PROVIDER_DEFAULT, PROVIDER_GOOGLE, Marker, Region, } from 'react-native-maps'
 import Geocoder from 'react-native-geocoding';
 import { useLanguage, useConfig } from 'ordering-components/native'
 import { GoogleMapsParams } from '../../types';
@@ -152,26 +152,11 @@ export const GoogleMap = (props: GoogleMapsParams) => {
       animated: true,
     });
   }
-  
-  const handleEnableLatestRenderer = async () => {
-    try {
-      const result = await enableLatestRenderer()
-      if (result == 'LATEST') {
-        setMapErrors && setMapErrors('Latest')
-      }else {
-        setMapErrors && setMapErrors('Legacy')
-      }
-     
-    } catch (error: any) {
-      setMapErrors && setMapErrors(error)
-    }
-  }
 
   useEffect(() => {
-    handleEnableLatestRenderer()
     Geocoder.init(googleMapsApiKey)
   }, [])
-  
+
 
   useEffect(() => {
     if (saveLocation) {

package/themes/original/src/components/OrderDetails/index.tsx

@@ -94,6 +94,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [isReviewed, setIsReviewed] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, tax: null, type: '' })
   const { order, businessData } = props.order;
+  const mapValidStatuses = [9, 19, 23]
 
   const walletName: any = {
     cash: {
@@ -680,7 +681,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               )}
               {order?.driver && (
                 <>
-                  {order?.driver?.location && parseInt(order?.status) === 9 && (
+                  {order?.driver?.location && mapValidStatuses.includes(parseInt(order?.status)) && (
                     <Map>
                       <GoogleMap
                         location={order?.driver?.location}