ordering-ui-react-native 0.16.23 → 0.16.24-release

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

@@ -1,5 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { View, TouchableOpacity, StyleSheet, SafeAreaView, Dimensions, Platform, KeyboardAvoidingViewBase, KeyboardAvoidingView } from 'react-native'
+import { IOScrollView } from 'react-native-intersection-observer'
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useTheme } from 'styled-components/native';
 import {
 	BusinessAndProductList,
@@ -11,6 +13,7 @@ import {
 	useToast,
 	useConfig
 } from 'ordering-components/native'
+import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
 import { OButton, OIcon, OModal, OText } from '../shared'
 import Alert from '../../providers/AlertProvider'
 import { BusinessBasicInformation } from '../BusinessBasicInformation'
@@ -19,18 +22,26 @@ import { BusinessProductsCategories } from '../BusinessProductsCategories'
 import { BusinessProductsList } from '../BusinessProductsList'
 import { BusinessProductsListingParams } from '../../types'
 import { _retrieveStoreData, _removeStoreData } from '../../providers/StoreUtil';
+import IconAntDesign from 'react-native-vector-icons/AntDesign';
+import { useIsFocused } from '@react-navigation/native';
+
 import {
 	TopHeader,
 	WrapSearchBar,
 	WrapContent,
-	BusinessProductsListingContainer,
 	FiltProductsContainer,
 	ContainerSafeAreaView,
-	BackgroundGray
+	BackgroundGray,
+	ProfessionalFilterWrapper,
+	NearBusiness,
+	TopActions
 } from './styles'
 import { FloatingButton } from '../FloatingButton'
 import { UpsellingRedirect } from './UpsellingRedirect'
 import Animated from 'react-native-reanimated'
+import { ProfessionalFilter } from '../ProfessionalFilter';
+import { ServiceForm } from '../ServiceForm';
+import { BusinessesListing } from '../BusinessesListing/Layout/Original'
 
 const PIXELS_TO_SCROLL = 2000
 
@@ -53,9 +64,13 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 		setAlertState,
 		multiRemoveProducts,
 		getNextProducts,
-		handleUpdateProducts
+		handleUpdateProducts,
+		professionalSelected,
+		handleChangeProfessionalSelected,
+		onBusinessClick
 	} = props
 
+	const insets = useSafeAreaInsets()
 	const theme = useTheme();
 	const [, t] = useLanguage()
 	const [{ auth }] = useSession()
@@ -63,10 +78,16 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const [{ parsePrice }] = useUtils()
 	const [, { showToast }] = useToast()
 	const [{ configs }] = useConfig()
+	const isFocused = useIsFocused();
 	const isPreOrder = configs?.preorder_status_enabled?.value === '1'
+
+	const isChewLayout = theme?.business_view?.components?.header?.components?.layout?.type === 'chew'
+	const showLogo = !theme?.business_view?.components?.header?.components?.business?.components?.logo?.hidden
+	const hideBusinessNearCity = theme?.business_view?.components?.near_business?.hidden ?? true
+
 	const styles = StyleSheet.create({
 		mainContainer: {
-			flex: 1,
+			flex: 1
 		},
 		BackIcon: {
 			paddingRight: 20,
@@ -88,7 +109,13 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 			padding: 15,
 			justifyContent: 'center',
 			shadowColor: theme.colors.clear,
-		}
+		},
+		businessSkeleton: {
+			borderRadius: 8,
+			marginRight: 20,
+			width: 56,
+			height: 56
+		},
 	})
 
 	const { business, loading, error } = businessState
@@ -101,20 +128,31 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const [productListLayout, setProductListLayout] = useState<any>(null)
 	const [isCategoryClicked, setCategoryClicked] = useState(false)
 	const [subcategoriesSelected, setSubcategoriesSelected] = useState([])
+	const [openService, setOpenService] = useState(false)
+	const [currentProduct, setCurrentProduct] = useState(null)
 
 	const isCheckoutMultiBusinessEnabled: Boolean = configs?.checkout_multi_business_enabled?.value === '1'
+	const openCarts = (Object.values(orderState?.carts)?.filter((cart: any) => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum && !cart?.wallets) || null) || []
+
 	const currentCart: any = Object.values(orderState.carts).find((cart: any) => cart?.business?.slug === business?.slug) ?? {}
 	const isOpenFiltProducts = isOpenSearchBar && !!searchValue
