ordering-ui-react-native 0.16.51 → 0.16.54

package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx

@@ -19,6 +19,7 @@ import {
 	useOrder,
 	useConfig,
 	useUtils,
+	useOrderingTheme
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import Ionicons from 'react-native-vector-icons/Ionicons'
@@ -33,11 +34,14 @@ import {
 	FeaturedWrapper,
 	OrderProgressWrapper,
 	FarAwayMessage,
-	AddressInputContainer
+	AddressInputContainer,
+	PreorderInput,
+	OrderTypesContainer,
+	BusinessLogosContainer
 } from './styles';
 
 import { SearchBar } from '../../../SearchBar';
-import { OIcon, OText } from '../../../shared';
+import { OButton, OIcon, OText, OBottomPopup, OModal } from '../../../shared';
 import { BusinessesListingParams } from '../../../../types';
 import { NotFoundSource } from '../../../NotFoundSource';
 import { BusinessTypeFilter } from '../../../BusinessTypeFilter';
@@ -49,6 +53,7 @@ import { HighestRatedBusinesses } from '../../../HighestRatedBusinesses';
 import { getTypesText, convertToRadian } from '../../../../utils';
 import { OrderProgress } from '../../../OrderProgress';
 import { useFocusEffect, useIsFocused } from '@react-navigation/native';
+import FastImage from 'react-native-fast-image';
 
 const PIXELS_TO_SCROLL = 2000;
 
@@ -64,12 +69,19 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		handleChangeSearch,
 		businessId,
 		isGuestUser,
-		handleUpdateBusinessList
+		handleUpdateBusinessList,
+		citiesState,
+		actualSlug,
+		logosLayout
 	} = props;
 	const theme = useTheme();
+	const [orderingTheme] = useOrderingTheme()
 	const isFocused = useIsFocused();
 	const appState = useRef(AppState.currentState)
+	const searchBarRef = useRef<any>()
 	const [appStateVisible, setAppStateVisible] = useState(appState.current);
+	const isChewLayout = theme?.layouts?.header?.components?.layout?.type === 'chew'
+	const showCities = !orderingTheme?.theme?.business_listing_view?.components?.cities?.hidden
 	const [refreshing] = useState(false);
 	const styles = StyleSheet.create({
 		container: {
@@ -114,13 +126,20 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 			backgroundColor: theme.colors.white,
 			borderColor: theme.colors.backgroundGray,
 			borderWidth: 1,
+		},
+		buttonCityStyle: {
+			backgroundColor: theme.colors.white,
+			borderColor: theme.colors.backgroundGray,
+			borderRadius: 8,
+			marginHorizontal: 40,
+			height: 45
 		}
 	});
 
 
 	const [, t] = useLanguage();
 	const [{ user, auth }] = useSession();
-	const [orderState] = useOrder();
+	const [orderState, { changeCityFilter }] = useOrder();
 	const [{ configs }] = useConfig();
 	const [{ parseDate }] = useUtils();
 
@@ -130,11 +149,13 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 	const [isFarAway, setIsFarAway] = useState(false)
 	const [businessTypes, setBusinessTypes] = useState(null)
 	const [orderTypeValue, setOrderTypeValue] = useState(orderState?.options.value)
+	const [isOpenCities, setIsOpenCities] = useState(false)
 	const isPreorderEnabled = (configs?.preorder_status_enabled?.value === '1' || configs?.preorder_status_enabled?.value === 'true') &&
 		Number(configs?.max_days_preorder?.value) > 0
 	const isPreOrderSetting = configs?.preorder_status_enabled?.value === '1'
 	const timerId = useRef<any>(false)
 	const [favoriteIds, setFavoriteIds] = useState<any>([])
+	const chewOrderTypes = [{ name: t('DELIVERY', 'Delivery').toUpperCase(), value: 1 }, { name: t('PICKUP', 'Pickup').toUpperCase(), value: 2 }]
 
 	// const panResponder = useRef(
 	// 	PanResponder.create({
@@ -163,6 +184,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		const hasMore = !(
 			paginationProps.totalPages === paginationProps.currentPage
 		);
+
 		if (y + PIXELS_TO_SCROLL > height && !businessesList.loading && hasMore) {
 			getBusinesses();
 		}
