ordering-ui-react-native 0.21.50 → 0.21.51-release

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

@@ -327,8 +327,8 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 		<>
 			<Container
 				style={{
-					paddingLeft: !cateringPreorder || isPage ? 40 : 0,
-					paddingRight: !cateringPreorder || isPage ? 40 : 0
+					paddingLeft: !cateringPreorder || isPage ? 20 : 0,
+					paddingRight: !cateringPreorder || isPage ? 20 : 0
 				}}
 				nestedScrollEnabled
 			>
@@ -343,6 +343,11 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 							titleAlign={'center'}
 							titleStyle={{ fontSize: 20, marginRight: 0, marginLeft: 0 }}
 							titleWrapStyle={{ paddingHorizontal: 0 }}
+              buttonProps={{
+                bgColor: theme.colors.white,
+                borderColor: theme.colors.white,
+                textStyle: { color: theme.colors.btnFont }
+              }}
 						/>
 					)}
 					{(preorderMinimumDays === 0 && preorderLeadTime === 0) || !cateringPreorder && (
@@ -394,6 +399,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 								<View style={{ flex: 1 }}>
 									{selectDate && datesWhitelist[0]?.start !== null && (
 										<CalendarStrip
+											locale={locale}
 											scrollable
 											style={styles.calendar}
 											calendarHeaderContainerStyle={styles.calendarHeaderContainer}
@@ -467,8 +473,17 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 				<Spinner visible={momentState.isLoading === 1} />
 			</Container>
 			{!isCart && !cateringPreorder && (
-				<View style={{ position: 'absolute', bottom: bottom, paddingBottom: 20, paddingHorizontal: 40, backgroundColor: 'white', width: '100%' }}>
-					<OButton onClick={() => handleChangeMoment()} isDisabled={!selectedTime} text={t('CONTINUE', 'Continue')} style={{ borderRadius: 7.6, height: 44, shadowOpacity: 0 }} textStyle={{ color: 'white', fontSize: 14 }} showNextIcon />
+				<View style={{ position: 'absolute', bottom: bottom, paddingBottom: 20, paddingHorizontal: 20, backgroundColor: 'white', width: '100%' }}>
+					<OButton
+						onClick={() => handleChangeMoment()}
+						bgColor={theme.colors.primary}
+						borderColor={theme.colors.primary}
+						isDisabled={!selectedTime}
+						text={t('CONTINUE', 'Continue')}
+						style={{ borderRadius: 7.6, height: 44, shadowOpacity: 0 }}
+						textStyle={{ color: 'white', fontSize: 14 }}
+						showNextIcon
+					/>
 				</View>
 			)}
 		</>

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

@@ -11,7 +11,7 @@ export const MultiCartUI = () => {
   const theme = useTheme();
   return (
     <Container noPadding>
-      <ChContainer style={{ paddingHorizontal: 40 }}>
+      <ChContainer style={{ paddingHorizontal: 20 }}>
         <ChSection>
           <ChUserDetails>
             <Placeholder Animation={Fade}>

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

@@ -51,7 +51,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
   const { confirmApplePayPayment } = useApplePay()
 
   const [addCardOpen, setAddCardOpen] = useState({ stripe: false, stripeConnect: false });
-
+  const [newCardAdded, setNewCardAdded] = useState(null)
   const isWalletCashEnabled = configs?.wallet_cash_enabled?.value === '1'
   const isWalletPointsEnabled = configs?.wallet_credit_point_enabled?.value === '1'
 
@@ -223,6 +223,8 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
             handlePaymethodDataChange={handlePaymethodDataChange}
             clientSecret={props.clientSecret}
             onPaymentChange={handlePaymethodDataChange}
+            newCardAdded={newCardAdded}
+            addNewCardAsDefault
           />
         </View>
       )}
@@ -233,6 +235,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
           toSave
           businessId={businessIds[0]}
           businessIds={businessIds}
+          businessNames={openCarts?.map?.((cart: any) => cart?.business?.name)}
           publicKey={paymethodSelected?.data?.publishable}
           requirements={props.clientSecret}
           handleSource={handlePaymethodDataChange}
@@ -306,7 +309,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
         </>
       )}
 
-      {/* <OModal
+      <OModal
         entireModal
         title={t('ADD_CREDIT_OR_DEBIT_CARD', 'Add credit or debit card')}
         open={addCardOpen.stripe}
@@ -326,10 +329,11 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
             publicKey={paymethodSelected?.data?.publishable}
             requirements={props.clientSecret}
             onSelectCard={handlePaymethodDataChange}
+            setNewCardAdded={setNewCardAdded}
             onCancel={() => setAddCardOpen({ ...addCardOpen, stripe: false })}
           />
         </KeyboardAvoidingView>
-      </OModal> */}
+      </OModal>
     </PMContainer>
   )
 }

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useCallback } from 'react'
 import {
   useLanguage,
   useConfig,
@@ -10,8 +10,9 @@ import {
   ToastType,
   MultiCheckout as MultiCheckoutController
 } from 'ordering-components/native'
-import { View, StyleSheet, Platform, ScrollView } from 'react-native'
+import { View, StyleSheet, Platform, ScrollView, SafeAreaView } from 'react-native'
 import { useTheme } from 'styled-components/native';
+import IconAntDesign from 'react-native-vector-icons/AntDesign';
 import { Container } from '../../layouts/Container';
 import NavBar from '../NavBar';
 import { OText, OIcon, OModal, OButton } from '../shared';
@@ -30,6 +31,8 @@ import { SignupForm } from '../SignupForm'
 import { LoginForm } from '../LoginForm'
 
 import {
+  TopHeader,
+  TopActions,
   ChContainer,
   ChSection,
   ChHeader,
@@ -73,14 +76,18 @@ const MultiCheckoutUI = (props: any) => {
   const theme = useTheme();
   const styles = StyleSheet.create({
     pagePadding: {
-      paddingLeft: 40,
-      paddingRight: 40
+      paddingLeft: 20,
+      paddingRight: 20
+    },
+    wrapperNavbar: {
+      paddingHorizontal: 20,
+      backgroundColor: theme?.colors?.white,
+      borderWidth: 0
     },
-    wrapperNavbar: { paddingHorizontal: 40 },
     detailWrapper: {
-			paddingHorizontal: 40,
-			width: '100%'
-		},
+      paddingHorizontal: 20,
+      width: '100%'
+    },
   })
 
   const [, { showToast }] = useToast();
@@ -136,18 +143,20 @@ const MultiCheckoutUI = (props: any) => {
     ?.reduce((sum: any, cart: any) => sum + clearAmount((cart?.subtotal + getIncludedTaxes(cart)) * accumulationRateBusiness(cart?.business_id)), 0)
     ?.toFixed(configs.format_number_decimal_length?.value ?? 2)
 
+  const [showTitle, setShowTitle] = useState(false)
   const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
   const [phoneUpdate, setPhoneUpdate] = useState(false);
   const [userErrors, setUserErrors] = useState<any>([]);
+  const [cartsOpened, setCartsOpened] = useState([])
   const [placeByMethodPay, setPlaceByMethodPay] = useState(false)
-	const [allowedGuest, setAllowedGuest] = useState(false)
-	const [isOpen, setIsOpen] = useState(false)
-	const [requiredFields, setRequiredFields] = useState<any>([])
-	const stripePaymethods: any = ['stripe', 'stripe_direct', 'stripe_connect', 'stripe_redirect']
-	const [openModal, setOpenModal] = useState({ login: false, signup: false, isGuest: false })
+  const [allowedGuest, setAllowedGuest] = useState(false)
+  const [isOpen, setIsOpen] = useState(false)
+  const [requiredFields, setRequiredFields] = useState<any>([])
+  const stripePaymethods: any = ['stripe', 'stripe_direct', 'stripe_connect', 'stripe_redirect']
+  const [openModal, setOpenModal] = useState({ login: false, signup: false, isGuest: false })
   const [methodPaySupported, setMethodPaySupported] = useState({ enabled: false, message: null, loading: true })
   const methodsPay = ['global_google_pay', 'global_apple_pay']
-  const isDisablePlaceOrderButton = cartGroup?.loading || (!(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) && cartGroup?.result?.balance > 0) ||
+  const isDisablePlaceOrderButton = cartGroup?.loading || placing || (!(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) && cartGroup?.result?.balance > 0) ||
     (paymethodSelected?.paymethod?.gateway === 'stripe' && !paymethodSelected?.paymethod_data) ||
     walletCarts.length > 0
     || (methodsPay.includes(paymethodSelected?.gateway) && (!methodPaySupported.enabled || methodPaySupported.loading)) || openCarts?.length === 0
@@ -162,7 +171,7 @@ const MultiCheckoutUI = (props: any) => {
     setUserErrors([])
     const errors = []
     const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
-		const _requiredFields: any = []
+    const _requiredFields: any = []
 
     Object.values(validationFields?.fields?.checkout).map((field: any) => {
       if (field?.required && !notFields.includes(field.code)) {
@@ -180,7 +189,7 @@ const MultiCheckoutUI = (props: any) => {
     ) {
       _requiredFields.push('cellphone')
     }
-		setRequiredFields(_requiredFields)
+    setRequiredFields(_requiredFields)
 
     if (phoneUpdate) {
       errors.push(t('NECESSARY_UPDATE_COUNTRY_PHONE_CODE', 'It is necessary to update your phone number'))
@@ -195,18 +204,18 @@ const MultiCheckoutUI = (props: any) => {
 
   const handlePlaceOrder = (confirmPayment?: any) => {
     if (stripePaymethods.includes(paymethodSelected?.gateway) && user?.guest_id) {
-			setOpenModal({ ...openModal, signup: true, isGuest: true })
-			return
-		}
+      setOpenModal({ ...openModal, signup: true, isGuest: true })
+      return
+    }
 
     if (!userErrors.length && (!requiredFields?.length || allowedGuest)) {
       handleGroupPlaceOrder && handleGroupPlaceOrder(confirmPayment)
       return
     }
     if (requiredFields?.length) {
-			setIsOpen(true)
-			return
-		}
+      setIsOpen(true)
+      return
+    }
     let stringError = ''
     Object.values(userErrors).map((item: any, i: number) => {
       stringError += (i + 1) === userErrors.length ? `- ${item?.message || item}` : `- ${item?.message || item}\n`
@@ -216,22 +225,34 @@ const MultiCheckoutUI = (props: any) => {
   }
 
   const handlePlaceOrderAsGuest = () => {
-		setIsOpen(false)
-		handleGroupPlaceOrder && handleGroupPlaceOrder()
-	}
+    setIsOpen(false)
+    handleGroupPlaceOrder && handleGroupPlaceOrder()
+  }
 
   const handleSuccessSignup = (user: any) => {
-		login({
-			user,
-			token: user?.session?.access_token
-		})
-		openModal?.isGuest && handlePlaceOrderAsGuest()
-		setOpenModal({ ...openModal, signup: false, isGuest: false })
-	}
-
-	const handleSuccessLogin = (user: any) => {
-		if (user) setOpenModal({ ...openModal, login: false })
-	}
+    login({
+      user,
+      token: user?.session?.access_token
+    })
+    openModal?.isGuest && handlePlaceOrderAsGuest()
+    setOpenModal({ ...openModal, signup: false, isGuest: false })
+  }
+
+  const handleSuccessLogin = (user: any) => {
+    if (user) setOpenModal({ ...openModal, login: false })
+  }
+
+  const handleScroll = ({ nativeEvent: { contentOffset } }: any) => {
+    setShowTitle(contentOffset.y > 30)
+  }
+
+  const handleGoBack = () => {
+    if (navigation?.canGoBack()) {
+      navigation.goBack()
+    } else {
+      navigation.navigate('BottomTab', { screen: 'Cart' })
+    }
+  }
 
   useEffect(() => {
     if (validationFields && validationFields?.fields?.checkout) {
@@ -271,17 +292,58 @@ const MultiCheckoutUI = (props: any) => {
     }
   }, [paymethodSelected])
 
+  const changeActiveState = useCallback((isClosed: boolean, uuid: string) => {
+    const isActive = cartsOpened?.includes?.(uuid)
+    if (isActive || !isClosed) {
+      setCartsOpened(cartsOpened?.filter?.((_uuid) => _uuid !== uuid))
+    } else {
+      setCartsOpened([
+        ...cartsOpened,
+        uuid
+      ])
+    }
+  }, [cartsOpened])
+
   return (
     <>
-      <Container noPadding>
+      <SafeAreaView style={{ backgroundColor: theme.colors.backgroundPage }}>
+        <View style={styles.wrapperNavbar}>
+          <TopHeader>
+            <>
+              <TopActions onPress={() => handleGoBack()}>
+                <IconAntDesign
+                  name='arrowleft'
+                  size={26}
+                />
+              </TopActions>
+              {showTitle && (
+                <OText
+                  size={16}
+                  style={{ flex: 1, textAlign: 'center', right: 15 }}
+                  weight={Platform.OS === 'ios' ? '600' : 'bold'}
+                  numberOfLines={2}
+                  ellipsizeMode='tail'
+                >
+                  {t('CHECKOUT', 'Checkout')}
+                </OText>
+              )}
+            </>
+          </TopHeader>
+        </View>
+      </SafeAreaView>
+      <Container pt={0} noPadding onScroll={handleScroll} showsVerticalScrollIndicator={false}>
         <View style={styles.wrapperNavbar}>
           <NavBar
+            hideArrowLeft
             title={t('CHECKOUT', 'Checkout')}
             titleAlign={'center'}
             onActionLeft={() => navigation?.canGoBack() && navigation.goBack()}
             showCall={false}
             paddingTop={Platform.OS === 'ios' ? 0 : 4}
             btnStyle={{ paddingLeft: 0 }}
+            titleWrapStyle={{ paddingHorizontal: 0 }}
+            titleStyle={{ marginRight: 0, marginLeft: 0 }}
+            style={{ marginTop: 20 }}
           />
         </View>
         <ChContainer style={styles.pagePadding}>
@@ -473,6 +535,9 @@ const MultiCheckoutUI = (props: any) => {
                     hideDriverTip={configs?.multi_business_checkout_show_combined_driver_tip?.value === '1'}
                     onNavigationRedirect={(route: string, params: any) => props.navigation.navigate(route, params)}
                     businessConfigs={cart?.business?.configs}
+                    cartsOpened={cartsOpened}
+                    changeActiveState={changeActiveState}
+                    isActive={cartsOpened?.includes?.(cart?.uuid)}
                   />
                   {openCarts.length > 1 && (
                     <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
@@ -582,30 +647,30 @@ const MultiCheckoutUI = (props: any) => {
           </ScrollView>
         </OModal>
         <OModal
-						open={isOpen}
-						onClose={() => setIsOpen(false)}
-					>
-						<View style={styles.detailWrapper}>
-							<UserDetails
-								isUserDetailsEdit
-								useValidationFields
-								useDefualtSessionManager
-								useSessionUser
-								isCheckout
-								isEdit
-								phoneUpdate={phoneUpdate}
-								togglePhoneUpdate={togglePhoneUpdate}
-								requiredFields={requiredFields}
-								hideUpdateButton
-								handlePlaceOrderAsGuest={handlePlaceOrderAsGuest}
-								onClose={() => {
-									setIsOpen(false)
-									handlePlaceOrder()
-								}}
-								setIsOpen={setIsOpen}
-							/>
-						</View>
-					</OModal>
+          open={isOpen}
+          onClose={() => setIsOpen(false)}
+        >
+          <View style={styles.detailWrapper}>
+            <UserDetails
+              isUserDetailsEdit
+              useValidationFields
+              useDefualtSessionManager
+              useSessionUser
+              isCheckout
+              isEdit
+              phoneUpdate={phoneUpdate}
+              togglePhoneUpdate={togglePhoneUpdate}
+              requiredFields={requiredFields}
+              hideUpdateButton
+              handlePlaceOrderAsGuest={handlePlaceOrderAsGuest}
+              onClose={() => {
+                setIsOpen(false)
+                handlePlaceOrder()
+              }}
+              setIsOpen={setIsOpen}
+            />
+          </View>
+        </OModal>
       </Container>
 
       <FloatingButton

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

@@ -1,5 +1,22 @@
 import styled from 'styled-components/native'
 
+export const TopActions = styled.TouchableOpacity`
+	height: 60px;
+	justify-content: center;
+  min-width: 30px;
+  padding-right: 15px;
+`;
+
+export const TopHeader = styled.View`
+  width: 100%;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  z-index: 1;
+  height: 60px;
+  min-height: 60px;
+`
+
 export const ChContainer = styled.View`
   margin-bottom: 60px;
 `

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

@@ -53,6 +53,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
   const [{ configs }] = useConfig()
 
   const isTaxIncludedOnPrice = orders.every((_order: any) => _order.taxes?.length ? _order.taxes?.every((_tax: any) => _tax.type === 1) : true)
+  const deliveryType = orders.find((order: any) => order.delivery_type)?.delivery_type
   const progressBarStyle = configs.multi_business_checkout_progress_bar_style?.value
   const showBarInOrder = ['group', 'both']
   const showBarInIndividual = ['individual', 'both']
@@ -71,7 +72,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
       navigation?.canGoBack() && navigation.goBack();
       return;
     }
-    navigation.navigate('BusinessList');
+    navigation.navigate('BottomTab');
     return true
   }
 
@@ -93,7 +94,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
   }, [])
 
   return (
-    <OrdersDetailsContainer keyboardShouldPersistTaps="handled" contentContainerStyle={{ paddingHorizontal: 40 }}>
+    <OrdersDetailsContainer keyboardShouldPersistTaps="handled" contentContainerStyle={{ paddingHorizontal: 20 }}>
       <View style={{ flexDirection: 'row' }}>
         <OButton
           imgRightSrc={null}
@@ -171,19 +172,23 @@ export const MultiOrdersDetailsUI = (props: any) => {
         ))}
       </Section>
       <Divider />
-      <Section>
-        <OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal} mBottom={20}>
-          {t('DELIVERYA_V21', 'Delivery address')}
-        </OText>
-        {loading ? (
-          <PlaceholderLine height={18} noMargin style={{ borderRadius: 2 }} />
-        ) : (
-          <OText size={12} lineHeight={18} color={theme.colors.textNormal} mBottom={2}>
-            {customer?.address}
-          </OText>
-        )}
-      </Section>
-      <Divider />
+      {deliveryType === 1 && (
+        <>
+          <Section>
+            <OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal} mBottom={20}>
+              {t('DELIVERYA_V21', 'Delivery address')}
+            </OText>
+            {loading ? (
+              <PlaceholderLine height={18} noMargin style={{ borderRadius: 2 }} />
+            ) : (
+              <OText size={12} lineHeight={18} color={theme.colors.textNormal} mBottom={2}>
+                {customer?.address}
+              </OText>
+            )}
+          </Section>
+          <Divider />
+        </>
+      )}
       {loading ? (
         <Placeholder Animation={Fade}>
           <PlaceholderLine

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

@@ -2,13 +2,14 @@ import React, { useState, useEffect } from 'react'
 import { useLanguage } from 'ordering-components/native';
 import { View, StyleSheet, RefreshControl, Platform } from 'react-native';
 import AntDesignIcon from 'react-native-vector-icons/AntDesign'
-
+import { GiftCardOrdersList } from '../GiftCard/GiftCardOrdersList'
 import { OrdersOption } from '../OrdersOption'
 import { HeaderTitle, OButton, OText } from '../shared'
 import { ScrollView } from 'react-native-gesture-handler';
 import { Tab } from './styles'
 import { useTheme } from 'styled-components/native';
 import { Container } from '../../layouts/Container';
+import NavBar from '../NavBar'
 
 export const MyOrders = (props: any) => {
   const {
@@ -40,7 +41,8 @@ export const MyOrders = (props: any) => {
   const MyOrdersMenu = [
     { key: 'orders', value: t('ORDERS', 'Orders'), disabled: false },
     { key: 'business', value: t('BUSINESS', 'Business'), disabled: hideBusinessTab },
-    { key: 'products', value: t('PRODUCTS', 'Products'), disabled: hideProductsTab }
+    { key: 'products', value: t('PRODUCTS', 'Products'), disabled: hideProductsTab },
+    { key: 'giftCards', value: t('GIFT_CARD', 'Gift card'), disabled: false }
   ]
   const goToBack = () => navigation?.canGoBack() && navigation.goBack()
 
@@ -87,34 +89,25 @@ export const MyOrders = (props: any) => {
             display: 'flex',
             flexDirection: 'row',
             alignItems: 'center',
-            paddingHorizontal: isChewLayout ? 20 : 40,
+            paddingHorizontal: 20,
           },
           ...props.titleStyle
         }}>
           {!props.hideBackBtn && (!isChewLayout || (isChewLayout && hideOrdersTheme)) && (
-            <OButton
-              imgLeftStyle={{ width: 18 }}
-              imgRightSrc={null}
-              style={{
-                borderWidth: 0,
-                width: 26,
-                height: 26,
-                backgroundColor: '#FFF',
-                borderColor: '#FFF',
-                shadowColor: '#FFF',
-                paddingLeft: 0,
-                paddingRight: 0,
-                marginTop: 30,
-              }}
-              onClick={goToBack}
-              icon={AntDesignIcon}
-              iconProps={{
-                name: 'arrowleft',
-                size: 26
+            <NavBar
+              title={t('MY_ORDERS', 'My Orders')}
+              titleAlign={'center'}
+              onActionLeft={goToBack}
+              showCall={false}
+              paddingTop={30}
+              btnStyle={{ paddingLeft: 0 }}
+              buttonProps={{
+                bgColor: theme.colors.white,
+                borderColor: theme.colors.white,
+                textStyle: { color: theme.colors.btnFont }
               }}
             />
           )}
-          <HeaderTitle ph={10} text={t('MY_ORDERS', 'My Orders')} />
         </View>
       )}
       {!hideOrders && !isChewLayout && !showNavbar && (
@@ -124,7 +117,7 @@ export const MyOrders = (props: any) => {
         <ScrollView
           horizontal
           style={{ ...styles.container, borderBottomWidth: 1 }}
-          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : isChewLayout ? 20 : 40 }}
+          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : 20 }}
           showsHorizontalScrollIndicator={false}
           scrollEventThrottle={16}
         >
@@ -148,7 +141,7 @@ export const MyOrders = (props: any) => {
       )}
       {selectedOption === 'orders' && (
         <>
-          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
+          <View style={{ paddingHorizontal: 20 }}>
             <OrdersOption
               {...props}
               preOrders
@@ -158,7 +151,7 @@ export const MyOrders = (props: any) => {
               refreshOrders={refreshOrders}
             />
           </View>
-          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
+          <View style={{ paddingHorizontal: 20 }}>
             <OrdersOption
               {...props}
               activeOrders
@@ -168,7 +161,7 @@ export const MyOrders = (props: any) => {
               refreshOrders={refreshOrders}
             />
           </View>
-          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
+          <View style={{ paddingHorizontal: 20 }}>
             <OrdersOption
               {...props}
               ordersLength={ordersLength}
@@ -215,7 +208,14 @@ export const MyOrders = (props: any) => {
           setOrdersLength={setOrdersLength}
         />
       )}
+      
+      {selectedOption === 'giftCards' && (
+        <View style={{ paddingHorizontal: 20  }}>
+          <GiftCardOrdersList
+            onNavigationRedirect={props?.onNavigationRedirect}
+          />
+        </View>
+      )}
     </Container>
-
   )
 }

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

@@ -1,3 +1,6 @@
+
+
+
 import * as React from 'react'
 import styled, { useTheme } from 'styled-components/native'
 import { OButton, OIcon, OText } from '../shared'
@@ -44,6 +47,7 @@ interface Props {
 	isVertical?: boolean,
 	noMargin?: any
 	hideArrowLeft?: boolean
+	buttonProps?: any
 }
 
 const NavBar = (props: Props) => {
@@ -64,6 +68,7 @@ const NavBar = (props: Props) => {
 		<Wrapper style={{ paddingTop: props.paddingTop, ...{ flexDirection: props.isVertical ? 'column' : 'row', alignItems: props.isVertical ? 'flex-start' : 'center' }, ...props.style }}>
 			{!props.hideArrowLeft && (
 				<OButton
+					{...props.buttonProps}
 					iconProps={{
 						name: 'arrowleft',
 						size: 26

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useLanguage, useOrderingTheme } from 'ordering-components/native'
+import { useLanguage } from 'ordering-components/native'
 import { Dimensions } from 'react-native'
 import RNRestart from 'react-native-restart'
 import { OText, OIcon, OButton } from '../shared'
@@ -16,8 +16,7 @@ export const NetworkError = (props: NoNetworkParams) => {
   } = props
   const theme = useTheme()
   const [, t] = useLanguage()
-  const [orderingTheme] = useOrderingTheme()
-  const urlimage = orderingTheme?.theme?.no_internet?.components?.image
+  const urlimage = theme?.no_internet?.components?.image
   const noNetworkImage = image || theme.images.general.noNetwork
   const deviceWidth = Dimensions.get('screen').width
 

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

@@ -2,10 +2,10 @@ import styled from 'styled-components/native'
 
 export const Container = styled.View`
   flex: 1;
-  padding: 20px 40px;
+  padding: 20px;
 `
 export const ImageContainer = styled.View`
   flex: 1;
   align-items: center;
   justify-content: center;
-`
+`