-	const filtProductsHeight = Platform.OS === 'ios' ? 0 : 35
+	const filtProductsHeight = Platform.OS === 'ios' ? 0 : 100
 	const onRedirect = (route: string, params?: any) => {
 		navigation.navigate(route, params)
 	}
 
 	const onProductClick = (product: any) => {
+		const productAddedToCartLength = currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0) || 0
+		if (product?.type === 'service' && business?.professionals?.length > 0) {
+			setCurrentProduct(product)
+			setOpenService(true)
+			return
+		}
 		onRedirect('ProductDetails', {
 			product: product,
 			businessSlug: business.slug,
 			businessId: business.id,
+			productAddedToCartLength
 		})
 	}
 
@@ -124,7 +162,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	}
 
 	const handleUpsellingPage = () => {
-		if (isCheckoutMultiBusinessEnabled) {
+		if (isCheckoutMultiBusinessEnabled && openCarts.length > 1) {
 			onRedirect('CheckoutNavigator', {
 				screen: 'MultiCheckout'
 			})
@@ -191,7 +229,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 			multiRemoveProducts && await multiRemoveProducts(unavailableProducts, _carts)
 			return
 		}
-	
+
 		if (alreadyRemoved === 'removed') {
 			setAlertState({ open: true, content: [t('NOT_AVAILABLE_PRODUCT', 'This product is not available.')] })
 		}
@@ -209,57 +247,86 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 		removeCartByReOrder()
 	}, [currentCart])
 
