ordering-ui-react-native 0.18.57 → 0.18.58-test1

package/package.json

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

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

@@ -6,6 +6,7 @@ import {
 	Keyboard,
 	TouchableWithoutFeedback,
 	Platform,
+	Text,
 } from 'react-native';
 import {
 	AddressForm as AddressFormController,
@@ -123,7 +124,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 		},
 		wrapperNavbar: Platform.OS === 'ios'
 			? { paddingVertical: 0, paddingLeft: 40, paddingRight: 20 }
-			: { paddingVertical: 20, paddingLeft: 40, paddingRight: 20 }
+			: { paddingVertical: 10, paddingLeft: 40, paddingRight: 20 }
 	});
 
 	const [, t] = useLanguage();
@@ -145,6 +146,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 		address: null,
 	});
 	const [isFirstTime, setIsFirstTime] = useState(true);
+	const [errorState, setErrorState] = useState({});
 	const [locationChange, setLocationChange] = useState(
 		isEditing
 			? addressState?.address?.location
@@ -176,7 +178,6 @@ const AddressFormUI = (props: AddressFormParams) => {
 
 	const getAddressFormatted = (address: any) => {
 		const data: any = { address: null, error: null };
-		Geocoder.init(googleMapsApiKey);
 		Geocoder.from(address)
 			.then((json) => {
 				if (json.results && json.results?.length > 0) {
@@ -345,6 +346,10 @@ const AddressFormUI = (props: AddressFormParams) => {
 	};
 
 	const handleChangeAddress = (data: any, details: any) => {
+		setErrorState({
+			...errorState,
+			handleChangeAddress: {data: data, details: details}
+		})
 		const addressSelected = {
 			address: data?.description || data?.address,
 			location: details?.geometry?.location,
@@ -491,6 +496,10 @@ const AddressFormUI = (props: AddressFormParams) => {
 		}
 	}, []);
 
+	useEffect(() => {
+		Geocoder.init(googleMapsApiKey);
+	}, [googleMapsApiKey]);
+
 	useEffect(() => {
 		const keyboardDidShowListener = Keyboard.addListener(
 			'keyboardDidShow',
@@ -535,7 +544,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 				/>
 			</View>
 			<TouchableWithoutFeedback onPress={Keyboard.dismiss}>
-				<AddressFormContainer style={{ height: HEIGHT_SCREEN * .78, overflow: 'scroll' }}>
+				<AddressFormContainer style={{ overflow: 'scroll' }}>
 					<View>
 						<FormInput>
 							<AutocompleteInput>
@@ -640,6 +649,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 													}
 												}}
 												IconButton={<OIcon src={theme.images.general.pin} width={16} />}
+												isIntGeoCoder
+												errorState={errorState}
+												setErrorState={setErrorState}
 											/>
 										</View>
 									)}
@@ -661,6 +673,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 											saveLocation={saveMapLocation}
 											setSaveLocation={setSaveMapLocation}
 											handleToggleMap={handleToggleMap}
+											isIntGeoCoder
 										/>
 									</GoogleMapContainer>
 								</View>
@@ -803,6 +816,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 								/>
 							)}
 						</FormInput>
+						<Text>
+							{JSON.stringify(errorState)}
+						</Text>
 						{!isHideIcons && (
 							<IconsContainer>
 								{tagsName.map((tag) => (
@@ -871,6 +887,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 									saveLocation={saveMapLocation}
 									setSaveLocation={setSaveMapLocation}
 									handleToggleMap={handleToggleMap}
+									isIntGeoCoder
 								/>
 							</GoogleMapContainer>
 						)}

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

@@ -281,7 +281,9 @@ const CartUI = (props: any) => {
                     <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_1' })}>
                       <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />
                     </TouchableOpacity>
-                    <OfferAlert offerId={offer?.id} />
+                    {!!offer?.id && (
+                      <OfferAlert offerId={offer?.id} />
+                    )}
                   </OSRow>
                   <OText size={12} lineHeight={18}>
                     - {parsePrice(offer?.summary?.discount)}
@@ -343,7 +345,7 @@ const CartUI = (props: any) => {
                     <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_3' })}>
                       <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />
                     </TouchableOpacity>
-                    {!offer?.type && (
+                    {!offer?.type && !!offer?.id && (
                       <OfferAlert offerId={offer?.id} />
                     )}
                   </OSRow>
@@ -370,7 +372,9 @@ const CartUI = (props: any) => {
                     <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_2' })}>
                       <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />
                     </TouchableOpacity>
-                    <OfferAlert offerId={offer?.id} />
+                    {!!offer?.id && (
+                      <OfferAlert offerId={offer?.id} />
+                    )}
                   </OSRow>
                   <OText size={12} lineHeight={18}>
                     - {parsePrice(offer?.summary?.discount)}

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

@@ -3,6 +3,14 @@ import Geocoder from 'react-native-geocoding'
 import { ActivityIndicator } from 'react-native-paper'
 import Geolocation from '@react-native-community/geolocation'
 import { getTrackingStatus, requestTrackingPermission } from 'react-native-tracking-transparency'
+import { Platform } from 'react-native'
+
+import {
+	PERMISSIONS,
+	PermissionStatus,
+	request,
+	openSettings,
+} from 'react-native-permissions';
 
 import { OText } from '../shared'
 import { GpsButtonStyle } from './styles'
@@ -12,7 +20,10 @@ export const GPSButton = (props: any) => {
     handleGPS,
 		apiKey,
     IconButton,
-    IconLoadingButton
+    IconLoadingButton,
+    isIntGeoCoder,
+    errorState,
+    setErrorState
   } = props
 
 	const [isLoading, setLoading] = useState(false);
@@ -22,6 +33,10 @@ export const GPSButton = (props: any) => {
       latitude: pos.latitude,
       longitude: pos.longitude
     }).then(({ results }: any) => {
+      setErrorState({
+        ...errorState,
+        geoCodePosition: results
+      })
       let zipcode = null
       if (results && results.length > 0) {
         for (const component of results[0].address_components) {
@@ -31,7 +46,7 @@ export const GPSButton = (props: any) => {
             break
           }
         }
-        let data = null
+        let data : any
         const details = {
           geometry: { location: { lat: pos.latitude, lng: pos.longitude } }
         }
@@ -51,6 +66,10 @@ export const GPSButton = (props: any) => {
 			setLoading(false);
     }).catch((err: any) => {
       console.log(err);
+      setErrorState({
+        ...errorState,
+        fallbackGeoCodePosition: err
+      })
 			setLoading(false);
     })
   }
@@ -60,22 +79,64 @@ export const GPSButton = (props: any) => {
     if (trackingStatus === 'not-determined') {
       trackingStatus = await requestTrackingPermission()
     }
+    setErrorState({
+      ...errorState,
+      trackingStatus: trackingStatus
+    })
     if (trackingStatus === 'authorized' || trackingStatus === 'unavailable') {
       setLoading(true)
       Geolocation.getCurrentPosition((pos) => {
+        setErrorState({
+          ...errorState,
+          getCurrentPosition: pos
+        })
         geoCodePosition(pos.coords)
       }, (err) => {
+        setErrorState({
+          ...errorState,
+          fallbackGetCurrentPosition: err
+        })
         setLoading(false);
         console.log(`ERROR(${err.code}): ${err.message}`)
       }, {
         enableHighAccuracy: true, timeout: 15000, maximumAge: 10000
       })
+      return
     }
+    let permissionStatus: PermissionStatus;
+		setLoading(true)
+		if (Platform.OS === 'ios') {
+		  permissionStatus = await request(PERMISSIONS.IOS.LOCATION_WHEN_IN_USE);
+		} else {
+		  permissionStatus = await request(
+			  PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION,
+		  );
+		}
+    if (permissionStatus === 'denied') {
+		  openSettings();
+		}
+    Geolocation.getCurrentPosition((pos) => {
+      setErrorState({
+        ...errorState,
+        getCurrentPositionNew: pos
+      })
+      geoCodePosition(pos.coords)
+    }, (err) => {
+      setErrorState({
+        ...errorState,
+        fallbackGetCurrentPositionNew: err
+      })
+      setLoading(false);
+      console.log(`ERROR(${err.code}): ${err.message}`)
+    }, {
+      enableHighAccuracy: true, timeout: 15000, maximumAge: 10000
+    })
   }
 
   useEffect(() => {
+    if (isIntGeoCoder) return
     Geocoder.init(apiKey);
-  }, [])
+  }, [isIntGeoCoder])
 
   return (
     <GpsButtonStyle

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

@@ -18,7 +18,8 @@ export const GoogleMap = (props: GoogleMapsParams) => {
     saveLocation,
     setSaveLocation,
     handleToggleMap,
-    locations
+    locations,
+    isIntGeoCoder
   } = props
 
   const [, t] = useLanguage()
@@ -161,8 +162,9 @@ export const GoogleMap = (props: GoogleMapsParams) => {
   }
 
   useEffect(() => {
+    if (isIntGeoCoder) return
     Geocoder.init(googleMapsApiKey)
-  }, [])
+  }, [isIntGeoCoder])
 
   useEffect(() => {
     mapRef.current.animateToRegion({

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

@@ -169,7 +169,9 @@ const OrderSummaryUI = (props: any) => {
                       <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_1' })}>
                         <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />
                       </TouchableOpacity>
-                      <OfferAlert offerId={offer?.id} />
+                      {!!offer?.id && (
+                        <OfferAlert offerId={offer?.id} />
+                      )}
                     </OSRow>
                     <OText size={12}>
                       - {parsePrice(offer?.summary?.discount)}
@@ -233,7 +235,9 @@ const OrderSummaryUI = (props: any) => {
                       <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_3' })}>
                         <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />
                       </TouchableOpacity>
-                      <OfferAlert offerId={offer?.id} />
+                      {!!offer?.id && (
+                        <OfferAlert offerId={offer?.id} />
+                      )}
                     </OSRow>
                     <OText size={12}>
                       - {parsePrice(offer?.summary?.discount)}
@@ -258,7 +262,9 @@ const OrderSummaryUI = (props: any) => {
                       <TouchableOpacity style={{ marginLeft: 3 }} onPress={() => setOpenTaxModal({ open: true, data: offer, type: 'offer_target_2' })}>
                         <AntIcon name='infocirlceo' size={16} color={theme.colors.primary} />
                       </TouchableOpacity>
-                      <OfferAlert offerId={offer?.id} />
+                      {!!offer?.id && (
+                        <OfferAlert offerId={offer?.id} />
+                      )}
                     </OSRow>
                     <OText size={12}>
                       - {parsePrice(offer?.summary?.discount)}

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

@@ -629,7 +629,8 @@ export interface GoogleMapsParams {
 	isSetInputs?: boolean,
 	locations?: Array<any>,
 	setSaveLocation?: (val: boolean) => void,
-	handleToggleMap?: () => void
+	handleToggleMap?: () => void,
+	isIntGeoCoder: boolean
 }
 
 export interface HelpParams {