ordering-ui-react-native 0.16.29 → 0.16.30-release

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

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

@@ -8,6 +8,7 @@ import {
 	Dimensions
 } from 'react-native';
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
+import { OButton } from '../shared'
 import {
 	BusinessTypeFilter as BusinessTypeFilterController,
 	useLanguage,
@@ -17,6 +18,7 @@ import {
 	BusinessCategories,
 	Category,
 	BCContainer,
+	ServiceWrapper
 } from './styles';
 import { OIcon, OText, OModal } from '../shared';
 import { BusinessTypeFilterParams } from '../../types';
@@ -28,13 +30,15 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 		typesState, 
 		currentTypeSelected, 
 		handleChangeBusinessType,
-		setBusinessTypes
+		setBusinessTypes,
+		isAppoint
 	} = props;
 
 	const [, t] = useLanguage();
 
 	const theme = useTheme();
 	const [isOpenAllCategories, setIsOpenAllCategories] = useState(false)
+	const defaultImage = (name : string) => theme.images?.categories?.[name.toLowerCase().replace(' ', '')]
 
 	useEffect(() => {
 		if(typesState?.types?.length > 0){
@@ -42,6 +46,15 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 		}
 	  }, [typesState])
 
+	const handleChangeServiceType = (serviceId: any) => {
+		if (serviceId === currentTypeSelected) {
+			handleChangeBusinessType(null)
+			return
+		}
+		handleChangeBusinessType(serviceId)
+		isOpenAllCategories && setIsOpenAllCategories(false)
+	}
+
 	const renderTypes = ({ item }: any) => {
 		return (
 			<TouchableOpacity
@@ -72,48 +85,95 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 
 	return (
 		<>
-			<BCContainer>
-				{typesState?.loading && (
-					<View>
-						<Placeholder style={{ marginVertical: 10 }} Animation={Fade}>
-							<ScrollView
-								horizontal
+			{isAppoint ? (
+				<>
+					{typesState?.loading && (
+						<View>
+							<Placeholder Animation={Fade}>
+								<ScrollView
+									horizontal
+									showsVerticalScrollIndicator={false}
+									showsHorizontalScrollIndicator={false}>
+									{[...Array(4)].map((_, i) => (
+										<View
+											key={i}
+											style={{ width: 80, borderRadius: 50, marginRight: 10 }}>
+											<PlaceholderLine height={25} noMargin />
+										</View>
+									))}
+								</ScrollView>
+							</Placeholder>
+						</View>
+					)}
+					{
+						!typesState?.loading &&
+						!typesState?.error &&
+						typesState?.types &&
+						typesState?.types.length > 0 && (
+							<ServiceWrapper
 								showsVerticalScrollIndicator={false}
-								showsHorizontalScrollIndicator={false}>
-								{[...Array(4)].map((_, i) => (
-									<View
+								showsHorizontalScrollIndicator={false}
+								horizontal
+							>
+								{typesState?.types.length > 0 && typesState?.types.map((businessType: any, i: number) => (
+									<OButton
 										key={i}
-										style={{ width: 80, borderRadius: 10, marginRight: 15 }}>
-										<PlaceholderLine height={80} noMargin />
-									</View>
+										bgColor={(currentTypeSelected === businessType?.id) ? theme.colors.primary : theme.colors.backgroundGray200}
+										onClick={() => handleChangeServiceType(businessType?.id)}
+										text={`${businessType?.name} ${(currentTypeSelected === businessType?.id) ? ' X' : ''}`}
+										style={styles.businessType}
+										textStyle={{ fontSize: 10, color: (currentTypeSelected === businessType?.id) ? theme.colors.backgroundLight : theme.colors.textNormal }}
+									/>
 								))}
-							</ScrollView>
-						</Placeholder>
-					</View>
-				)}
-				{!typesState?.loading &&
-					!typesState?.error &&
-					typesState?.types &&
-					typesState?.types.length > 0 && (
-						<>
-							<BusinessCategories>
-								<FlatList
+							</ServiceWrapper>
+						)
+					}
+				</>
+			) : (
+				<BCContainer>
+					{typesState?.loading && (
+						<View>
+							<Placeholder style={{ marginVertical: 10 }} Animation={Fade}>
+								<ScrollView
 									horizontal
-									showsHorizontalScrollIndicator={false}
-									data={typesState?.types}
-									renderItem={renderTypes}
-									keyExtractor={(type, index) => `${type.name}_${index}`}
-								/>
-								<TouchableOpacity
-									style={{ marginLeft: 15 }}
-									onPress={() => setIsOpenAllCategories(true)}
-								>
-									<OText size={12} color={theme.colors.primary}>{t('SEE_ALL', 'See All')}</OText>
-								</TouchableOpacity>
-							</BusinessCategories>
-						</>
+									showsVerticalScrollIndicator={false}
+									showsHorizontalScrollIndicator={false}>
+									{[...Array(4)].map((_, i) => (
+										<View
+											key={i}
+											style={{ width: 80, borderRadius: 10, marginRight: 15 }}>
+											<PlaceholderLine height={80} noMargin />
+										</View>
+									))}
+								</ScrollView>
+							</Placeholder>
+						</View>
 					)}
-			</BCContainer>
+					{!typesState?.loading &&
+						!typesState?.error &&
+						typesState?.types &&
+						typesState?.types.length > 0 && (
+							<>
+								<BusinessCategories>
+									<FlatList
+										horizontal
+										showsHorizontalScrollIndicator={false}
+										data={typesState?.types}
+										renderItem={renderTypes}
+										keyExtractor={(type, index) => `${type.name}_${index}`}
+									/>
+									<TouchableOpacity
+										style={{ marginLeft: 15 }}
+										onPress={() => setIsOpenAllCategories(true)}
+									>
+										<OText size={12} color={theme.colors.primary}>{t('SEE_ALL', 'See All')}</OText>
+									</TouchableOpacity>
+								</BusinessCategories>
+							</>
+						)}
+				</BCContainer>
+			)}
+
 			<OModal
 				open={isOpenAllCategories}
 				onClose={() => setIsOpenAllCategories(false)}
@@ -138,9 +198,9 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 									isOpenAllCategories && setIsOpenAllCategories(false)
 								}}
 							>
-								{item.image ? (
+								{(defaultImage(item.name) || item.image) ? (
 									<OIcon
-										url={item.image}
+										url={typeof item.name === 'number' ? item.image || defaultImage(item.name) : defaultImage(item.name) || item.image}
 										style={styles.logo}
 									/>
 								) : (
@@ -195,6 +255,15 @@ const styles = StyleSheet.create({
 	allCategoriesWrapper: {
 		flexDirection: 'row',
 		flexWrap: 'wrap',
+	},
+	businessType: {
+		marginRight: 10,
+		borderRadius: 50,
+		paddingVertical: 4,
+		paddingLeft: 5,
+		paddingRight: 5,
+		height: 27,
+		borderWidth: 0
 	}
 });
 

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

@@ -39,3 +39,5 @@ export const IconContainer = styled.View`
   border-radius: 10px;
   height: 60px;
 `
+
+export const ServiceWrapper = styled.ScrollView``