+	useEffect(() => {
+		if (!isFocused) {
+			handleChangeSearch('')
+			setIsOpenSearchBar(false)
+		}
+	}, [isFocused])
+
 	return (
-		<ContainerSafeAreaView
-			style={{ flex: 1 }}
-			isOpenFiltProducts={isOpenFiltProducts}
-		>
-			<Animated.View style={{ position: 'relative' }}>
-				<TopHeader isIos={Platform.OS === 'ios'}>
-					{!isOpenSearchBar && (
-						<>
-							<View style={{ ...styles.headerItem, flex: 1 }}>
-								<OButton
-									imgLeftSrc={theme.images.general.arrow_left}
-									imgRightSrc={null}
-									style={styles.btnBackArrow}
-									onClick={() => handleBackNavigation()}
-									imgLeftStyle={{ tintColor: theme.colors.textNormal, width: 16 }}
+		<>
+			<View style={{ flex: 1 }}>
+				<Animated.View style={{ position: 'relative' }}>
+					<TopHeader
+						style={{
+							marginTop: Platform.OS === 'ios' ? insets.top : 0
+						}}
+					>
+						{!isOpenSearchBar && (
+							<>
+								<TopActions onPress={() => handleBackNavigation()}>
+									<IconAntDesign name='arrowleft' size={26} />
+								</TopActions>
+								{!errorQuantityProducts && (
+									<View style={{ ...styles.headerItem }}>
+										<TouchableOpacity
+											onPress={() => setIsOpenSearchBar(true)}
+											style={styles.searchIcon}
+										>
+											<OIcon src={theme.images.general.search} color={theme.colors.textNormal} width={16} />
+										</TouchableOpacity>
+									</View>
+								)}
+							</>
+						)}
+						{isOpenSearchBar && (
+							<WrapSearchBar>
+								<SearchBar
+									autoFocus
+									onSearch={handleChangeSearch}
+									onCancel={() => handleCancel()}
+									isCancelXButtonShow
+									noBorderShow
+									placeholder={t('SEARCH_PRODUCTS', 'Search Products')}
+									lazyLoad={businessState?.business?.lazy_load_products_recommended}
 								/>
-							</View>
-							{!errorQuantityProducts && (
-								<View style={{ ...styles.headerItem }}>
-									<TouchableOpacity
-										onPress={() => setIsOpenSearchBar(true)}
-										style={styles.searchIcon}
-									>
-										<OIcon src={theme.images.general.search} color={theme.colors.textNormal} width={16} />
-									</TouchableOpacity>
+							</WrapSearchBar>
+						)}
+					</TopHeader>
+					{!hideBusinessNearCity && loading && (
+						<NearBusiness style={{ paddingBottom: 10 }}>
+							<Placeholder Animation={Fade}>
+								<View style={{ flexDirection: 'row' }}>
+									{[...Array(10).keys()].map(i => (
+										<View style={styles.businessSkeleton} key={i}>
+											<PlaceholderLine style={{ width: '100%', height: '100%' }} />
+										</View>
+									))}
 								</View>
-							)}
-						</>
+							</Placeholder>
+						</NearBusiness>
 					)}
-					{isOpenSearchBar && (
-						<WrapSearchBar>
-							<SearchBar
-								onSearch={handleChangeSearch}
-								onCancel={() => handleCancel()}
-								isCancelXButtonShow
-								noBorderShow
-								placeholder={t('SEARCH_PRODUCTS', 'Search Products')}
-								lazyLoad={businessState?.business?.lazy_load_products_recommended}
+					{!loading && !hideBusinessNearCity && businessState?.business?.city_id && (
+						<NearBusiness>
+							<BusinessesListing
+								logosLayout
+								propsToFetch={['id', 'logo', 'location', 'timezone', 'schedule', 'open', 'slug']}
+								cityId={businessState?.business?.city_id}
+								onBusinessClick={onBusinessClick}
+								actualSlug={businessState?.business?.slug}
 							/>
-						</WrapSearchBar>
+						</NearBusiness>
 					)}
-				</TopHeader>
-			</Animated.View>
+				</Animated.View>
 
-			{business?.categories?.length > 0 && isOpenFiltProducts && (
+				{business?.categories?.length > 0 && isOpenFiltProducts && (
 					<FiltProductsContainer
 						isIos={Platform.OS === 'ios'}
 						style={{
 							height: Dimensions.get('window').height - filtProductsHeight
 						}}
+						contentContainerStyle={{ flexGrow: 1 }}
 					>
 						<View style={{ padding: 20, backgroundColor: theme.colors.white }}>
 							<BusinessProductsList
@@ -287,157 +354,202 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 								setSubcategoriesSelected={setSubcategoriesSelected}
 								onClickCategory={handleChangeCategory}
 								handleUpdateProducts={handleUpdateProducts}
+								previouslyProducts={business?.previously_products}
+								navigation={navigation}
 								isFiltMode
 							/>
 						</View>
 					</FiltProductsContainer>
-			)}
-			{isOpenFiltProducts && (
-				<BackgroundGray />
-			)}
-			<BusinessProductsListingContainer
-				stickyHeaderIndices={[2]}
-				style={styles.mainContainer}
-				ref={scrollViewRef}
-				isActiveFloatingButtom={currentCart?.products?.length > 0 && categoryState.products.length !== 0}
-				onScroll={handlePageScroll}
-				onScrollBeginDrag={handleTouchDrag}
-				scrollEventThrottle={16}
-			>
-				<BusinessBasicInformation
-					navigation={navigation}
-					businessState={businessState}
-					openBusinessInformation={openBusinessInformation}
-					header={header}
-					logo={logo}
-					isPreOrder={isPreOrder}
-				/>
-				<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100 }} />
-				{!loading && business?.id && (
-					<>
-						{!(business?.categories?.length === 0) && (
-							<BusinessProductsCategories
-								categories={[{ id: null, name: t('ALL', 'All') }, { id: 'featured', name: t('FEATURED', 'Featured') }, ...business?.categories.sort((a: any, b: any) => a.rank - b.rank)]}
-								categorySelected={categorySelected}
-								onClickCategory={handleChangeCategory}
-								featured={featuredProducts}
-								openBusinessInformation={openBusinessInformation}
-								scrollViewRef={scrollViewRef}
-								productListLayout={productListLayout}
-								categoriesLayout={categoriesLayout}
-								selectedCategoryId={selectedCategoryId}
-								lazyLoadProductsRecommended={business?.lazy_load_products_recommended}
-								setSelectedCategoryId={setSelectedCategoryId}
-								setCategoryClicked={setCategoryClicked}
-
-							/>
-						)}
-					</>
 				)}
-				{!loading && business?.id && (
-					<>
-						<WrapContent
-							onLayout={(event: any) => setProductListLayout(event.nativeEvent.layout)}
-						>
-							<BusinessProductsList
-								categories={[
-									{ id: null, name: t('ALL', 'All') },
-									{ id: 'featured', name: t('FEATURED', 'Featured') },
-									...business?.categories.sort((a: any, b: any) => a.rank - b.rank)
-								]}
-								category={categorySelected}
-								categoryState={categoryState}
-								businessId={business.id}
-								errors={errors}
-								onProductClick={onProductClick}
-								handleSearchRedirect={handleSearchRedirect}
-								featured={featuredProducts}
-								searchValue={searchValue}
-								handleClearSearch={handleChangeSearch}
-								errorQuantityProducts={errorQuantityProducts}
-								handleCancelSearch={handleCancel}
-								categoriesLayout={categoriesLayout}
-								subcategoriesSelected={subcategoriesSelected}
-								lazyLoadProductsRecommended={business?.lazy_load_products_recommended}
-								setCategoriesLayout={setCategoriesLayout}
-								currentCart={currentCart}
-								setSubcategoriesSelected={setSubcategoriesSelected}
-								onClickCategory={handleChangeCategory}
-								handleUpdateProducts={handleUpdateProducts}
-							/>
-						</WrapContent>
-					</>
+				{isOpenFiltProducts && (
+					<BackgroundGray isIos={Platform.OS === 'ios'} />
 				)}
-				{loading && !error && (
-					<>
+				<IOScrollView
+					stickyHeaderIndices={[business?.professionals?.length > 0 ? 3 : 2]}
+					style={{
+						...styles.mainContainer,
+						marginBottom: currentCart?.products?.length > 0 && categoryState.products.length !== 0 ?
+							50 : 0
+					}}
+					ref={scrollViewRef}
+					onScroll={handlePageScroll}
+					onScrollBeginDrag={handleTouchDrag}
+					scrollEventThrottle={16}
+					bounces={false}
+				>
+					<BusinessBasicInformation
+						navigation={navigation}
+						businessState={businessState}
+						openBusinessInformation={openBusinessInformation}
+						header={header}
+						logo={logo}
+						isPreOrder={isPreOrder}
+					/>
+					{business?.professionals?.length > 0 && (
+						<ProfessionalFilterWrapper>
+							<OText
+								size={16}
+								style={{ marginBottom: 16 }}
+								weight={Platform.OS === 'ios' ? '600' : 'bold'}
+							>
+								{t('PROFESSIONALS', 'Professionals')}
+							</OText>
+							<ProfessionalFilter
+								professionals={business?.professionals}
+								professionalSelected={professionalSelected}
+								handleChangeProfessionalSelected={handleChangeProfessionalSelected}
+							/>
+						</ProfessionalFilterWrapper>
+					)}
+					<View
+						style={{
+							height: 8,
+							backgroundColor: theme.colors.backgroundGray100,
+							marginTop: isChewLayout && showLogo ? 10 : 0
+						}}
+					/>
+					{!loading && business?.id && !(business?.categories?.length === 0) && (
 						<BusinessProductsCategories
-							categories={[]}
+							categories={[{ id: null, name: t('ALL', 'All') }, { id: 'featured', name: t('FEATURED', 'Featured') }, ...business?.categories.sort((a: any, b: any) => a.rank - b.rank)]}
 							categorySelected={categorySelected}
 							onClickCategory={handleChangeCategory}
 							featured={featuredProducts}
 							openBusinessInformation={openBusinessInformation}
-							loading={loading}
+							scrollViewRef={scrollViewRef}
+							productListLayout={productListLayout}
+							categoriesLayout={categoriesLayout}
+							selectedCategoryId={selectedCategoryId}
+							lazyLoadProductsRecommended={business?.lazy_load_products_recommended}
+							setSelectedCategoryId={setSelectedCategoryId}
+							setCategoryClicked={setCategoryClicked}
 						/>
-						<WrapContent>
-							<BusinessProductsList
+					)}
+					{!loading && business?.id && (
+						<>
+							<WrapContent
+								onLayout={(event: any) => setProductListLayout(event.nativeEvent.layout)}
+							>
+								<BusinessProductsList
+									categories={[
+										{ id: null, name: t('ALL', 'All') },
+										{ id: 'featured', name: t('FEATURED', 'Featured') },
+										...business?.categories.sort((a: any, b: any) => a.rank - b.rank)
+									]}
+									category={categorySelected}
+									categoryState={categoryState}
+									businessId={business.id}
+									errors={errors}
+									onProductClick={onProductClick}
+									handleSearchRedirect={handleSearchRedirect}
+									featured={featuredProducts}
+									searchValue={searchValue}
+									handleClearSearch={handleChangeSearch}
+									errorQuantityProducts={errorQuantityProducts}
+									handleCancelSearch={handleCancel}
+									categoriesLayout={categoriesLayout}
+									subcategoriesSelected={subcategoriesSelected}
+									lazyLoadProductsRecommended={business?.lazy_load_products_recommended}
+									setCategoriesLayout={setCategoriesLayout}
+									currentCart={currentCart}
+									setSubcategoriesSelected={setSubcategoriesSelected}
+									onClickCategory={handleChangeCategory}
+									handleUpdateProducts={handleUpdateProducts}
+									navigation={navigation}
+									previouslyProducts={business?.previously_products}
+								/>
+							</WrapContent>
+						</>
+					)}
+					{loading && !error && (
+						<>
+							<BusinessProductsCategories
 								categories={[]}
-								category={categorySelected}
-								categoryState={categoryState}
-								isBusinessLoading={loading}
-								errorQuantityProducts={errorQuantityProducts}
-								handleUpdateProducts={handleUpdateProducts}
+								categorySelected={categorySelected}
+								onClickCategory={handleChangeCategory}
+								featured={featuredProducts}
+								openBusinessInformation={openBusinessInformation}
+								loading={loading}
 							/>
-						</WrapContent>
-					</>
+							<WrapContent>
+								<BusinessProductsList
+									categories={[]}
+									category={categorySelected}
+									categoryState={categoryState}
+									isBusinessLoading={loading}
+									errorQuantityProducts={errorQuantityProducts}
+									handleUpdateProducts={handleUpdateProducts}
+									navigation={navigation}
+								/>
+							</WrapContent>
+						</>
+					)}
+				</IOScrollView>
+				{!loading && auth && currentCart?.products?.length > 0 && categoryState.products.length !== 0 && (
+					<FloatingButton
+						btnText={
+							openUpselling
+								? t('LOADING', 'Loading')
+								: currentCart?.subtotal >= currentCart?.minimum
+									? t('VIEW_ORDER', 'View Order')
+									: `${t('MINIMUN_SUBTOTAL_ORDER', 'Minimum subtotal order:')} ${parsePrice(currentCart?.minimum)}`
+						}
+						isSecondaryBtn={currentCart?.subtotal < currentCart?.minimum || openUpselling}
+						btnLeftValueShow={currentCart?.subtotal >= currentCart?.minimum && currentCart?.products?.length > 0}
+						btnRightValueShow={currentCart?.subtotal >= currentCart?.minimum && currentCart?.products?.length > 0}
+						btnLeftValue={currentCart?.products.reduce((prev: number, product: any) => prev + product.quantity, 0)}
+						btnRightValue={parsePrice(currentCart?.total)}
+						disabled={currentCart?.subtotal < currentCart?.minimum || openUpselling}
+						handleClick={() => setOpenUpselling(true)}
+					/>
 				)}
-			</BusinessProductsListingContainer>
-			{!loading && auth && currentCart?.products?.length > 0 && categoryState.products.length !== 0 && (
-				<FloatingButton
-					btnText={
-						openUpselling
-							? t('LOADING', 'Loading')
-							: currentCart?.subtotal >= currentCart?.minimum
-								? t('VIEW_ORDER', 'View Order')
-								: `${t('MINIMUN_SUBTOTAL_ORDER', 'Minimum subtotal order:')} ${parsePrice(currentCart?.minimum)}`
-					}
-					isSecondaryBtn={currentCart?.subtotal < currentCart?.minimum || openUpselling}
-					btnLeftValueShow={currentCart?.subtotal >= currentCart?.minimum && currentCart?.products?.length > 0}
-					btnRightValueShow={currentCart?.subtotal >= currentCart?.minimum && currentCart?.products?.length > 0}
-					btnLeftValue={currentCart?.products.reduce((prev: number, product: any) => prev + product.quantity, 0)}
-					btnRightValue={parsePrice(currentCart?.total)}
-					disabled={currentCart?.subtotal < currentCart?.minimum || openUpselling}
-					handleClick={() => setOpenUpselling(true)}
+				{openUpselling && (
+					<UpsellingRedirect
+						businessId={currentCart?.business_id}
+						business={currentCart?.business}
+						cartProducts={currentCart?.products}
+						cart={currentCart}
+						setOpenUpselling={setOpenUpselling}
+						handleUpsellingPage={handleUpsellingPage}
+						handleCloseUpsellingPage={handleCloseUpsellingPage}
+						openUpselling={openUpselling}
+						canOpenUpselling={canOpenUpselling}
+						setCanOpenUpselling={setCanOpenUpselling}
+						onRedirect={onRedirect}
+					/>
+				)}
+				<Alert
+					open={alertState?.open || false}
+					title=''
+					content={[t('NOT_AVAILABLE_PRODUCTS', 'These products are not available.')]}
+					onAccept={() => setAlertState({ open: false, content: [] })}
+					onClose={() => setAlertState({ open: false, content: [] })}
 				/>
-			)}
-			{openUpselling && (
-				<UpsellingRedirect
-					businessId={currentCart?.business_id}
-					business={currentCart?.business}
-					cartProducts={currentCart?.products}
-					cart={currentCart}
-					setOpenUpselling={setOpenUpselling}
-					handleUpsellingPage={handleUpsellingPage}
-					handleCloseUpsellingPage={handleCloseUpsellingPage}
-					openUpselling={openUpselling}
-					canOpenUpselling={canOpenUpselling}
-					setCanOpenUpselling={setCanOpenUpselling}
-					onRedirect={onRedirect}
+			</View>
+			<OModal
+				open={openService}
+				onClose={() => setOpenService(false)}
+				entireModal
+			>
+				<ServiceForm
+					navigation={navigation}
+					product={currentProduct}
+					businessSlug={business.slug}
+					businessId={business.id}
+					professionalList={business?.professionals}
+					professionalSelected={professionalSelected}
+					handleChangeProfessional={handleChangeProfessionalSelected}
+					onSave={() => setOpenService(false)}
+					onClose={() => setOpenService(false)}
 				/>
-			)}
-			<Alert
-				open={alertState?.open || false}
-				title=''
-				content={[t('NOT_AVAILABLE_PRODUCTS', 'These products are not available.')]}
-				onAccept={() => setAlertState({ open: false, content: [] })}
-				onClose={() => setAlertState({ open: false, content: [] })}
-			/>
-		</ContainerSafeAreaView>
+			</OModal>
+		</>
 	)
 }
 
 export const BusinessProductsListing = (props: BusinessProductsListingParams) => {
 	const businessProductslistingProps = {
 		...props,
+		isForceSearch: Platform.OS === 'ios',
 		UIComponent: BusinessProductsListingUI
 	}
 	return (

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

@@ -1,8 +1,5 @@
 import styled, { css } from 'styled-components/native'
 
-export const ContainerSafeAreaView = styled.SafeAreaView`
-`
-
 export const WrapHeader = styled.View`
   position: relative;
 `
@@ -14,7 +11,6 @@ export const TopHeader = styled.View`
   z-index: 1;
   height: 60px;
   min-height: 60px;
-  margin-top: ${(props : any) => props.isIos ? '0' : '40px'};
 `
 export const AddressInput = styled.TouchableOpacity`
   flex: 1;
@@ -42,16 +38,34 @@ export const FiltProductsContainer = styled.ScrollView`
   position: absolute;
   width: 100%;
   z-index: 2000;
-  top: ${(props : any) => props.isIos ? '40px': '80px'};
+  top: 80px;
   margin-top: 20px;
 `
 
 export const BackgroundGray = styled.View`
   flex: 1;
-  height: 100%;
+  height: ${(props: any) => props.isIos ? '80%' : '100%'};
   background-color: rgba(0,0,0,0.5);
-  position: absolute; 
-  margin-top: 100px; 
+  position: absolute;
+  margin-top: 100px;
   z-index: 100;
   width: 100%;
 `
+
+export const ProfessionalFilterWrapper = styled.View`
+  padding-left: 40px;
+  margin-bottom: 35px;
+`
+
+export const NearBusiness = styled.View`
+  width: 100%;
+  padding-left: 20px;
+  max-height: 80px;
+`
+
+export const TopActions = styled.TouchableOpacity`
+	height: 60px;
+	justify-content: center;
+  padding-horizontal: 30px;
+  width: 100px;
+`;

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
 	BusinessReviews as BusinessReviewController,
 	useLanguage,
@@ -22,6 +22,7 @@ import {
 import { BusinessReviewsParams } from '../../types';
 import { ProgressBar, TouchableRipple } from 'react-native-paper';
 import moment from 'moment';
+import { setLocalMoment } from '../../utils';
 
 const BusinessReviewsUI = (props: BusinessReviewsParams) => {
 	const { businessState, reviewsList } = props;
@@ -99,6 +100,10 @@ const BusinessReviewsUI = (props: BusinessReviewsParams) => {
 		</View>
 	);
 
+	useEffect(() => {
+		setLocalMoment(moment, t)
+	}, [])
+
 	return (
 		<BusinessReviewsContainer>
 			<BusinessReviewContent