@@ -180,10 +202,12 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 	}
 
 	const resetInactivityTimeout = () => {
-		clearTimeout(timerId.current)
-		timerId.current = setInterval(() => {
-			getBusinesses(true)
-		}, 120000)
+		if (!logosLayout) {
+			clearTimeout(timerId.current)
+			timerId.current = setInterval(() => {
+				getBusinesses(true)
+			}, 120000)
+		}
 	}
 
 	useEffect(() => {
@@ -224,7 +248,9 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 	}
 
 	useEffect(() => {
-		checkUserLocation()
+		if (!logosLayout) {
+			checkUserLocation()
+		}
 	}, [orderState?.options?.address?.location])
 
 	useEffect(() => {
@@ -251,6 +277,44 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		setFavoriteIds([...new Set(ids)])
 	}, [businessesList?.businesses?.length])
 
+	useEffect(() => {
+		setIsOpenCities(false)
+	}, [orderState?.options?.city_id])
+
+	if (logosLayout) {
+		return (
+			<BusinessLogosContainer horizontal>
+				{businessesList?.loading ? (
+					<Placeholder Animation={Fade}>
+						{[...Array(10).keys()].map(item => (
+							<PlaceholderLine key={item} width={56} height={56} />
+						))}
+					</Placeholder>
+				) : (
+					<>
+						{businessesList.businesses
+							?.filter(business => business?.slug !== actualSlug && business?.open)
+							?.map(business => (
+								<TouchableOpacity
+									key={business?.id}
+									onPress={() => handleBusinessClick && handleBusinessClick(business)}
+								>
+									<FastImage
+										style={{ width: 56, height: 56, marginRight: 20, borderRadius: 7.6 }}
+										source={{
+											uri: business?.logo,
+											priority: FastImage.priority.normal,
+										}}
+										resizeMode={FastImage.resizeMode.cover}
+									/>
+								</TouchableOpacity>
+							))}
+					</>
+				)}
+			</BusinessLogosContainer>
+		)
+	}
+
 	return (
 		<ScrollView style={styles.container} onScroll={(e) => handleScroll(e)} showsVerticalScrollIndicator={false}
 			refreshControl={
@@ -260,9 +324,27 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 				/>
 			}
 		>
-			<View style={{ height: isFarAway ? 150 : 100, marginTop: Platform.OS == 'ios' ? 0 : 50 }}>
-				<Search>
+			<View style={{
+				height: !isPreOrderSetting && isChewLayout ? 150 : isChewLayout ? 200 : isFarAway ? 150 : 100,
+				marginTop: Platform.OS == 'ios' ? 0 : 50,
+				backgroundColor: isChewLayout ? theme?.colors?.chew : theme.colors?.white
+			}}
+			>
+				{isChewLayout && (
+					<View style={{ marginTop: 30, paddingHorizontal: 30, flexDirection: 'row', justifyContent: 'space-between' }}>
+						<OText size={18} weight={700} color={theme.colors?.white}>
+							{t('WELCOME', 'Welcome')} {user?.name}!
+						</OText>
+						<TouchableOpacity
+							onPress={() => searchBarRef?.current?.focus?.()}
+						>
+							<Ionicons name='search' style={{ ...styles.iconStyle, color: theme.colors?.white }} />
+						</TouchableOpacity>
+					</View>
+				)}
+				<Search isChewLayout={isChewLayout}>
 					<AddressInput
+						isChewLayout={isChewLayout}
 						onPress={() =>
 							auth
 								? navigation.navigate('AddressList', { isFromBusinesses: true })
@@ -272,78 +354,108 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 									isGuestUser: isGuestUser
 								})
 						}>
-						<AddressInputContainer>
+						<AddressInputContainer isChewLayout={isChewLayout}>
 							<OIcon
 								src={theme.images.general.pin}
 								color={theme.colors.disabled}
 								width={16}
-								style={{ marginRight: 10 }}
+								style={{ marginRight: isChewLayout ? 0 : 10 }}
 							/>
-							<OText size={12} numberOfLines={1}>
+							<OText size={12} numberOfLines={1} style={{ flex: 1 }}>
 								{orderState?.options?.address?.address}
 							</OText>
-							<OIcon
-								src={theme.images.general.arrow_down}
-								width={10}
-								style={{ marginStart: 8 }}
-							/>
+							{!isChewLayout && (
+								<OIcon
+									src={theme.images.general.arrow_down}
+									width={10}
+									style={{ marginStart: 8 }}
+								/>
+							)}
 						</AddressInputContainer>
 					</AddressInput>
 				</Search>
