ordering-ui-react-native 0.17.50-release → 0.17.51-release

package/package.json

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

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -229,7 +229,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   }, [props.order?.loading]);
 
   useEffect(() => {
-    if (order?.driver === null && session?.user?.level === 4) {
+    if (!order?.driver_id && session?.user?.level === 4) {
       setAlertState({
         open: true,
         content: [

package/themes/business/src/components/PreviousOrders/OrderItem.tsx

@@ -94,8 +94,7 @@ export const OrderItem = (props: any) => {
   });
 
   const getDelayMinutes = (order: any) => {
-    const offset = 300
-    const cdtToutc = moment(order?.delivery_datetime).add(offset, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const cdtToutc = moment(order?.delivery_datetime).utc().format('YYYY-MM-DD HH:mm:ss')
     const _delivery = order?.delivery_datetime_utc
       ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'YYYY-MM-DD hh:mm A' })
       : parseDate(cdtToutc, { outputFormat: 'YYYY-MM-DD hh:mm A' })

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

@@ -42,7 +42,6 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 		navigation,
 		isBusinessOpen,
 		style,
-		isCustomLayout,
 		businessHeader,
 		businessFeatured,
 		businessLogo,
@@ -76,7 +75,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 	const hideBusinessHeader = theme?.business_listing_view?.components?.business?.components?.header?.hidden
 	const hideBusinessFavoriteBadge = theme?.business_listing_view?.components?.business?.components?.featured_badge?.hidden
 
-	const textSize = isCustomLayout ? 12 : 10
+	const textSize = 12
 	const cardHeight = windowHeight * 0.3
 
 	const styles = StyleSheet.create({
@@ -214,7 +213,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 					<BusinessHero>
 						{!hideBusinessHeader && (
 							<FastImage
-								style={{ height: isCustomLayout ? cardHeight * 0.66 : 120 }}
+								style={{ height: cardHeight * 0.66 }}
 								source={(businessHeader || business?.header || typeof theme.images.dummies.businessHeader === 'string') ? {
 									uri: optimizeImage(businessHeader || business?.header || theme.images.dummies.businessHeader, 'h_500,c_limit'),
 									priority: FastImage.priority.normal,
@@ -227,7 +226,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 								<FontAwesomeIcon name="crown" size={26} color="gold" />
 							</View>
 						)}
-						{(!isCustomLayout) && !hideBusinessOffer && (
+						{!hideBusinessOffer && (
 							getBusinessOffer((business?.offers)) &&
 							<OfferBox
 								isClosed={!isBusinessOpen && (configState?.configs?.preorder_status_enabled?.value === '1')}
@@ -257,7 +256,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 						</BusinessState>
 					</BusinessHero>
 					<BusinessContent>
-						<BusinessInfo style={isCustomLayout && { position: 'absolute', bottom: 85, left: 15 }}>
+						<BusinessInfo style={{ position: 'absolute', bottom: 85, left: 15 }}>
 							{!hideBusinessLogo && (
 								<BusinessLogo style={styles.businessLogo}>
 									<FastImage
@@ -270,38 +269,15 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 									/>
 								</BusinessLogo>
 							)}
-							{!isCustomLayout && (!hideBusinessFavorite || !hideBusinessReviews) && (
-								<ReviewAndFavorite>
-									{(businessReviews?.reviews?.total > 0 ?? business?.reviews?.total > 0) && !hideBusinessReviews && (
-										<Reviews>
-											<OIcon src={theme.images.general.star} width={12} style={styles.starIcon} />
-											<OText size={10} style={{ lineHeight: 15 }}>
-												{parseNumber(businessReviews?.reviews?.total ?? business?.reviews?.total, { separator: '.' })}
-											</OText>
-										</Reviews>
-									)}
-									{!hideBusinessFavorite && (
-										<LottieAnimation
-											type='favorite'
-											onClick={handleChangeFavorite}
-											initialValue={business?.favorite ? 0.5 : 0}
-											toValue={business?.favorite ? 0 : 0.5}
-											disableAnimation={!auth}
-											iconProps={{ color: theme.colors.danger5, size: 18 }}
-											isActive={business?.favorite}
-										/>
-									)}
-								</ReviewAndFavorite>
-							)}
 						</BusinessInfo>
-						<View style={isCustomLayout && { width: '100%', flexDirection: 'row', justifyContent: 'space-between', marginTop: 5 }}>
+						<View style={{ width: '100%', flexDirection: 'row', justifyContent: 'space-between', marginTop: 5 }}>
 							<OText
 								size={textSize + 2}
 								style={{ lineHeight: 18, marginBottom: 6 }}
 								weight={'500'}>
 								{business?.name}
 							</OText>
-							{isCustomLayout && (!hideBusinessFavorite || !hideBusinessReviews) && (
+							{(!hideBusinessFavorite || !hideBusinessReviews) && (
 								<ReviewAndFavorite>
 									{(businessReviews?.reviews?.total > 0 ?? business?.reviews?.total > 0) && !hideBusinessReviews && (
 										<Reviews>
@@ -325,7 +301,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 								</ReviewAndFavorite>
 							)}
 						</View>
-						<OText size={textSize} style={{ lineHeight: 15, marginBottom: 3 }} numberOfLines={isCustomLayout ? 1 : 2}>
+						<OText size={textSize} style={{ lineHeight: 15, marginBottom: 3 }} numberOfLines={1}>
 							{business?.address}
 						</OText>
 						<Metadata>

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

@@ -34,8 +34,8 @@ export const Metadata = styled.View`
 
 export const BusinessState = styled.View`
   position: absolute;
-	top: 13px;
-	end: 18px;
+  top: ${(props: any) => props.isRibbon ? '32px' : '15px'};
+	right: 15px;
 `
 
 export const BusinessLogo = styled.View`
@@ -85,10 +85,9 @@ export const RibbonBox = styled.View`
 export const OfferBox = styled.View`
   position: absolute;
   z-index: 1;
-  top: 20px;
-  right: 10px;
   border-radius: 50px;
-  color: ${(props: any) => props.theme.colors.textThird};
+  top: ${(props: any) => props.isRibbon ? '32px' : '15px'};
+  right: ${(props: any) => props.isClosed ? '110px' : '15px'};
   background: ${(props: any) => props.theme.colors.inputBorderColor};
   padding: 3px 8px;
   max-width: 180px;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import {
 	BusinessInformation as BusinessInformationController,
-	useLanguage, useUtils
+	useLanguage, useUtils, useConfig,
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { OIcon, OText } from '../shared';
@@ -22,25 +22,27 @@ import { GoogleMap } from '../GoogleMap';
 import { WebView } from 'react-native-webview';
 import { formatUrlVideo } from '../../utils'
 import { ScheduleAccordion } from '../ScheduleAccordion';
+import moment from 'moment';
 const BusinessInformationUI = (props: BusinessInformationParams) => {
 	const { businessState, businessSchedule, businessLocation } = props;
 
 	const theme = useTheme();
 	const [, t] = useLanguage();
 	const [{ optimizeImage }] = useUtils();
+	const [{ configs }] = useConfig()
+
+	const hideLocation = theme?.business_view?.components?.information?.components?.location?.hidden
+	const hideSchedule = theme?.business_view?.components?.information?.components?.schedule?.hidden
+	const hideVideos = theme?.business_view?.components?.information?.components?.videos?.hidden
+	const hideImages = theme?.business_view?.components?.information?.components?.images?.hidden
+	const hideAddress = theme?.business_view?.components?.information?.components?.address?.hidden
+	const formatTime = configs?.general_hour_format?.value
+
+	const checkTime = (val: number) => (val < 10 ? `0${val}` : val);
+	const timeFormated = (time: any) => {
+		return moment(`1900-01-01 ${checkTime(time.hour)}:${checkTime(time.minute)}`).format(formatTime)
+	}
 
-	const scheduleFormatted = ({
-		hour,
-		minute,
-	}: {
-		hour: number | string;
-		minute: number | string;
-	}) => {
-		const checkTime = (val: number | string) => (val < 10 ? `0${val}` : val);
-		const zz = hour > 12 ? 'PM' : 'AM';
-		const h = parseInt(`${hour}`);
-		return `${h > 12 ? h - 12 : h}:${checkTime(minute)} ${zz}`;
-	};
 	const businessCoordinate = {
 		lat: businessState?.business?.location?.lat,
 		lng: businessState?.business?.location?.lng,
@@ -78,87 +80,108 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
 					<OText size={24} weight={'600'}>
 						{businessState?.business?.name}
 					</OText>
-					<GrayBackground>
-						<OText size={16} weight="500">
-							{t('BUSINESS_LOCATION', 'Business Location')}
+					{!hideLocation && (
+						<>
+							<GrayBackground>
+								<OText size={16} weight="500">
+									{t('BUSINESS_LOCATION', 'Business Location')}
+								</OText>
+							</GrayBackground>
+							{businessLocation.location && (
+								<WrapBusinessMap style={styles.wrapMapStyle}>
+									<GoogleMap
+										readOnly
+										location={businessLocation.location}
+										markerTitle={businessState?.business?.name}
+									/>
+								</WrapBusinessMap>
+							)}
+						</>
+					)}
+					{!hideAddress && (
+						<OText size={12} mBottom={20}>
+							{businessState?.business?.address}
 						</OText>
-					</GrayBackground>
-					{businessLocation.location && (
-						<WrapBusinessMap style={styles.wrapMapStyle}>
-							<GoogleMap
-								readOnly
-								location={businessLocation.location}
-								markerTitle={businessState?.business?.name}
-							/>
-						</WrapBusinessMap>
 					)}
-					<OText size={12} mBottom={20}>
-						{businessState?.business?.address}
-					</OText>
 					<DivideView />
-					<GrayBackground>
-						<OText size={16} weight="500">
-							{t('OPENING_TIME', 'Opening Time')}
-						</OText>
-					</GrayBackground>
-					{businessSchedule && businessSchedule?.length > 0 && (
-						<WrapScheduleBlock>
-							{businessSchedule.map((schedule: any, i: number) => (
-								<ScheduleBlock key={i}>
-									<ScheduleAccordion
-										weekIndex={i}
-										scheduleFormatted={scheduleFormatted}
-										schedule={schedule}
-									/>
-								</ScheduleBlock>
-							))}
-						</WrapScheduleBlock>
+					{!hideSchedule && (
+						<>
+							<GrayBackground>
+								<OText size={16} weight="500">
+									{t('OPENING_TIME', 'Opening Time')}
+								</OText>
+							</GrayBackground>
+							{businessSchedule && businessSchedule?.length > 0 && (
+								<WrapScheduleBlock>
+									{businessSchedule.map((schedule: any, i: number) => (
+										<ScheduleBlock key={i}>
+											<ScheduleAccordion
+												weekIndex={i}
+												timeFormated={timeFormated}
+												schedule={schedule}
+											/>
+										</ScheduleBlock>
+									))}
+								</WrapScheduleBlock>
+							)}
+						</>
 					)}
+
 					{/* {businessState?.business?.gallery?.length > 0 && ( */}
+
 					<>
-						{bVideos().length > 0 && (
+						{!hideVideos && (
 							<>
-								<DivideView />
-								<GrayBackground>
-									<OText size={16} weight="500">
-										{t('VIDEOS', 'Videos')}
-									</OText>
-								</GrayBackground>
-								<MediaWrapper horizontal>
-									{bVideos().map((v: any) => (
-										<WebView
-											key={`vid_id_${v.id}`}
-											style={{ width: 210, height: 127, borderRadius: 7.6 }}
-											javaScriptEnabled={true}
-											domStorageEnabled={true}
-											source={{
-												html: `
-													<iframe width='80%' height='80%' src="${formatUrlVideo(v.video)}" frameBorder='0' allow='autoplay; encrypted-media' allowFullScreen />
+								{bVideos().length > 0 && (
+									<>
+										<DivideView />
+										<GrayBackground>
+											<OText size={16} weight="500">
+												{t('VIDEOS', 'Videos')}
+											</OText>
+										</GrayBackground>
+										<MediaWrapper horizontal>
+											{bVideos().map((v: any) => (
+												<WebView
+													key={`vid_id_${v.id}`}
+													style={{ width: 210, height: 127, borderRadius: 7.6 }}
+													javaScriptEnabled={true}
+													domStorageEnabled={true}
+													source={{
+														html: `
+												<iframe width='80%' height='80%' src="${formatUrlVideo(v.video)}" frameBorder='0' allow='autoplay; encrypted-media' allowFullScreen />
 												`,
-											}}
-											mediaPlaybackRequiresUserAction={true}
-										/>
-									))}
-								</MediaWrapper>
+													}}
+													mediaPlaybackRequiresUserAction={true}
+												/>
+											))}
+										</MediaWrapper>
+									</>
+								)}
 							</>
 						)}
-						{bImages().length > 0 && (
+
+						{!hideImages && (
 							<>
-								<DivideView />
-								<GrayBackground>
-									<OText size={16} weight="500">
-										{t('IMAGES', 'Images')}
-									</OText>
-								</GrayBackground>
-								<MediaWrapper horizontal>
-									{bImages().map((i: any) => (
-										i.file != null &&
-										<View key={i.id} style={{ width: 210, height: 127, borderRadius: 7.6, marginEnd: 20, overflow: 'hidden' }}>
-											<OIcon cover url={optimizeImage(i?.file, 'h_150,c_limit')} width={210} height={127} />
-											{/* <OText size={12} color={colors.red} style={{position: 'absolute'}}>{i.file}</OText> */}
-										</View>
-									))}
-								</MediaWrapper>
+								{bImages().length > 0 && (
+									<>
+										<DivideView />
+										<GrayBackground>
+											<OText size={16} weight="500">
+												{t('IMAGES', 'Images')}
+											</OText>
+										</GrayBackground>
+										<MediaWrapper horizontal>
+											{bImages().map((i: any) => (
+												i.file != null &&
+												<View key={i.id} style={{ width: 210, height: 127, borderRadius: 7.6, marginEnd: 20, overflow: 'hidden' }}>
+													<OIcon cover url={optimizeImage(i?.file, 'h_150,c_limit')} width={210} height={127} />
+													{/* <OText size={12} color={colors.red} style={{position: 'absolute'}}>{i.file}</OText> */}
+												</View>
+											))}
+										</MediaWrapper>
+									</>
+								)}
 							</>
 						)}
 					</>

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

@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from 'react'
+import { useFocusEffect } from '@react-navigation/native'
 import { TouchableOpacity, StyleSheet, View, Dimensions, Platform } from 'react-native'
 import { useLanguage, useUtils, useConfig, useOrder, MomentOption } from 'ordering-components/native'
 import { OButton, OIcon, OText } from '../shared'
@@ -310,9 +311,11 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     }
   }, [dateSelected])
 
-  useEffect(() => {
-    handleAsap && handleAsap()
-  }, [])
+  useFocusEffect(
+    React.useCallback(() => {
+      handleAsap && handleAsap()
+    }, [])
+  )
 
   return (
     <>

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

@@ -107,8 +107,7 @@ const BusinessProductsCategoriesUI = (props: any) => {
 				</Placeholder>
 			)}
 			{!loading &&
-				categories &&
-				categories.length &&
+				categories?.length > 0 &&
 				categories.map((category: any) => (
 					<Tab
 						key={category.id}

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

@@ -572,7 +572,7 @@ const CheckoutUI = (props: any) => {
 												data: deliveryOptions || [],
 												renderItem: ({ item }: any) => (
 													<TouchableOpacity
-														onPress={() => changeDeliveryOption(item.value)}
+														onPress={() => !!cart?.uuid && changeDeliveryOption(item.value)}
 														disabled={
 															deliveryOptionSelected === item.value
 														}

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

@@ -108,14 +108,14 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 	/* const toggleAccordion = () => {
 		if ((!product?.valid_menu && isCartProduct)) return
 		if (isActive) {
-		  Animated.timing(setHeight.height, {
+			Animated.timing(setHeight.height, {
 			 toValue: 100,
 			 duration: 500,
 			 easing: Easing.linear,
 			 useNativeDriver: false,
-		  }).start()
+			}).start()
 		} else {
-		  setHeightState({height: new Animated.Value(0)})
+			setHeightState({height: new Animated.Value(0)})
 		}
 	 }*/
 
@@ -136,7 +136,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 	}
 
 	/*useEffect(() => {
-	  toggleAccordion()
+		toggleAccordion()
 	}, [isActive])*/
 
 	const productOptions = getProductMax && [...Array(getProductMax(product) + 1),].map((_: any, opt: number) => {
@@ -289,7 +289,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 							)}
 							{productInfo().options.length > 0 && (
 								<ProductOptionsList>
-									{productInfo().options.map((option: any, i: number) => (
+									{productInfo().options.sort((a: any, b: any) => a.rank - b.rank).map((option: any, i: number) => (
 										<ProductOption key={option.id + i}>
 											<OText size={10} color={theme.colors.textSecondary}>{option.name}</OText>
 											{option.suboptions.map((suboption: any) => (

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

@@ -13,7 +13,7 @@ import { OIcon, OText } from '../shared';
 export const ScheduleAccordion = (props: any) => {
 
 	const {
-		scheduleFormatted,
+		timeFormated,
 		schedule,
 		weekIndex
 	} = props
@@ -52,9 +52,9 @@ export const ScheduleAccordion = (props: any) => {
 					{schedule?.lapses?.map((lapse: any) => (
 						schedule?.enabled ?
 							<OText mBottom={16}>
-								{scheduleFormatted(lapse.open) +
+								{timeFormated(lapse.open) +
 									' - ' +
-									scheduleFormatted(lapse.close)}
+									timeFormated(lapse.close)}
 							</OText>
 							:
 							<OText color={theme.colors.red} mBottom={16}>

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

@@ -48,9 +48,19 @@ const ProfileListUI = (props: ProfileParams) => {
 
 	const theme = useTheme();
 
-  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
-  const showLanguages = theme?.profile?.components?.languages?.hidden
-
+	const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
+	const hideProfileImage = theme?.profile?.components?.picture?.hidden
+	const hideOrders = theme?.profile?.components?.orders?.hidden
+	const hideProfile = theme?.profile?.components?.profile?.hidden
+	const hideWallet = theme?.profile?.components?.wallet?.hidden
+	const hideMessages = theme?.bar_menu?.components?.messages?.hidden
+	const hideHelp = theme?.bar_menu?.components?.help?.hidden
+	const hideFavorites = theme?.bar_menu?.components?.favortes?.hidden
+	const hideSession = theme?.bar_menu?.components?.sessions?.hidden
+	const hidePromotions = theme?.bar_menu?.components?.promotions?.hidden
+	const hideAddressList = theme?.profile?.components?.address_list?.hidden
+	const showLanguages = theme?.profile?.components?.languages?.hidden
+	const showNotifications = !theme?.profile?.components?.notification_settings?.hidden
 	const langPickerStyle = StyleSheet.create({
 		inputAndroid: {
 			color: theme.colors.textNormal,
@@ -153,7 +163,7 @@ const ProfileListUI = (props: ProfileParams) => {
 	return (
 		<View style={{ flex: 1, height: '100%', paddingTop: 20 }}>
 			<CenterView style={styles.pagePadding}>
-				{user?.photo && (
+				{user?.photo && !hideProfileImage && (
 					<View style={styles.photo}>
 						<FastImage
 							style={{ height: 60, width: 60, borderRadius: 8 }}
@@ -167,75 +177,91 @@ const ProfileListUI = (props: ProfileParams) => {
 				)}
 				<View style={{ flexBasis: '70%' }}>
 					<OText size={20} lineHeight={30} weight={Platform.OS === 'ios' ? '500' : 'bold'} color={theme.colors.textNormal}>{user?.name} {user?.lastname}</OText>
-					<TouchableOpacity onPress={() => navigation.navigate('ProfileForm', { ...detailProps })}>
-						<OText size={12} lineHeight={18} color={theme.colors.primary} style={{ textDecorationLine: 'underline' }}>{t('VIEW_ACCOUNT', 'View account')}</OText>
-					</TouchableOpacity>
+					{!hideProfile && (
+						<TouchableOpacity onPress={() => navigation.navigate('ProfileForm', { ...detailProps })}>
+							<OText size={12} lineHeight={18} color={theme.colors.primary} style={{ textDecorationLine: 'underline' }}>{t('VIEW_ACCOUNT', 'View account')}</OText>
+						</TouchableOpacity>
+					)}
 				</View>
 			</CenterView>
 			<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginVertical: 32 }} />
 			<Spinner visible={notificationsGroup?.loading} />
 			<ListWrap style={{ ...styles.pagePadding }}>
 				<Actions>
-					<ListItem onPress={() => onRedirect('AddressList', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<OIcon src={theme.images.general.pin} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SAVED_PLACES', 'My saved places')}</OText>
-					</ListItem>
-					<ListItem onPress={() => onRedirect('Messages', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<MessageCircle name='message1' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MESSAGES', 'Messages')}</OText>
-					</ListItem>
-					<ListItem onPress={() => onRedirect('MyOrders', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<FontAwesome name='list-alt' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MY_ORDERS', 'My Orders')}</OText>
-					</ListItem>
-					{isWalletEnabled && (
+					{!hideAddressList && (
+						<ListItem onPress={() => onRedirect('AddressList', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+							<OIcon src={theme.images.general.pin} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SAVED_PLACES', 'My saved places')}</OText>
+						</ListItem>
+					)}
+					{!hideMessages && (
+						<ListItem onPress={() => onRedirect('Messages', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+							<MessageCircle name='message1' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MESSAGES', 'Messages')}</OText>
+						</ListItem>
+					)}
+					{!hideOrders && (
+						<ListItem onPress={() => onRedirect('MyOrders', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+							<FontAwesome name='list-alt' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MY_ORDERS', 'My Orders')}</OText>
+						</ListItem>
+					)}
+					{isWalletEnabled && !hideWallet && (
 						<ListItem onPress={() => onRedirect('Wallets', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
 							<Ionicons name='wallet-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
 							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('WALLETS', 'Wallets')}</OText>
 						</ListItem>
 					)}
-					{IsPromotionsEnabled && (
+					{IsPromotionsEnabled && !hidePromotions && (
 						<ListItem onPress={() => onRedirect('Promotions', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
 							<MaterialIcons name='local-offer' style={styles.messageIconStyle} color={theme.colors.textNormal} />
 							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('PROMOTIONS', 'Promotions')}</OText>
 						</ListItem>
 					)}
-					<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
-						<OIcon src={theme.images.general.ic_help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('HELP', 'Help')}</OText>
-					</ListItem>
-					<ListItem onPress={() => navigation.navigate('Notifications', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<NotificationBadge style={{ borderRadius: 100 / 2 }} />
-						<Ionicons name='notifications-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('NOTIFICATIONS', 'Notifications')}
-						</OText>
-						<NotificationsWrapper>
-							<ToggleSwitch
-								isOn={user && (!!user?.settings?.notification?.newsletter ||
-									!!user?.settings?.sms?.newsletter ||
-									!!user?.settings?.email?.newsletter)}
-								onColor={theme.colors.primary}
-								size="small"
-								disabled={notificationsGroup?.loading}
-								offColor={theme.colors.disabled}
-								animationSpeed={400}
-								onToggle={() => handleChangePromotions(!(user && (!!user?.settings?.notification?.newsletter ||
-									!!user?.settings?.sms?.newsletter ||
-									!!user?.settings?.email?.newsletter)))}
-							/>
-						</NotificationsWrapper>
-					</ListItem>
-					<ListItem onPress={() => navigation.navigate('Sessions')} activeOpacity={0.7}>
-						<Ionicons name='md-list-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SESSIONS', 'Sessions')}</OText>
-					</ListItem>
-					<ListItem onPress={() => navigation.navigate('Favorite')} activeOpacity={0.7}>
-						<Ionicons name='heart-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('FAVORITES', 'Favorites')}</OText>
-					</ListItem>
+					{!hideHelp && (
+						<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
+							<OIcon src={theme.images.general.ic_help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('HELP', 'Help')}</OText>
+						</ListItem>
+					)}
+					{showNotifications && (
+						<ListItem onPress={() => navigation.navigate('Notifications', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+							<NotificationBadge style={{ borderRadius: 100 / 2 }} />
+							<Ionicons name='notifications-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MARKETING_NOTIFICATIONS', 'Marketing notifications')}
+							</OText>
+							<NotificationsWrapper>
+								<ToggleSwitch
+									isOn={user && (!!user?.settings?.notification?.newsletter ||
+										!!user?.settings?.sms?.newsletter ||
+										!!user?.settings?.email?.newsletter)}
+									onColor={theme.colors.primary}
+									size="small"
+									disabled={notificationsGroup?.loading}
+									offColor={theme.colors.disabled}
+									animationSpeed={400}
+									onToggle={() => handleChangePromotions(!(user && (!!user?.settings?.notification?.newsletter ||
+										!!user?.settings?.sms?.newsletter ||
+										!!user?.settings?.email?.newsletter)))}
+								/>
+							</NotificationsWrapper>
+						</ListItem>
+					)}
+					{!hideSession && (
+						<ListItem onPress={() => navigation.navigate('Sessions')} activeOpacity={0.7}>
+							<Ionicons name='md-list-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SESSIONS', 'Sessions')}</OText>
+						</ListItem>
+					)}
+					{!hideFavorites && (
+						<ListItem onPress={() => navigation.navigate('Favorite')} activeOpacity={0.7}>
+							<Ionicons name='heart-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('FAVORITES', 'Favorites')}</OText>
+						</ListItem>
+					)}
 				</Actions>
 
-        <Actions style={{ paddingTop: height * .02 }}>
+				<Actions style={{ paddingTop: height * .02 }}>
 					{!showLanguages && (
 						<LanguageSelector iconColor={theme.colors.textNormal} pickerStyle={langPickerStyle} />
 					)}

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

@@ -143,7 +143,7 @@ const WalletsUI = (props: any) => {
               btnStyle={{ paddingLeft: 0 }}
               hideArrowLeft={!hideWalletsTheme}
             />
-            {isChewLayout && (
+            {isChewLayout && !openHistory && (
               <OButton
                 text={t('WALLET_HISTORY', 'Wallet history')}
                 bgColor={theme.colors.white}