ordering-ui-react-native 0.16.33 → 0.16.34-release

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

@@ -1,4 +1,16 @@
-import React, { useEffect, useRef, useCallback } from 'react';
+import React, { useEffect, useRef, useState, useCallback } from 'react';
+import {
+	View,
+	Keyboard,
+	TextInput,
+	TouchableOpacity,
+	StyleSheet,
+	Dimensions,
+	I18nManager,
+	SafeAreaView,
+	Platform,
+	Button
+} from 'react-native';
 import {
 	ProductForm as ProductOptions,
 	useSession,
@@ -15,17 +27,10 @@ import Swiper from 'react-native-swiper'
 import FastImage from 'react-native-fast-image';
 import IconAntDesign from 'react-native-vector-icons/AntDesign';
 import YoutubePlayer from "react-native-youtube-iframe"
-import { TextInput } from 'react-native'
-import {
-	Grayscale
-} from 'react-native-color-matrix-image-filters'
-
-import { View, TouchableOpacity, StyleSheet, Dimensions, I18nManager, SafeAreaView, Platform, Button } from 'react-native';
 
 import {
 	WrapHeader,
 	TopHeader,
-	WrapContent,
 	ProductTitle,
 	ProductDescription,
 	ProductEditions,
@@ -45,8 +50,6 @@ import { ScrollView } from 'react-native-gesture-handler';
 import { ProductOptionSubOption } from '../ProductOptionSubOption';
 import { NotFoundSource } from '../NotFoundSource';
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
-import { useState } from 'react';
-const windowHeight = Dimensions.get('window').height;
 const windowWidth = Dimensions.get('window').width;
 
 export const ProductOptionsUI = (props: any) => {
@@ -66,6 +69,7 @@ export const ProductOptionsUI = (props: any) => {
 		handleChangeSuboptionState,
 		handleChangeCommentState,
 		productObject,
+		productAddedToCartLength
 	} = props;
 
 	const theme = useTheme();
@@ -122,6 +126,7 @@ export const ProductOptionsUI = (props: any) => {
 		},
 		slide1: {
 			flex: 1,
+			alignItems: 'center'
 		},
 		mainSwiper: {
 			height: 258,
@@ -151,6 +156,13 @@ export const ProductOptionsUI = (props: any) => {
 		productTagNameStyle: {
 			paddingHorizontal: 6,
 			marginRight: 5
+		},
+		actionContainer: {
+			flexDirection: 'row',
+			alignItems: 'center',
+			justifyContent: 'space-between',
+			width: '100%',
+			marginTop: 10
 		}
 	});
 
@@ -162,7 +174,7 @@ export const ProductOptionsUI = (props: any) => {
 	const [gallery, setGallery] = useState([])
 	const [thumbsSwiper, setThumbsSwiper] = useState(0)
 	const [indexGallery, setIndexGallery] = useState(0)
-	const [selOpt, setSelectedOpt] = useState(0);
+	const [selOpt, setSelectedOpt] = useState(-1);
 	const [isHaveWeight, setIsHaveWeight] = useState(false)
 	const [playing, setPlaying] = useState(false);
 	const [qtyBy, setQtyBy] = useState({
@@ -176,6 +188,7 @@ export const ProductOptionsUI = (props: any) => {
 	const [headerRefHeight, setHeaderRefHeight] = useState(0)
 	const [summaryRefHeight, setSummaryRefHeight] = useState(0)
 	const [isScrollAvailable, setIsScrollAvailable] = useState(null)
+	const [editionsLayoutY, setEditionsLayoutY] = useState(null)
 
 	const isError = (id: number) => {
 		let bgColor = theme.colors.white;
@@ -284,6 +297,7 @@ export const ProductOptionsUI = (props: any) => {
 		maxProductQuantity === 0 ||
 		Object.keys(errors).length > 0;
 
+	
 	const ExtraOptions = ({ eID, options }: any) => (
 		<>
 			{options.map(({ id, name, respect_to, suboptions }: any) => (
@@ -291,20 +305,28 @@ export const ProductOptionsUI = (props: any) => {
 					{respect_to == null && suboptions?.length > 0 && (
 						<TouchableOpacity
 							key={`eopt_key_${id}`}
-							onPress={() => setSelectedOpt(id)}
+							onPress={() => {
+								setSelectedOpt(id)
+								scrollViewRef?.current?.scrollTo && scrollViewRef.current.scrollTo({
+									y: optionLayout[`id:${id}`]?.y + editionsLayoutY - 50,
+									animated: true
+								})
+							}}
 							style={[
 								styles.extraItem,
 								{
 									borderBottomColor:
-										selOpt == id ? theme.colors.textNormal : theme.colors.border,
+										selOpt == id ? theme.colors.textNormal : theme.colors.backgroundPage,
 								},
 							]}>
 							<OText
 								color={
 									selOpt == id ? theme.colors.textNormal : theme.colors.textSecondary
 								}
-								size={selOpt == id ? 14 : 12}
-								weight={selOpt == id ? '600' : 'normal'}>
+								size={12}
+								weight={selOpt == id ? '600' : 'normal'}
+								style={{ maxWidth: 150 }}
+								numberOfLines={1}>
 								{name}
 							</OText>
 						</TouchableOpacity>
@@ -314,6 +336,14 @@ export const ProductOptionsUI = (props: any) => {
 		</>
 	);
 
+	const handleScroll = ({ nativeEvent: { contentOffset, layoutMeasurement } }: any) => {
+
+		const _topOption = Object.keys(optionLayout).find(((option: any) => Math.abs(contentOffset?.y - layoutMeasurement?.height - optionLayout[option]?.y) < 20))
+		if (_topOption) {
+			const _topOptionId = Number(_topOption.replace('id:', ''))
+		}
+	}
+
 	const handleGoBack = navigation?.canGoBack()
 		? () => navigation.goBack()
 		: () => navigation.navigate('Business', { store: props.businessSlug })
@@ -328,7 +358,7 @@ export const ProductOptionsUI = (props: any) => {
 	useEffect(() => {
 		const imageList: any = []
 		const videoList: any = []
-		product?.images && imageList.push(product.images)
+		product?.images?.length > 0 ? imageList.push(product.images) : imageList.push(theme?.images?.dummies?.product)
 		if (product?.gallery && product?.gallery.length > 0) {
 			for (const img of product?.gallery) {
 				if (img?.file) {
@@ -366,693 +396,624 @@ export const ProductOptionsUI = (props: any) => {
 		}
 	}, [product])
 
+	const ActionButton = () => {
+		return (
+			<View
+				style={{
+					width: isHaveWeight ? '100%' : ((isSoldOut || maxProductQuantity <= 0) ? '60%' : '40%'),
+				}}>
+				{((productCart &&
+					auth &&
+					orderState.options?.address_id) || (isSoldOut || maxProductQuantity <= 0)) && (
+						<OButton
+							onClick={() => handleSaveProduct()}
+							imgRightSrc=""
+							text={`${orderState.loading
+								? t('LOADING', 'Loading')
+								: (isSoldOut || maxProductQuantity <= 0)
+									? t('SOLD_OUT', 'Sold out')
+									: editMode
+										? t('UPDATE', 'Update')
+										: t('ADD', 'Add')
+								}`}
+							isDisabled={isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order))}
+							textStyle={{
+								color: saveErrors || isSoldOut || maxProductQuantity <= 0 ? theme.colors.primary : theme.colors.white,
+								fontSize: orderState.loading || editMode ? 10 : 14
+							}}
+							style={{
+								backgroundColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order)) ? theme.colors.lightGray : theme.colors.primary,
+								borderColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order)) ? theme.colors.white : theme.colors.primary,
+								opacity: saveErrors || isSoldOut || maxProductQuantity <= 0 ? 0.3 : 1,
+								borderRadius: 7.6,
+								height: 44,
+								shadowOpacity: 0,
+								borderWidth: 1,
+								marginTop: isHaveWeight ? 10 : 0
+							}}
+						/>
+					)}
+				{auth &&
+					!orderState.options?.address_id &&
+					(orderState.loading ? (
+						<OButton
+							isDisabled
+							text={t('LOADING', 'Loading')}
+							imgRightSrc=""
+							textStyle={{ fontSize: 10 }}
+						/>
+					) : (
+						<OButton onClick={navigation.navigate('AddressList')} />
+					))}
+				{!auth && (
+					<OButton
+						isDisabled={isSoldOut || maxProductQuantity <= 0}
+						onClick={() => handleRedirectLogin()}
+						text={
+							isSoldOut || maxProductQuantity <= 0
+								? t('SOLD_OUT', 'Sold out')
+								: t('LOGIN_SIGNUP', 'Login / Sign Up')
+						}
+						imgRightSrc=""
+						textStyle={{ color: theme.colors.primary, fontSize: 14 }}
+						style={{
+							height: 44,
+							borderColor: theme.colors.primary,
+							backgroundColor: theme.colors.white,
+						}}
+					/>
+				)}
+			</View>
+		)
+	}
+
+	useEffect(() => {
+		const keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', () => {
+			scrollViewRef.current.scrollToEnd({ animated: true })
+		})
+		return () => {
+			keyboardDidShowListener.remove()
+		}
+	}, [])
+
+
 	return (
 		<SafeAreaView style={{ flex: 1 }}>
 			<TopHeader>
 				<TopActions onPress={() => handleGoBack()}>
-					<OIcon src={theme.images.general.arrow_left} width={15} />
+					<IconAntDesign name='arrowleft' size={26} />
 				</TopActions>
 			</TopHeader>
-			<ScrollView ref={scrollViewRef}>
-				{!error && (
-					<View style={{ paddingBottom: 80 }}>
-						<WrapHeader onLayout={(event: any) => setHeaderRefHeight(event.nativeEvent.layout?.height)}>
-							{loading && !product ? (
-								<View style={styles.productHeaderSkeleton}>
-									<Placeholder Animation={Fade}>
-										<PlaceholderLine
-											height={258}
-											style={{ borderRadius: 0 }}
-											width={windowWidth}
-										/>
-									</Placeholder>
-								</View>
-							) : (
-								<>
-									<Swiper
-										loop={false}
-										ref={swiperRef}
-										showsButtons={true}
-										style={styles.mainSwiper}
-										showsPagination={false}
-										onIndexChanged={(index) => handleChangeMainIndex(index)}
-										prevButton={
-											<View style={styles.swiperButton}>
-												<IconAntDesign
-													name="caretleft"
-													color={theme.colors.white}
-													size={13}
-												// style={styles.starIcon}
-												/>
-											</View>
-										}
-										nextButton={
-											<View style={styles.swiperButton}>
-												<IconAntDesign
-													name="caretright"
-													color={theme.colors.white}
-													size={13}
-												// style={styles.starIcon}
+			{!error && (
+				<ScrollView
+					ref={scrollViewRef}
+					contentContainerStyle={{ paddingBottom: 80 }}
+					stickyHeaderIndices={[2]}
+					onScroll={handleScroll}
+				>
+					<WrapHeader onLayout={(event: any) => setHeaderRefHeight(event.nativeEvent.layout?.height)}>
+						{loading && !product ? (
+							<View style={styles.productHeaderSkeleton}>
+								<Placeholder Animation={Fade}>
+									<PlaceholderLine
+										height={258}
+										style={{ borderRadius: 0 }}
+										width={windowWidth}
+									/>
+								</Placeholder>
+							</View>
+						) : (
+							<>
+								<Swiper
+									loop={false}
+									ref={swiperRef}
+									showsButtons={true}
+									style={styles.mainSwiper}
+									showsPagination={false}
+									onIndexChanged={(index) => handleChangeMainIndex(index)}
+									prevButton={
+										<View style={styles.swiperButton}>
+											<IconAntDesign
+												name="caretleft"
+												color={theme.colors.white}
+												size={13}
+											// style={styles.starIcon}
+											/>
+										</View>
+									}
+									nextButton={
+										<View style={styles.swiperButton}>
+											<IconAntDesign
+												name="caretright"
+												color={theme.colors.white}
+												size={13}
+											// style={styles.starIcon}
+											/>
+										</View>
+									}
+								>
+									{gallery && gallery.length > 0 && gallery.map((img, i) => (
+										<View
+											style={styles.slide1}
+											key={i}
+										>
+											{String(img).includes('image') || typeof img === 'number' ? (
+												<FastImage
+													style={{ height: '100%', opacity: isSoldOut ? 0.5 : 1, aspectRatio: 3 / 2 }}
+													source={typeof img !== 'number' ? {
+														uri: optimizeImage(img, 'h_1024,c_limit'),
+														priority: FastImage.priority.normal,
+													} : img}
 												/>
-											</View>
-										}
-									>
-										{gallery && gallery.length > 0 && gallery.map((img, i) => (
+											) : (
+												<>
+													<YoutubePlayer
+														height={300}
+														play={playing}
+														videoId={img}
+														onChangeState={onStateChange}
+													/>
+													<Button title={playing ? "pause" : "play"} onPress={togglePlaying} />
+												</>
+											)}
+										</View>
+									))}
+								</Swiper>
+								<ScrollView
+									horizontal
+									contentContainerStyle={{
+										paddingHorizontal: 30,
+										paddingVertical: 15
+									}}
+								>
+									{gallery.length > 0 && gallery.map((img, index) => (
+										<TouchableOpacity
+											key={index}
+											onPress={() => handleClickThumb(index)}
+										>
 											<View
-												style={styles.slide1}
-												key={i}
+												style={{
+													height: 56,
+													borderRadius: 8,
+													margin: 8,
+													opacity: index === thumbsSwiper ? 1 : 0.8
+												}}
 											>
-												{img.includes('image') ? (
-													<FastImage
-														style={{ height: '100%', opacity: isSoldOut ? 0.5 : 1 }}
-														source={{
-															uri: optimizeImage(img, 'h_1024,c_limit'),
-															priority: FastImage.priority.normal,
+												{String(img).includes('image') ? (
+													<OIcon
+														url={img}
+														style={{
+															borderColor: theme.colors.lightGray,
+															borderRadius: 8,
+															minHeight: '100%',
+															opacity: isSoldOut ? 0.5 : 1
 														}}
+														width={56}
+														height={56}
+														cover
 													/>
 												) : (
-													<>
-														<YoutubePlayer
-															height={300}
-															play={playing}
-															videoId={img}
-															onChangeState={onStateChange}
-														/>
-														<Button title={playing ? "pause" : "play"} onPress={togglePlaying} />
-													</>
+													<OIcon
+														url={'http://img.youtube.com/vi/' + img + '/0.jpg'}
+														style={{
+															borderColor: theme.colors.lightGray,
+															borderRadius: 8,
+															minHeight: '100%',
+															opacity: isSoldOut ? 0.5 : 1
+														}}
+														width={56}
+														height={56}
+														cover
+													/>
 												)}
 											</View>
-										))}
-									</Swiper>
-									<ScrollView
-										horizontal
-										contentContainerStyle={{
-											paddingHorizontal: 30,
-											paddingVertical: 15
-										}}
-									>
-										{gallery.length > 0 && gallery.map((img, index) => (
-											<TouchableOpacity
-												key={index}
-												onPress={() => handleClickThumb(index)}
-											>
-												<View
-													style={{
-														height: 56,
-														borderRadius: 8,
-														margin: 8,
-														opacity: index === thumbsSwiper ? 1 : 0.8
-													}}
-												>
-													{img.includes('image') ? (
-														<OIcon
-															url={img}
-															style={{
-																borderColor: theme.colors.lightGray,
-																borderRadius: 8,
-																minHeight: '100%',
-																opacity: isSoldOut ? 0.5 : 1
-															}}
-															width={56}
-															height={56}
-															cover
-														/>
-													) : (
-														<OIcon
-															url={'http://img.youtube.com/vi/' + img + '/0.jpg'}
-															style={{
-																borderColor: theme.colors.lightGray,
-																borderRadius: 8,
-																minHeight: '100%',
-																opacity: isSoldOut ? 0.5 : 1
-															}}
-															width={56}
-															height={56}
-															cover
-														/>
-													)}
-												</View>
-											</TouchableOpacity>
+										</TouchableOpacity>
 
-										))}
-									</ScrollView>
-								</>
-							)}
-						</WrapHeader>
-						<WrapContent>
-							<ProductSummary onLayout={(event: any) => setSummaryRefHeight(event.nativeEvent.layout?.height)}>
-								<ProductTitle>
-									{loading && !product ? (
-										<Placeholder Animation={Fade}>
-											<View
-												style={{
-													flexDirection: 'row',
-													justifyContent: 'space-between',
-												}}>
-												<PlaceholderLine width={40} height={20} />
-												<PlaceholderLine width={30} height={20} />
-											</View>
-										</Placeholder>
-									) : (
-										<>
-											<View style={{ flexDirection: 'row' }}>
-												<OText
-													size={20}
-													lineHeight={30}
-													weight={'600'}
-													style={{ flex: 1, marginBottom: 10 }}>
-													{product?.name || productCart.name}
-												</OText>
-												{!!product?.calories && (
-													<OText size={16} style={{ color: '#808080' }}>{product?.calories} cal
-													</OText>
-												)}
-											</View>
-											{((!!product?.sku && product?.sku !== '-1' && product?.sku !== '1') || (!!product?.estimated_person)) && (
-												<OText size={14} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={'#909BA9'} mBottom={7}>
-													{
-														((product?.sku && product?.sku !== '-1' && product?.sku !== '1') || (productCart?.sku && productCart?.sku !== '-1' && productCart?.sku !== '1'))
-														&& <>{t('SKU', 'Sku')}{' '}{product?.sku || productCart?.sku}</>
-													}
-													{product?.sku && product?.sku !== '-1' && product?.sku !== '1' && product?.estimated_person && (
-														<>&nbsp;&#183;&nbsp;</>
-													)}
-													{product?.estimated_person
-														&& <>{product?.estimated_person}{' '}{t('ESTIMATED_PERSONS', 'persons')}</>
-													}
-												</OText>
-											)}
-											{isHaveWeight ? (
-												<OText size={16} lineHeight={24} color={theme.colors.primary}>{parsePrice(pricePerWeightUnit)} / {product?.weight_unit}</OText>
-											) : (
-												<View style={{ flexDirection: 'row', marginBottom: 10 }}>
-													<OText size={16} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={theme.colors.primary}>{productCart.price ? parsePrice(productCart.price) : ''}</OText>
-													{product?.offer_price !== null && product?.in_offer && (
-														<OText style={{
-															fontSize: 14,
-															color: '#808080',
-															textDecorationLine: 'line-through',
-															marginLeft: 7,
-															marginRight: 7
-														}}>{product?.offer_price ? parsePrice(product?.offer_price) : ''}</OText>
-													)}
-												</View>
-											)}
-										</>
-									)}
-								</ProductTitle>
-								<ProductDescription>
-									<OText color={theme.colors.textSecondary} size={12} lineHeight={18}>
-										{product?.description || productCart?.description}
-									</OText>
-								</ProductDescription>
-								<ScrollView
-									horizontal
-									showsHorizontalScrollIndicator={false}
-									contentContainerStyle={{ paddingBottom: 30 }}
-								>
-									{product?.tags?.map((tag: any) => (
-										<View
-											key={tag.id}
-											style={styles.productTagWrapper}
-										>
-											{!!tag?.image ? (
-												<OIcon
-													url={optimizeImage(tag?.image, 'h_40,c_limit')}
-													style={styles.productTagImageStyle}
-												/>
-											) : (
-												<OIcon
-													src={theme.images?.dummies?.product}
-													style={styles.productTagImageStyle}
-												/>
-											)}
-											<OText color={theme.colors.textSecondary} size={12} style={styles.productTagNameStyle}>{tag.name}</OText>
-										</View>
 									))}
 								</ScrollView>
-							</ProductSummary>
+							</>
+						)}
+					</WrapHeader>
+					<ProductSummary onLayout={(event: any) => setSummaryRefHeight(event.nativeEvent.layout?.height)}>
+						<ProductTitle>
 							{loading && !product ? (
-								<>
-									{[...Array(2)].map((item, i) => (
-										<Placeholder
-											key={i}
-											style={{ marginBottom: 20 }}
-											Animation={Fade}>
-											<PlaceholderLine
-												height={40}
-												style={{ flex: 1, marginTop: 10 }}
-											/>
-											{[...Array(3)].map((item, i) => (
-												<View
-													key={'place_key_' + i}
-													style={{
-														flexDirection: 'row',
-														justifyContent: 'space-between',
-													}}>
-													<PlaceholderLine
-														height={30}
-														width={10}
-														style={{ marginBottom: 20 }}
-													/>
-													<PlaceholderLine
-														height={30}
-														width={50}
-														style={{ marginBottom: 20 }}
-													/>
-													<PlaceholderLine
-														height={30}
-														width={30}
-														style={{ marginBottom: 20 }}
-													/>
-												</View>
-											))}
-										</Placeholder>
-									))}
-								</>
+								<Placeholder Animation={Fade}>
+									<View
+										style={{
+											flexDirection: 'row',
+											justifyContent: 'space-between',
+										}}>
+										<PlaceholderLine width={40} height={20} />
+										<PlaceholderLine width={30} height={20} />
+									</View>
+								</Placeholder>
 							) : (
-								<ProductEditions>
-									<ExtraOptionWrap
-										horizontal
-										showsHorizontalScrollIndicator={false}
-										style={{ marginBottom: 20 }}
-										contentContainerStyle={{ paddingHorizontal: 33 }}
-									>
-										<TouchableOpacity
-											key={`eopt_all_0`}
-											onPress={() => setSelectedOpt(0)}
-											style={[
-												styles.extraItem,
-												{
-													borderBottomColor: selOpt == 0 ? theme.colors.textNormal : theme.colors.border,
-												},
-											]}>
-											<OText
-												color={selOpt == 0 ? theme.colors.textNormal : theme.colors.textSecondary}
-												size={selOpt == 0 ? 14 : 12}
-												weight={selOpt == 0 ? '600' : 'normal'}>
-												{t('ALL', 'All')}
+								<>
+									<View style={{ flexDirection: 'row' }}>
+										<OText
+											size={20}
+											lineHeight={30}
+											weight={'600'}
+											style={{ flex: 1, marginBottom: 10 }}>
+											{product?.name || productCart.name}
+										</OText>
+										{!!product?.calories && (
+											<OText size={16} style={{ color: '#808080' }}>{product?.calories} cal
 											</OText>
-										</TouchableOpacity>
-										{product?.ingredients.length > 0 && (
-											<TouchableOpacity
-												key={`eopt_all_00`}
-												onPress={() => setSelectedOpt(-1)}
-												style={[
-													styles.extraItem,
-													{
-														borderBottomColor:
-															selOpt == -1 ? theme.colors.textNormal : theme.colors.border,
-													},
-												]}>
-												<OText
-													color={selOpt == -1 ? theme.colors.textNormal : theme.colors.textSecondary}
-													size={selOpt == -1 ? 14 : 12}
-													weight={selOpt == -1 ? '600' : 'normal'}>
-													{t('INGREDIENTS', 'Ingredients')}
-												</OText>
-											</TouchableOpacity>
-										)}
-										{product?.extras.map((extra: any) =>
-											<ExtraOptions key={extra.id} options={extra.options} />
 										)}
-									</ExtraOptionWrap>
-
-									{selOpt == 0 ? (
-										<>
-											{product?.ingredients.length > 0 && (
-												<View style={styles.optionContainer}>
-													<SectionTitle>
-														<OText size={16}>
-															{t('INGREDIENTS', 'Ingredients')}
-														</OText>
-													</SectionTitle>
-													<WrapperIngredients>
-														{product?.ingredients.map((ingredient: any) => (
-															<ProductIngredient
-																key={ingredient.id}
-																ingredient={ingredient}
-																state={
-																	productCart.ingredients[`id:${ingredient.id}`]
-																}
-																onChange={handleChangeIngredientState}
-																isSoldOut={isSoldOut}
-															/>
-														))}
-													</WrapperIngredients>
-												</View>
-											)}
-											{product?.extras.sort((a: any, b: any) => a.rank - b.rank).map((extra: any) =>
-												extra.options.sort((a: any, b: any) => a.rank - b.rank).map((option: any) => {
-													const currentState =
-														productCart.options[`id:${option.id}`] || {};
-													return (
-														<React.Fragment key={`popt_${option.id}`}>
-															{showOption(option) && (
-																<View style={styles.optionContainer} onLayout={(event: any) => handleOnLayout(event, option?.id)}>
-																	<ProductOption
-																		option={option}
-																		currentState={currentState}
-																		error={errors[`id:${option.id}`]}>
-																		<WrapperSubOption
-																			style={{
-																				backgroundColor: isError(option.id),
-																				borderRadius: 7.6
-																			}}>
-																			{option.suboptions.sort((a: any, b: any) => a.rank - b.rank).map(
-																				(suboption: any) => {
-																					const currentState =
-																						productCart.options[
-																							`id:${option.id}`
-																						]?.suboptions[
-																						`id:${suboption.id}`
-																						] || {};
-																					const balance =
-																						productCart.options[
-																							`id:${option.id}`
-																						]?.balance || 0;
-																					return (
-																						<ProductOptionSubOption
-																							key={suboption.id}
-																							isSoldOut={isSoldOut}
-																							onChange={
-																								handleChangeSuboptionState
-																							}
-																							balance={balance}
-																							option={option}
-																							suboption={suboption}
-																							state={currentState}
-																							disabled={
-																								isSoldOut ||
-																								maxProductQuantity <= 0
-																							}
-																							setIsScrollAvailable={setIsScrollAvailable}
-																							error={errors[`id:${option.id}`]}
-																						/>
-																					);
-																				},
-																			)}
-																		</WrapperSubOption>
-																	</ProductOption>
-																</View>
-															)}
-														</React.Fragment>
-													);
-												}),
+									</View>
+									{((!!product?.sku && product?.sku !== '-1' && product?.sku !== '1') || (!!product?.estimated_person)) && (
+										<OText size={14} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={'#909BA9'} mBottom={7}>
+											{
+												((product?.sku && product?.sku !== '-1' && product?.sku !== '1') || (productCart?.sku && productCart?.sku !== '-1' && productCart?.sku !== '1'))
+												&& <>{t('SKU', 'Sku')}{' '}{product?.sku || productCart?.sku}</>
+											}
+											{product?.sku && product?.sku !== '-1' && product?.sku !== '1' && product?.estimated_person && (
+												<>&nbsp;&#183;&nbsp;</>
 											)}
-										</>
+											{product?.estimated_person
+												&& <>{product?.estimated_person}{' '}{t('ESTIMATED_PERSONS', 'persons')}</>
+											}
+										</OText>
+									)}
+									{isHaveWeight ? (
+										<OText size={16} lineHeight={24} color={theme.colors.primary}>{parsePrice(pricePerWeightUnit)} / {product?.weight_unit}</OText>
 									) : (
-										<>
-											{selOpt == -1 ? (
-												<View style={styles.optionContainer}>
-													<SectionTitle>
-														<OText size={16}>
-															{t('INGREDIENTS', 'Ingredients')}
-														</OText>
-													</SectionTitle>
-													<WrapperIngredients>
-														{product?.ingredients.map((ingredient: any) => (
-															<ProductIngredient
-																key={ingredient.id}
-																ingredient={ingredient}
-																state={
-																	productCart.ingredients[`id:${ingredient.id}`]
-																}
-																onChange={handleChangeIngredientState}
-																isSoldOut={isSoldOut}
-															/>
-														))}
-													</WrapperIngredients>
-												</View>
-											) : (
-												<>
-													{product?.extras.map((extra: any) =>
-														extra.options.sort((a: any, b: any) => a.rank - b.rank).map((option: any) => {
-															if (
-																option.id == selOpt ||
-																(hasRespected(
-																	extra.options,
-																	option.respect_to,
-																) &&
-																	showOption(option))
-															) {
-																const currentState =
-																	productCart.options[`id:${option.id}`] || {};
-																return (
-																	<React.Fragment key={option.id}>
-																		{showOption(option) && (
-																			<View style={styles.optionContainer}>
-																				<ProductOption
-																					option={option}
-																					currentState={currentState}
-																					error={errors[`id:${option.id}`]}>
-																					<WrapperSubOption
-																						style={{
-																							backgroundColor: isError(
-																								option.id,
-																							),
-																						}}>
-																						{option.suboptions.sort((a: any, b: any) => a.rank - b.rank).map(
-																							(suboption: any) => {
-																								const currentState =
-																									productCart.options[
-																										`id:${option.id}`
-																									]?.suboptions[
-																									`id:${suboption.id}`
-																									] || {};
-																								const balance =
-																									productCart.options[
-																										`id:${option.id}`
-																									]?.balance || 0;
-																								return (
-																									<ProductOptionSubOption
-																										key={suboption.id}
-																										onChange={
-																											handleChangeSuboptionState
-																										}
-																										balance={balance}
-																										option={option}
-																										suboption={suboption}
-																										state={currentState}
-																										disabled={
-																											isSoldOut ||
-																											maxProductQuantity <= 0
-																										}
-																									/>
-																								);
-																							},
-																						)}
-																					</WrapperSubOption>
-																				</ProductOption>
-																			</View>
-																		)}
-																	</React.Fragment>
-																);
-															}
-														}),
-													)}
-												</>
+										<View style={{ flexDirection: 'row', marginBottom: 10 }}>
+											<OText size={16} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={theme.colors.primary}>{productCart.price ? parsePrice(productCart.price) : ''}</OText>
+											{product?.offer_price !== null && product?.in_offer && (
+												<OText style={{
+													fontSize: 14,
+													color: '#808080',
+													textDecorationLine: 'line-through',
+													marginLeft: 7,
+													marginRight: 7
+												}}>{product?.offer_price ? parsePrice(product?.offer_price) : ''}</OText>
 											)}
-										</>
-									)}
-									{!product?.hide_special_instructions && (
-										<ProductComment>
-											<SectionTitle>
-												<OText size={16} weight={'600'} lineHeight={24}>
-													{t('SPECIAL_COMMENT', 'Special comment')}
-												</OText>
-											</SectionTitle>
-											<OInput
-												multiline
-												placeholder={t('SPECIAL_COMMENT', 'Special comment')}
-												value={productCart.comment}
-												onChange={(val: string) =>
-													handleChangeCommentState({ target: { value: val } })
-												}
-												isDisabled={
-													!(productCart && !isSoldOut && maxProductQuantity)
-												}
-												style={styles.comment}
-											/>
-										</ProductComment>
+										</View>
 									)}
-								</ProductEditions>
+								</>
 							)}
-						</WrapContent>
-					</View>
-				)}
-				{!!error && error.length > 0 && (
-					<NotFoundSource content={error[0]?.message || error[0]} />
-				)}
-			</ScrollView>
-			{!loading && !error && product && (
-				<ProductActions ios={Platform?.OS === 'ios'}>
-					<View>
-						<OText size={16} lineHeight={24} weight={'600'}>
-							{productCart.total ? parsePrice(productCart?.total) : ''}
-						</OText>
-						{product?.minimum_per_order && productCart?.quantity < product?.minimum_per_order && <OText size={12} color={theme.colors?.red}>{t('MOBILE_MINIMUM_TO_ORDER', 'Min. _number_ ').replace('_number_', product?.minimum_per_order)}</OText>}
-						{product?.maximum_per_order && productCart?.quantity > product?.maximum_per_order && <OText size={12} color={theme.colors?.red}>{t('MOBILE_MAXIMUM_TO_ORDER', 'Max. _number_'.replace('_number_', product?.maximum_per_order))}</OText>}
-					</View>
-					{productCart && !isSoldOut && maxProductQuantity > 0 && (
-						<View style={styles.quantityControl}>
-							<TouchableOpacity
-								onPress={decrement}
-								disabled={productCart.quantity === 1 || isSoldOut}>
-								<OIcon
-									src={theme.images.general.minus}
-									width={16}
-									color={
-										productCart.quantity === 1 || isSoldOut
-											? theme.colors.backgroundGray
-											: theme.colors.backgroundDark
-									}
-								/>
-							</TouchableOpacity>
-							{qtyBy?.pieces && (
-								<TextInput
-									keyboardType='numeric'
-									value={`${productCart?.quantity > 0 ? productCart?.quantity : ''}`}
-									onChangeText={(val: any) => onChangeProductCartQuantity(parseInt(val))}
-									editable={!orderState.loading}
-									style={{
-										borderWidth: 1,
-										textAlign: 'center',
-										minWidth: 60,
-										borderRadius: 8,
-										borderColor: theme.colors.inputBorderColor,
-										height: 44,
-										marginHorizontal: 10
+						</ProductTitle>
+						<ProductDescription>
+							<OText color={theme.colors.textSecondary} size={12} lineHeight={18}>
+								{product?.description || productCart?.description}
+							</OText>
+						</ProductDescription>
+						<ScrollView
+							horizontal
+							showsHorizontalScrollIndicator={false}
+							contentContainerStyle={{ paddingBottom: 30 }}
+						>
+							{product?.tags?.map((tag: any) => (
+								<View
+									key={tag.id}
+									style={styles.productTagWrapper}
+								>
+									{!!tag?.image ? (
+										<OIcon
+											url={optimizeImage(tag?.image, 'h_40,c_limit')}
+											style={styles.productTagImageStyle}
+										/>
+									) : (
+										<OIcon
+											src={theme.images?.dummies?.product}
+											style={styles.productTagImageStyle}
+										/>
+									)}
+									<OText color={theme.colors.textSecondary} size={12} style={styles.productTagNameStyle}>{tag.name}</OText>
+								</View>
+							))}
+						</ScrollView>
+					</ProductSummary>
+					{(!loading && product) && (
+						<ExtraOptionWrap
+							horizontal
+							showsHorizontalScrollIndicator={false}
+							style={{
+								marginBottom: 20,
+								borderBottomWidth: 1,
+								borderBottomColor: theme.colors.border,
+								marginHorizontal: 30,
+								backgroundColor: theme.colors.backgroundPage,
+							}}
+						>
+							{product?.ingredients.length > 0 && (
+								<TouchableOpacity
+									key={`eopt_key_01`}
+									onPress={() => {
+										setSelectedOpt(0)
+										scrollViewRef?.current?.scrollTo && scrollViewRef.current.scrollTo({
+											y: optionLayout[`id:0`]?.y + editionsLayoutY - 50,
+											animated: true
+										})
 									}}
-								/>
+									style={[
+										styles.extraItem,
+										{
+											borderBottomColor:
+												selOpt == 0 ? theme.colors.textNormal : theme.colors.backgroundPage,
+										},
+									]}>
+									<OText
+										color={selOpt == 0 ? theme.colors.textNormal : theme.colors.textSecondary}
+										size={12}
+										weight={selOpt == 0 ? '600' : 'normal'}>
+										{t('INGREDIENTS', 'Ingredients')}
+									</OText>
+								</TouchableOpacity>
 							)}
-							{qtyBy?.weight_unit && (
-								<OText
-									size={12}
-									lineHeight={18}
-									style={{ minWidth: 40, textAlign: 'center' }}
-								>
-									{productCart.quantity * product?.weight}
-								</OText>
+							{product?.extras.map((extra: any) =>
+								<ExtraOptions key={extra.id} options={extra.options} />
 							)}
-							<TouchableOpacity
-								onPress={increment}
-								disabled={
-									maxProductQuantity <= 0 ||
-									productCart.quantity >= maxProductQuantity ||
-									isSoldOut
-								}>
-								<OIcon
-									src={theme.images.general.plus}
-									width={16}
-									color={
-										maxProductQuantity <= 0 ||
-											productCart.quantity >= maxProductQuantity ||
-											isSoldOut
-											? theme.colors.backgroundGray
-											: theme.colors.backgroundDark
-									}
-								/>
-							</TouchableOpacity>
-							{isHaveWeight && (
-								<WeightUnitSwitch>
-									<TouchableOpacity
-										onPress={() => handleSwitchQtyUnit('pieces')}
-									>
-										<WeightUnitItem active={qtyBy?.pieces}>
-											<OText
-												size={12}
-												lineHeight={18}
-												color={qtyBy?.pieces ? theme.colors.primary : theme.colors.textNormal}
-											>
-												{t('PIECES', 'pcs')}
+						</ExtraOptionWrap>
+					)}
+					{loading && !product ? (
+						<>
+							{[...Array(2)].map((item, i) => (
+								<Placeholder
+									key={i}
+									style={{ marginBottom: 20 }}
+									Animation={Fade}>
+									<PlaceholderLine
+										height={40}
+										style={{ flex: 1, marginTop: 10 }}
+									/>
+									{[...Array(3)].map((item, i) => (
+										<View
+											key={'place_key_' + i}
+											style={{
+												flexDirection: 'row',
+												justifyContent: 'space-between',
+											}}>
+											<PlaceholderLine
+												height={30}
+												width={10}
+												style={{ marginBottom: 20 }}
+											/>
+											<PlaceholderLine
+												height={30}
+												width={50}
+												style={{ marginBottom: 20 }}
+											/>
+											<PlaceholderLine
+												height={30}
+												width={30}
+												style={{ marginBottom: 20 }}
+											/>
+										</View>
+									))}
+								</Placeholder>
+							))}
+						</>
+					) : (
+						<ProductEditions
+							onLayout={(event: any) => {
+								setEditionsLayoutY(event.nativeEvent.layout?.y)
+							}}
+						>
+							<>
+								{product?.ingredients.length > 0 && (
+									<View style={styles.optionContainer} onLayout={(event: any) => handleOnLayout(event, 0)}>
+										<SectionTitle>
+											<OText size={16}>
+												{t('INGREDIENTS', 'Ingredients')}
 											</OText>
-										</WeightUnitItem>
+										</SectionTitle>
+										<WrapperIngredients>
+											{product?.ingredients.map((ingredient: any) => (
+												<ProductIngredient
+													key={ingredient.id}
+													ingredient={ingredient}
+													state={
+														productCart.ingredients[`id:${ingredient.id}`]
+													}
+													onChange={handleChangeIngredientState}
+													isSoldOut={isSoldOut}
+												/>
+											))}
+										</WrapperIngredients>
+									</View>
+								)}
+								{product?.extras.sort((a: any, b: any) => a.rank - b.rank).map((extra: any) =>
+									extra.options.sort((a: any, b: any) => a.rank - b.rank).map((option: any) => {
+										const currentState =
+											productCart.options[`id:${option.id}`] || {};
+										return (
+											<React.Fragment key={`popt_${option.id}`}>
+												{showOption(option) && (
+													<View style={styles.optionContainer} onLayout={(event: any) => handleOnLayout(event, option?.id)}>
+														<ProductOption
+															option={option}
+															currentState={currentState}
+															error={errors[`id:${option.id}`]}>
+															<WrapperSubOption
+																style={{
+																	backgroundColor: isError(option.id),
+																	borderRadius: 7.6
+																}}>
+																{option.suboptions.sort((a: any, b: any) => a.rank - b.rank).map(
+																	(suboption: any) => {
+																		const currentState =
+																			productCart.options[
+																				`id:${option.id}`
+																			]?.suboptions[
+																			`id:${suboption.id}`
+																			] || {};
+																		const balance =
+																			productCart.options[
+																				`id:${option.id}`
+																			]?.balance || 0;
+																		return (
+																			<ProductOptionSubOption
+																				key={suboption.id}
+																				isSoldOut={isSoldOut}
+																				onChange={
+																					handleChangeSuboptionState
+																				}
+																				balance={balance}
+																				option={option}
+																				suboption={suboption}
+																				state={currentState}
+																				disabled={
+																					isSoldOut ||
+																					maxProductQuantity <= 0
+																				}
+																				setIsScrollAvailable={setIsScrollAvailable}
+																				error={errors[`id:${option.id}`]}
+																			/>
+																		);
+																	},
+																)}
+															</WrapperSubOption>
+														</ProductOption>
+													</View>
+												)}
+											</React.Fragment>
+										);
+									}),
+								)}
+							</>
+							{!product?.hide_special_instructions && (
+								<ProductComment>
+									<SectionTitle>
+										<OText size={16} weight={'600'} lineHeight={24}>
+											{t('SPECIAL_COMMENT', 'Special comment')}
+										</OText>
+									</SectionTitle>
+									<OInput
+										multiline
+										placeholder={t('SPECIAL_COMMENT', 'Special comment')}
+										value={productCart.comment}
+										onChange={(val: string) =>
+											handleChangeCommentState({ target: { value: val } })
+										}
+										isDisabled={
+											!(productCart && !isSoldOut && maxProductQuantity)
+										}
+										style={styles.comment}
+									/>
+								</ProductComment>
+							)}
+						</ProductEditions>
+					)}
+					{!!error && error.length > 0 && (
+						<NotFoundSource content={error[0]?.message || error[0]} />
+					)}
+				</ScrollView>
+			)}
+			{!loading && !error && product && (
+				<ProductActions ios={Platform?.OS === 'ios'} isColumn={isHaveWeight}>
+					<View style={styles.actionContainer}>
+						<View>
+							<OText size={16} lineHeight={24} weight={'600'}>
+								{productCart.total ? parsePrice(productCart?.total) : ''}
+							</OText>
+							{product?.minimum_per_order && (productCart?.quantity + productAddedToCartLength) <= product?.minimum_per_order && productCart?.quantity !== 1 && <OText size={12} color={theme.colors?.red}>{t('MOBILE_MINIMUM_TO_ORDER', 'Min. _number_ ').replace('_number_', product?.minimum_per_order)}</OText>}
+							{product?.maximum_per_order && (productCart?.quantity + productAddedToCartLength) >= product?.maximum_per_order && <OText size={12} color={theme.colors?.red}>{t('MOBILE_MAXIMUM_TO_ORDER', 'Max. _number_'.replace('_number_', product?.maximum_per_order))}</OText>}
+						</View>
+						{productCart && !isSoldOut && maxProductQuantity > 0 && (
+							<>
+								<View style={styles.quantityControl}>
+									<TouchableOpacity
+										onPress={decrement}
+										disabled={productCart.quantity === 1 || !productCart.quantity || isSoldOut || ((productCart?.quantity + productAddedToCartLength) <= product?.minimum_per_order)}>
+										<OIcon
+											src={theme.images.general.minus}
+											width={20}
+											color={
+												productCart.quantity === 1 || isSoldOut
+													? theme.colors.backgroundGray
+													: theme.colors.backgroundDark
+											}
+										/>
+									</TouchableOpacity>
+									{qtyBy?.pieces && (
+										<TextInput
+											keyboardType='numeric'
+											value={`${productCart?.quantity > 0 ? productCart?.quantity : ''}`}
+											onChangeText={(val: any) => onChangeProductCartQuantity(parseInt(val))}
+											editable={!orderState.loading}
+											style={{
+												borderWidth: 1,
+												textAlign: 'center',
+												minWidth: 60,
+												borderRadius: 8,
+												borderColor: theme.colors.inputBorderColor,
+												height: 44,
+												marginHorizontal: 10,
+												fontSize: 16
+											}}
+										/>
+									)}
+									{qtyBy?.weight_unit && (
+										<OText
+											size={12}
+											lineHeight={18}
+											style={{ minWidth: 40, textAlign: 'center' }}
+										>
+											{productCart.quantity * product?.weight}
+										</OText>
+									)}
+									<TouchableOpacity
+										onPress={increment}
+										disabled={
+											maxProductQuantity <= 0 ||
+											(productCart?.quantity + productAddedToCartLength) >= maxProductQuantity ||
+											((productCart?.quantity + productAddedToCartLength) >= product?.maximum_per_order && product?.maximum_per_order) ||
+											isSoldOut
+										}>
+										<OIcon
+											src={theme.images.general.plus}
+											width={20}
+											color={
+												maxProductQuantity <= 0 ||
+													(productCart?.quantity + productAddedToCartLength) >= maxProductQuantity ||
+													((productCart?.quantity + productAddedToCartLength) >= product?.maximum_per_order && product?.maximum_per_order) ||
+													isSoldOut
+													? theme.colors.backgroundGray
+													: theme.colors.backgroundDark
+											}
+										/>
 									</TouchableOpacity>
-									<View style={{ alignItems: 'flex-start' }}>
+								</View>
+								{isHaveWeight && (
+									<WeightUnitSwitch>
 										<TouchableOpacity
-											onPress={() => handleSwitchQtyUnit('weight_unit')}
+											onPress={() => handleSwitchQtyUnit('pieces')}
 										>
-											<WeightUnitItem active={qtyBy?.weight_unit}>
+											<WeightUnitItem active={qtyBy?.pieces}>
 												<OText
 													size={12}
 													lineHeight={18}
-													color={qtyBy?.weight_unit ? theme.colors.primary : theme.colors.textNormal}
+													color={qtyBy?.pieces ? theme.colors.primary : theme.colors.textNormal}
 												>
-													{product?.weight_unit}
+													{t('PIECES', 'pcs')}
 												</OText>
 											</WeightUnitItem>
 										</TouchableOpacity>
-									</View>
-								</WeightUnitSwitch>
-							)}
-						</View>
-					)}
-					<View
-						style={{
-							width: isSoldOut || maxProductQuantity <= 0 ? '60%' : '40%',
-						}}>
-						{((productCart &&
-							auth &&
-							orderState.options?.address_id) || (isSoldOut || maxProductQuantity <= 0)) && (
-								<OButton
-									onClick={() => handleSaveProduct()}
-									imgRightSrc=""
-									text={`${orderState.loading
-										? t('LOADING', 'Loading')
-										: (isSoldOut || maxProductQuantity <= 0)
-											? t('SOLD_OUT', 'Sold out')
-											: editMode
-												? t('UPDATE', 'Update')
-												: t('ADD', 'Add')
-										}`}
-									isDisabled={isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && (productCart?.quantity < product?.minimum_per_order)) || (product?.maximum_per_order && (productCart?.quantity > product?.maximum_per_order))}
-									textStyle={{
-										color: saveErrors || isSoldOut || maxProductQuantity <= 0 ? theme.colors.primary : theme.colors.white,
-										fontSize: orderState.loading || editMode ? 10 : 14
-									}}
-									style={{
-										backgroundColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && (productCart?.quantity < product?.minimum_per_order)) || (product?.maximum_per_order && (productCart?.quantity > product?.maximum_per_order)) ? theme.colors.lightGray : theme.colors.primary,
-										borderColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && (productCart?.quantity < product?.minimum_per_order)) || (product?.maximum_per_order && (productCart?.quantity > product?.maximum_per_order)) ? theme.colors.white : theme.colors.primary,
-										opacity: saveErrors || isSoldOut || maxProductQuantity <= 0 ? 0.3 : 1,
-										borderRadius: 7.6,
-										height: 44,
-										shadowOpacity: 0,
-										borderWidth: 1,
-									}}
-								/>
-							)}
-						{auth &&
-							!orderState.options?.address_id &&
-							(orderState.loading ? (
-								<OButton
-									isDisabled
-									text={t('LOADING', 'Loading')}
-									imgRightSrc=""
-									textStyle={{ fontSize: 10 }}
-								/>
-							) : (
-								<OButton onClick={navigation.navigate('AddressList')} />
-							))}
-						{!auth && (
-							<OButton
-								isDisabled={isSoldOut || maxProductQuantity <= 0}
-								onClick={() => handleRedirectLogin()}
-								text={
-									isSoldOut || maxProductQuantity <= 0
-										? t('SOLD_OUT', 'Sold out')
-										: t('LOGIN_SIGNUP', 'Login / Sign Up')
-								}
-								imgRightSrc=""
-								textStyle={{ color: theme.colors.primary, fontSize: 14 }}
-								style={{
-									height: 44,
-									borderColor: theme.colors.primary,
-									backgroundColor: theme.colors.white,
-								}}
-							/>
+										<View style={{ alignItems: 'flex-start' }}>
+											<TouchableOpacity
+												onPress={() => handleSwitchQtyUnit('weight_unit')}
+											>
+												<WeightUnitItem active={qtyBy?.weight_unit}>
+													<OText
+														size={12}
+														lineHeight={18}
+														color={qtyBy?.weight_unit ? theme.colors.primary : theme.colors.textNormal}
+													>
+														{product?.weight_unit}
+													</OText>
+												</WeightUnitItem>
+											</TouchableOpacity>
+										</View>
+									</WeightUnitSwitch>
+								)}
+							</>
 						)}
+						{!isHaveWeight && <ActionButton />}
 					</View>
+					{isHaveWeight && <ActionButton />}
 				</ProductActions>
 			)}
 		</SafeAreaView>
@@ -1063,8 +1024,18 @@ export const ProductOptionsUI = (props: any) => {
 export const ProductForm = (props: any) => {
 	const productOptionsProps = {
 		...props,
-		UIComponent: ProductOptionsUI,
-	};
+		productCart: {
+			...props.productCart,
+			quantity: props.productCart?.code
+				? props.productCart?.quantity
+				: props?.product?.minimum_per_order || 1
+		},
+		UIComponent: ProductOptionsUI
+	}
 
-	return <ProductOptions {...productOptionsProps} />;
+	return <ProductOptions {...productOptionsProps} />
 };
+
+ProductForm.defaultProps = {
+	productAddedToCartLength: 0
+}