-				{isFarAway && (
+				{isFarAway && !isChewLayout && (
 					<FarAwayMessage style={styles.farAwayMsg}>
 						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
 						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
-
-				<OrderControlContainer>
-					<View style={styles.wrapperOrderOptions}>
-						{isPreOrderSetting && (
-							<WrapMomentOption
-								onPress={() => handleMomentClick()}>
-								<OText
-									size={12}
-									numberOfLines={1}
-									ellipsizeMode="tail"
-									color={theme.colors.textSecondary}>
-									{orderState.options?.moment
-										? parseDate(orderState.options?.moment, { outputFormat: configs?.dates_moment_format?.value })
-										: t('ASAP_ABBREVIATION', 'ASAP')}
-								</OText>
-								{isPreorderEnabled && (
-									<OIcon
-										src={theme.images.general.arrow_down}
-										width={10}
-										style={{ marginStart: 8 }}
-									/>
-								)}
+				{!isChewLayout ? (
+					<OrderControlContainer>
+						<View style={styles.wrapperOrderOptions}>
+							{isPreOrderSetting && (
+								<WrapMomentOption
+									onPress={() => handleMomentClick()}>
+									<OText
+										size={12}
+										numberOfLines={1}
+										ellipsizeMode="tail"
+										color={theme.colors.textSecondary}>
+										{orderState.options?.moment
+											? parseDate(orderState.options?.moment, { outputFormat: configs?.dates_moment_format?.value })
+											: t('ASAP_ABBREVIATION', 'ASAP')}
+									</OText>
+									{isPreorderEnabled && (
+										<OIcon
+											src={theme.images.general.arrow_down}
+											width={10}
+											style={{ marginStart: 8 }}
+										/>
+									)}
+								</WrapMomentOption>
+							)}
+							<WrapMomentOption onPress={() => navigation.navigate('OrderTypes', { configTypes: configTypes, setOrderTypeValue })}>
+								<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textSecondary}>{t(getTypesText(orderTypeValue || orderState?.options?.type || 1), 'Delivery')}</OText>
+								<OIcon
+									src={theme.images.general.arrow_down}
+									width={10}
+									style={{ marginStart: 8 }}
+								/>
 							</WrapMomentOption>
+						</View>
+					</OrderControlContainer>
+				) : (
+					<>
+						{!isPreOrderSetting && (// cambiar
+							<View style={{ paddingHorizontal: 30 }}>
+								<PreorderInput
+									isChewLayout={isChewLayout}
+									onPress={() => handleMomentClick()}
+								>
+									<OText color={theme.colors.textSecondary}>
+										{orderState.options?.moment
+											? parseDate(orderState.options?.moment, { outputFormat: configs?.dates_moment_format?.value })
+											: t('ASAP_ABBREVIATION', 'ASAP')}</OText>
+								</PreorderInput>
+							</View>
 						)}
-						<WrapMomentOption onPress={() => navigation.navigate('OrderTypes', { configTypes: configTypes, setOrderTypeValue })}>
-							<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textSecondary}>{t(getTypesText(orderTypeValue || orderState?.options?.type || 1), 'Delivery')}</OText>
-							<OIcon
-								src={theme.images.general.arrow_down}
-								width={10}
-								style={{ marginStart: 8 }}
-							/>
-						</WrapMomentOption>
-					</View>
-				</OrderControlContainer>
-			</View>
-			<HeaderWrapper
-				source={theme.images.backgrounds.business_list_header}
-				style={{ paddingTop: top + 20 }}
-				resizeMode='stretch'
-			>
-				{!auth && (
-					<TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 40, paddingVertical: 20 }}>
-						<OIcon src={theme.images.general.arrow_left} width={20} style={{ tintColor: theme.colors.white }} />
-					</TouchableOpacity>
+					</>
 				)}
-			</HeaderWrapper>
+			</View>
+			{!isChewLayout ? (
+				<HeaderWrapper
+					source={theme.images.general.homeHero}
+					style={{ paddingTop: top + 20 }}
+					resizeMode='stretch'
+				>
+					{!auth && (
+						<TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 40, paddingVertical: 20 }}>
+							<OIcon src={theme.images.general.arrow_left} width={20} style={{ tintColor: theme.colors.white }} />
+						</TouchableOpacity>
+					)}
+				</HeaderWrapper>
+			) : (
+				<OrderTypesContainer>
+					<OrderTypeSelector
+						handleChangeBusinessType={handleChangeBusinessType}
+						isChewLayout
+						chewOrderTypes={chewOrderTypes}
+					/>
+				</OrderTypesContainer>
+			)}
 			{!businessId && (
 				<SearchBar
+					forwardRef={searchBarRef}
 					onSearch={handleChangeSearch}
 					searchValue={searchValue}
 					lazyLoad
@@ -352,24 +464,33 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 					onCancel={() => handleChangeSearch('')}
 					placeholder={t('SEARCH', 'Search')}
 					height={50}
-					isDisabled={!businessTypes || configs?.advanced_business_search_enabled?.value === '1'}
+					isDisabled={!businessTypes}
 					inputContainerStyles={styles.inputContainerStyles}
 					containerStyles={{
 						marginHorizontal: 40,
 						marginTop: 20
 					}}
 					inputStyle={{ ...styles.searchInput, ...Platform.OS === 'ios' ? { paddingBottom: 6 } : { paddingBottom: 4 } }}
-					onPress={() => { configs?.advanced_business_search_enabled?.value === '1' && navigation.navigate('BusinessSearch', { businessTypes }) }}
 					onSubmitEditing={() => { configs?.advanced_business_search_enabled?.value === '1' && navigation.navigate('BusinessSearch', { businessTypes, defaultTerm: searchValue }) }}
 				/>
 			)}
+
+			{showCities && (
+				<View style={{ marginTop: 10 }}>
+					<OButton
+						onClick={() => setIsOpenCities(true)}
+						text={citiesState?.cities?.find((city: any) => city?.id === orderState?.options?.city_id)?.name || t('FILTER_BY_CITY', 'Filter by city')}
+						style={styles?.buttonCityStyle}
+						textStyle={{ color: theme.colors.backgroundGray, fontWeight: 'bold', fontSize: 18 }}
+					/>
+				</View>
+			)}
 			<OrderProgressWrapper>
 				<OrderProgress
 					{...props}
 					isFocused={isFocused}
 				/>
 			</OrderProgressWrapper>
-
 			{
 				!businessId && !props.franchiseId && featuredBusiness && featuredBusiness.length > 0 && (
 					<FeaturedWrapper>
@@ -377,7 +498,9 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 						<ScrollView
 							showsHorizontalScrollIndicator={false}
 							nestedScrollEnabled
-							horizontal contentContainerStyle={{ paddingHorizontal: 40 }}>
+							horizontal
+							contentContainerStyle={{ paddingHorizontal: 40 }}
+						>
 							{featuredBusiness.map((bAry: any, idx) => (
 								<View key={'f-listing_' + idx}>
 									<BusinessFeaturedController
@@ -431,6 +554,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 					/>
 				)}
 				<IOScrollView>
+
 					{businessesList.businesses?.map(
 						(business: any, i: number) => (
 							<BusinessController
@@ -508,6 +632,31 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 					</>
 				)}
 			</ListWrapper>
+			<OModal
+				open={isOpenCities}
+				onClose={() => setIsOpenCities(false)}
+				title={t('SELECT_A_CITY', 'Select a city')}
+			>
+				<View style={{ padding: 40, width: '100%' }}>
+					{citiesState?.cities?.map((city: any) => (
+						<TouchableOpacity
+							key={city?.id}
+							style={{
+								padding: 10,
+								borderBottomWidth: 1,
+								borderBottomColor: orderState?.options?.city_id === city?.id ? theme.colors.primary : theme.colors.backgroundGray,
+								marginBottom: 10,
+							}}
+							onPress={() => changeCityFilter(city?.id)}
+							disabled={orderState?.loading}
+						>
+							<OText color={orderState?.options?.city_id === city?.id ? theme.colors.primary : theme.colors.black}>
+								{city?.name}
+							</OText>
+						</TouchableOpacity>
+					))}
+				</View>
+			</OModal>
 		</ScrollView>
 	);
 };

package/themes/original/src/components/BusinessesListing/Layout/Original/styles.tsx

@@ -1,4 +1,4 @@
-import styled from 'styled-components/native'
+import styled, { css } from 'styled-components/native'
 
 export const WelcomeTitle = styled.View`
   flex: 1;
@@ -16,6 +16,9 @@ export const Search = styled.View`
   align-items: center;
   margin-vertical: 10px;
   margin-horizontal: 20px;
+  ${(props: any) => props.isChewLayout && css`
+    margin-horizontal: 30px;
+  `}
 `
 
 export const AddressInput = styled.TouchableOpacity`
@@ -27,6 +30,9 @@ export const AddressInput = styled.TouchableOpacity`
   width: 100%;
   height: 44px;
   max-height: 44px;
+  ${(props: any) => props.isChewLayout && css`
+    border-radius: 8px;
+  `}
 `
 
 export const OrderControlContainer = styled.View`
@@ -89,5 +95,43 @@ export const AddressInputContainer = styled.View`
   flex-direction: row;
   width: 100%;
   align-items: center;
-  justify-content: center
+  justify-content: center;
+  ${(props: any) => props.isChewLayout && css`
+    flex-direction: row-reverse;
+  `}
+`
+
+export const PreorderInput = styled(AddressInput)`
+  justify-content: center;
+`
+
+export const OTabs = styled.View`
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: -1px;
+  width: 100%;
+`;
+
+export const OTab = styled.TouchableOpacity`
+  padding-bottom: 10px;
+  border-bottom-width: 1px;
+  margin-end: 14px;
+  padding-horizontal: 5px;
+`;
+
+export const OrderTypesContainer = styled.View`
+  flex-direction: row;
+  font-size: 14px;
+  width: 180px;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom-width: 1px;
+  border-bottom-color: ${(props: any) => props.theme.colors.border};
+  margin-top: 10px;
+  align-self: center;
+`
+
+export const BusinessLogosContainer = styled.ScrollView`
+  padding-bottom: 10px;
 `

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

@@ -1,42 +1,75 @@
 
 import React, { useState, useEffect } from 'react'
-import { useOrder, useSession } from 'ordering-components/native';
+import { useOrder, useSession, useLanguage } from 'ordering-components/native';
 
 import { useTheme } from 'styled-components/native'
 import { BusinessesListing as OriginalBusinessListing } from './Layout/Original'
 import { BusinessesListing as AppointmentBusinessListing } from './Layout/Appointment'
+import { OBottomPopup } from '../shared';
+import { ReviewTrigger } from '../ReviewTrigger';
 
 export const BusinessesListing = (props: any) => {
   const theme = useTheme()
-  const layout = theme?.layout?.businessListing?.layout?.type || 'original'
+  const layout = theme?.layouts?.business_listing_view?.components?.layout?.type || 'original'
+  const [, t] = useLanguage();
   const [{ auth }] = useSession()
   const [, { getLastOrderHasNoReview }] = useOrder();
-  const [, setIsReviewed] = useState(false)
-  const handleOrderReview = (order: any) => {
+
+  const [, setIsReviewed] = useState()
+  const defaultOrder = {
+    id: 0,
+    business_id: 0,
+    business_name: '',
+    logo: '',
+    driver: {},
+    products: [],
+    review: {},
+    user_review: {},
+    delivery_datetime: ''
+  }
+  const [lastOrderReview, setLastOrderReview] = useState({
+    isReviewOpen: false,
+    order: defaultOrder,
+    defaultStar: 5,
+  })
+
+  const _getLastOrderHasNoReview = async () => {
+    const lastOrderHasNoReview = await getLastOrderHasNoReview()
+    lastOrderHasNoReview && OrderReviewRequired(lastOrderHasNoReview)
+  }
+
+  const OrderReviewRequired = (order: any) => {
+    setLastOrderReview({
+      isReviewOpen: true,
+      order: {
+        id: order?.id,
+        business_id: order?.business_id,
+        business_name: order?.business?.name,
+        logo: order.business?.logo,
+        driver: order?.driver,
+        products: order?.products,
+        review: order?.review,
+        user_review: order?.user_review,
+        delivery_datetime: order?.delivery_datetime_utc
+      },
+      defaultStar: 5
+    })
+  }
+
+  const handleOpenOrderReview = (star: number) => {
+    setLastOrderReview({
+      ...lastOrderReview, isReviewOpen: false, order: defaultOrder
+    })
     props?.navigation && props.navigation.navigate(
       'ReviewOrder',
       {
-        order: {
-          id: order?.id,
-          business_id: order?.business_id,
-          business_name: order?.business?.name,
-          delivery_datetime: order?.delivery_datetime,
-          logo: order.business?.logo,
-          driver: order?.driver,
-          products: order?.products,
-          review: order?.review,
-          user_review: order?.user_review
-        },
+        order: lastOrderReview.order,
+        defaultStar: star || 5,
         setIsReviewed
       }
     )
   }
 
-  const _getLastOrderHasNoReview = async () => {
-    const lastOrderHasNoReview = await getLastOrderHasNoReview()
-    lastOrderHasNoReview && handleOrderReview(lastOrderHasNoReview)
-  }
-
   useEffect(() => {
     auth && _getLastOrderHasNoReview()
   }, [auth])
@@ -45,6 +78,21 @@ export const BusinessesListing = (props: any) => {
     <>
       {(layout === 'original') && <OriginalBusinessListing {...props} />}
       {(layout === 'appointment') && <AppointmentBusinessListing {...props} />}
+
+      {lastOrderReview?.isReviewOpen && (
+        <OBottomPopup
+          open={lastOrderReview?.isReviewOpen}
+          transparent={true}
+          onClose={() => setLastOrderReview({ ...lastOrderReview, isReviewOpen: false, order: defaultOrder })}
+          title={t('HEY', 'Hey! ') + t('HOW_WAS_YOUR_ORDER', 'How was your order?')}
+          bottomContainerStyle={{ height: 'auto' }}
+          titleStyle={{ textAlign: 'center' }}
+          closeIcon={theme.images.general.close}
+        >
+          {lastOrderReview?.order && <ReviewTrigger order={lastOrderReview?.order} handleOpenOrderReview={handleOpenOrderReview} />}
+
+        </OBottomPopup>
+      )}
     </>
   )
-}
+}

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

@@ -32,6 +32,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
     latitudeDelta: 0.0010,
     longitudeDelta: 0.0010 * ASPECT_RATIO
   })
+  const [MARKERS, SETMARKERS] = useState(locations)
   let mapRef = useRef<any>(null)
   const googleMapsApiKey = configState?.configs?.google_maps_api_key?.value
 
@@ -41,12 +42,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
     ERROR_NOT_FOUND_ADDRESS: 'Sorry, we couldn\'t find an address',
     ERROR_MAX_LIMIT_LOCATION: `Sorry, You can only set the position to ${maxLimitLocation}m`
   }
-  const MARKERS = locations && locations.map((location: { lat: number, lng: number }) => {
-    return {
-      latitude: location.lat,
-      longitude: location.lng
-    }
-  })
+
   const geocodePosition = (pos: { latitude: number, longitude: number }) => {
     Geocoder.from({
       latitude: pos.latitude,
@@ -147,7 +143,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
   }
 
   const fitAllMarkers = () => {
-    mapRef.current.fitToCoordinates(MARKERS, {
+    mapRef.current.fitToCoordinates(MARKERS?.map(location => ({ latitude: location.lat, longitude: location.lng })), {
       edgePadding: { top: 80, right: 80, bottom: 80, left: 80 },
       animated: true,
     });
@@ -170,6 +166,9 @@ export const GoogleMap = (props: GoogleMapsParams) => {
         fitAllMarkers()
       }
     }, 1000)
+    if (locations) {
+      SETMARKERS(locations)
+    }
     return () => clearInterval(interval)
   }, [locations])
 
@@ -189,16 +188,16 @@ export const GoogleMap = (props: GoogleMapsParams) => {
       >
         {locations ? (
           <>
-            {MARKERS && MARKERS.map((location: { latitude: number, longitude: number }, i: number) => (
+            {MARKERS && MARKERS.map((location: { lat: number, lng: number }, i: number) => (
               <React.Fragment key={i}>
                 {
                   <Marker
                     zIndex={i}
-                    coordinate={location}
-                    title={locations[i]?.title}
+                    coordinate={{ latitude: location.lat ?? 0, longitude: location.lng ?? 0 }}
+                    title={MARKERS[i]?.title}
                   >
                     <View>
-                      <OIcon url={locations[i].icon} width={50} height={50} />
+                      <OIcon url={MARKERS[i].icon} width={50} height={50} />
                     </View>
                   </Marker>
                 }