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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.15.66-test",
+  "version": "0.15.68",
   "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/src/utils/index.tsx

@@ -34,6 +34,7 @@ export const getTraduction = (key: string, t: any) => {
     ERROR_ADD_PRODUCT_VERY_FAR_FOR_DELIVERY: 'Error adding product, very far for delivery',
     ERROR_PRODUCT_NOT_FOUND: 'Error with the product',
     ERROR_ADD_BUSINESS_INVALID: 'An error occurred with the business',
+    ERROR_INVALID_OFFER: 'The offer doesn\'t exist'
   }
 
   return keyList[key] ? t(key, keyList[key]) : t(key)

package/themes/original/index.tsx

@@ -45,7 +45,7 @@ import { UpsellingProducts } from './src/components/UpsellingProducts';
 import { UserVerification } from './src/components/UserVerification';
 import { BusinessListingSearch } from './src/components/BusinessListingSearch';
 import { LastOrders } from './src/components/LastOrders';
-import  NavBar from './src/components/NavBar';
+import NavBar from './src/components/NavBar';
 import { BusinessTypeFilter } from './src/components/BusinessTypeFilter';
 import { BusinessController } from './src/components/BusinessController';
 import { BusinessFeaturedController } from './src/components/BusinessFeaturedController';
@@ -81,17 +81,17 @@ import { SingleProductReview } from './src/components/SingleProductReview';
 import { LogoutButton } from './src/components/LogoutButton';
 import { UserFormDetailsUI } from './src/components/UserFormDetails';
 import { WalletTransactionItem } from './src/components/WalletTransactionItem';
-
+import { Promotions } from './src/components/Promotions'
 import { USER_TYPE, ORDER_TYPES } from './src/config/constants'
 
 import { OSBill, OSTable, OSCoupon, OSTotal, OSRow } from './src/components/OrderSummary/styles';
 
 import { FormInput, FormSide, ButtonsWrapper, LoginWith, OTab, OTabs } from './src/components/LoginForm/styles';
-import { OSItem, OSItemContent, OSItemActions} from './src/components/PaymentOptionStripe/styles';
+import { OSItem, OSItemContent, OSItemActions } from './src/components/PaymentOptionStripe/styles';
 
 import Alert from './src/providers/AlertProvider'
 
-import { 
+import {
 	LoginParams,
 	ProfileParams,
 	AddressListParams,
@@ -134,7 +134,7 @@ import {
 	OAlert,
 	OModal,
 	OBottomPopup,
-  	HeaderTitle
+	HeaderTitle
 } from './src/components/shared';
 
 import { Container } from './src/layouts/Container';
@@ -176,7 +176,7 @@ export {
 	BusinessMenuList,
 	UserProfile,
 	MessageListing,
-  	Messages,
+	Messages,
 	Help,
 	HelpAccountAndPayment,
 	HelpGuide,
@@ -231,7 +231,7 @@ export {
 	LogoutButton,
 	UserFormDetailsUI,
 	WalletTransactionItem,
-
+	Promotions,
 	ORDER_TYPES,
 	USER_TYPE,
 
@@ -296,7 +296,7 @@ export {
 	OAlert,
 	OModal,
 	OBottomPopup,
- 	HeaderTitle,
+	HeaderTitle,
 
 	// layout
 	Container,

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}

package/themes/original/src/components/Promotions/styles.tsx

@@ -24,15 +24,6 @@ export const SearchBarContainer = styled.View`
   width: 100%;
   justify-content: flex-start;
   margin-bottom: 20px;
-  .search-bar {
-    justify-content: flex-start;
-    input {
-      width: 100%;
-    }
-  }
-  .clear {
-    right: 0;
-  }
 `
 
 export const SingleBusinessOffer = styled.View`
@@ -48,11 +39,6 @@ export const OfferData = styled.View`
   display: flex;
   align-items: center;
   flex-direction: column;
-  p{
-    color: #909BA9;
-    margin: 3px;
-    font-size: 14px;
-  }
 `
 
 export const Code = styled.View`
@@ -62,14 +48,7 @@ export const Code = styled.View`
   margin-bottom: 10px;
 `
 
-export const ValueOfOffer = styled.View`
-  p{
-    font-size: 16px;
-  }
-  span{
-    font-size: 20px;
-  }
-`
+export const ValueOfOffer = styled.View``
 
 export const BusinessInfo = styled.View`
   flex: 1;

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

@@ -109,7 +109,7 @@ const ProfileListUI = (props: ProfileParams) => {
 	const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
 
 	const isWalletEnabled = configs?.wallet_enabled?.value === '1' && (configs?.wallet_cash_enabled?.value === '1' || configs?.wallet_credit_point_enabled?.value === '1')
-	const IsPromotionsEnabled = configs?.advanced_offers_module === '1' || configs?.advanced_offers_module === 'true'
+	const IsPromotionsEnabled = configs?.advanced_offers_module?.value === '1' || configs?.advanced_offers_module?.value === true
 	const onRedirect = (route: string, params?: any) => {
 		navigation.navigate(route, params)
 	}

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

@@ -63,7 +63,7 @@ const WalletsUI = (props: any) => {
 
   const currentWalletSelected = (walletList.wallets?.length > 0 && walletList.wallets?.find((w: any) => w.type === tabSelected)) ?? null
 
-  const loyaltyLevel = Object.keys(user?.loyalty_level).length > 0 && user?.loyalty_level
+  const loyaltyLevel = Object.keys(user?.loyalty_level ?? {}).length > 0 && user?.loyalty_level
 
   const walletName: any = {
     cash: {

package/themes/original/src/utils/index.tsx

@@ -33,7 +33,8 @@ export const getTraduction = (key: string) => {
     ERROR_PLACE_PAY_WITH_CARD1: 'An error occurred while trying to pay by card',
     ERROR_PLACE_PAY_WITH_PAYPAL_CAPTURE: 'An error occurred while trying to pay by PayPal',
     ERROR_ADD_PRODUCT_VERY_FAR_FOR_DELIVERY: 'Error adding product, very far for delivery',
-    ERROR_PRODUCT_NOT_FOUND: 'Error with the product'
+    ERROR_PRODUCT_NOT_FOUND: 'Error with the product',
+    ERROR_INVALID_OFFER: 'The offer doesn\'t exist'
   }
 
   return keyList[key] ? t(key, keyList[key]) : t(key)