ordering-ui-react-native 0.21.31-testing → 0.21.32-release

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,11 +10,12 @@ import {
   ToastType,
   MultiCheckout as MultiCheckoutController
 } from 'ordering-components/native'
-import { View, StyleSheet, Platform } 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 } from '../shared';
+import { OText, OIcon, OModal, OButton } from '../shared';
 import { getTypesText } from '../../utils';
 import { UserDetails } from '../UserDetails'
 import { AddressDetails } from '../AddressDetails'
@@ -26,8 +27,12 @@ import { DriverTips } from '../DriverTips'
 import { CouponControl } from '../CouponControl';
 import { DriverTipsContainer } from '../Cart/styles'
 import { OSTable, OSCoupon } from '../OrderSummary/styles';
+import { SignupForm } from '../SignupForm'
+import { LoginForm } from '../LoginForm'
 
 import {
+  TopHeader,
+  TopActions,
   ChContainer,
   ChSection,
   ChHeader,
@@ -71,10 +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
+    },
+    detailWrapper: {
+      paddingHorizontal: 20,
+      width: '100%'
     },
-    wrapperNavbar: { paddingHorizontal: 40 }
   })
 
   const [, { showToast }] = useToast();
@@ -83,7 +96,7 @@ const MultiCheckoutUI = (props: any) => {
   const [{ parsePrice, parseDate }] = useUtils();
   const [{ options, carts, loading }, { confirmCart }] = useOrder();
   const [validationFields] = useValidationFields();
-  const [{ user }] = useSession()
+  const [{ user }, { login }] = useSession()
 
   const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
   const isPreOrder = configs?.preorder_status_enabled?.value === '1'
@@ -130,13 +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 [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
@@ -151,11 +171,12 @@ const MultiCheckoutUI = (props: any) => {
     setUserErrors([])
     const errors = []
     const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
+    const _requiredFields: any = []
 
     Object.values(validationFields?.fields?.checkout).map((field: any) => {
       if (field?.required && !notFields.includes(field.code)) {
         if (!user[field?.code]) {
-          errors.push(t(`VALIDATION_ERROR_${field.code.toUpperCase()}_REQUIRED`, `The field ${field?.name} is required`))
+          _requiredFields.push(field?.code)
         }
       }
     })
@@ -166,8 +187,9 @@ const MultiCheckoutUI = (props: any) => {
         validationFields?.fields?.checkout?.cellphone?.required) ||
         configs?.verification_phone_required?.value === '1')
     ) {
-      errors.push(t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Phone number is required'))
+      _requiredFields.push('cellphone')
     }
+    setRequiredFields(_requiredFields)
 
     if (phoneUpdate) {
       errors.push(t('NECESSARY_UPDATE_COUNTRY_PHONE_CODE', 'It is necessary to update your phone number'))
@@ -181,10 +203,19 @@ const MultiCheckoutUI = (props: any) => {
   }
 
   const handlePlaceOrder = (confirmPayment?: any) => {
-    if (!userErrors.length) {
+    if (stripePaymethods.includes(paymethodSelected?.gateway) && user?.guest_id) {
+      setOpenModal({ ...openModal, signup: true, isGuest: true })
+      return
+    }
+
+    if (!userErrors.length && (!requiredFields?.length || allowedGuest)) {
       handleGroupPlaceOrder && handleGroupPlaceOrder(confirmPayment)
       return
     }
+    if (requiredFields?.length) {
+      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`
@@ -193,6 +224,36 @@ const MultiCheckoutUI = (props: any) => {
     setIsUserDetailsEdit(true)
   }
 
+  const handlePlaceOrderAsGuest = () => {
+    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 })
+  }
+
+  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) {
       checkValidationFields()
@@ -231,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}>
@@ -285,15 +387,45 @@ const MultiCheckoutUI = (props: any) => {
 
           <ChSection>
             <ChUserDetails>
-              <UserDetails
-                isUserDetailsEdit={isUserDetailsEdit}
-                useValidationFields
-                useDefualtSessionManager
-                useSessionUser
-                isCheckout
-                phoneUpdate={phoneUpdate}
-                togglePhoneUpdate={togglePhoneUpdate}
-              />
+              {(user?.guest_id && !allowedGuest) ? (
+                <View>
+                  <OText size={14} numberOfLines={1} ellipsizeMode='tail' color={theme.colors.textNormal}>
+                    {t('CUSTOMER_DETAILS', 'Customer details')}
+                  </OText>
+                  <OButton
+                    text={t('SIGN_UP', 'Sign up')}
+                    textStyle={{ color: theme.colors.white }}
+                    style={{ borderRadius: 7.6, marginTop: 20 }}
+                    onClick={() => setOpenModal({ ...openModal, signup: true })}
+                  />
+                  <OButton
+                    text={t('LOGIN', 'Login')}
+                    textStyle={{ color: theme.colors.primary }}
+                    bgColor={theme.colors.white}
+                    borderColor={theme.colors.primary}
+                    style={{ borderRadius: 7.6, marginTop: 20 }}
+                    onClick={() => setOpenModal({ ...openModal, login: true })}
+                  />
+                  <OButton
+                    text={t('CONTINUE_AS_GUEST', 'Continue as guest')}
+                    textStyle={{ color: theme.colors.black }}
+                    bgColor={theme.colors.white}
+                    borderColor={theme.colors.black}
+                    style={{ borderRadius: 7.6, marginTop: 20 }}
+                    onClick={() => setAllowedGuest(true)}
+                  />
+                </View>
+              ) : (
+                <UserDetails
+                  isUserDetailsEdit={isUserDetailsEdit}
+                  useValidationFields
+                  useDefualtSessionManager
+                  useSessionUser
+                  isCheckout
+                  phoneUpdate={phoneUpdate}
+                  togglePhoneUpdate={togglePhoneUpdate}
+                />
+              )}
             </ChUserDetails>
             <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40 }} />
           </ChSection>
@@ -403,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 }} />
@@ -484,6 +619,58 @@ const MultiCheckoutUI = (props: any) => {
             </OText>
           )}
         </ChContainer>
+        <OModal
+          open={openModal.signup}
+          onClose={() => setOpenModal({ ...openModal, signup: false, isGuest: false })}
+        >
+          <ScrollView style={{ paddingHorizontal: 20, width: '100%' }}>
+            <SignupForm
+              handleSuccessSignup={handleSuccessSignup}
+              isGuest
+              signupButtonText={t('SIGNUP', 'Signup')}
+              useSignupByEmail
+              useChekoutFileds
+            />
+          </ScrollView>
+        </OModal>
+        <OModal
+          open={openModal.login}
+          onClose={() => setOpenModal({ ...openModal, login: false })}
+        >
+          <ScrollView style={{ paddingHorizontal: 20, width: '100%' }}>
+            <LoginForm
+              handleSuccessLogin={handleSuccessLogin}
+              isGuest
+              loginButtonText={t('LOGIN', 'Login')}
+              loginButtonBackground={theme.colors.primary}
+            />
+          </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>
       </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
@@ -92,7 +97,6 @@ const NavBar = (props: Props) => {
 				<TitleWrapper style={{ ...{ paddingHorizontal: props.isVertical ? 0 : 10 }, ...props.titleWrapStyle }}>
 					<OText
 						size={20}
-						lineHeight={36}
 						weight={Platform.OS === 'ios' ? '600' : 'bold'}
 						style={
 							{

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;
-`
+`

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

@@ -3,7 +3,6 @@ import {
 	UserFormDetails as NotificationsController,
 	useLanguage,
 	useSession,
-	useOrderingTheme,
 	useToast,
 	ToastType,
 } from 'ordering-components/native'
@@ -28,7 +27,6 @@ const NotificationsUI = (props: any) => {
 	const [{ user: userSession }] = useSession()
 	const [, t] = useLanguage();
 	const [, { showToast }] = useToast();
-	const [orderingTheme] = useOrderingTheme()
 
 	const user = userData || userSession
 
@@ -45,8 +43,8 @@ const NotificationsUI = (props: any) => {
 	})
 
 	const goToBack = () => navigation?.canGoBack() && navigation.goBack()
-	const showCustomerPromotions = !orderingTheme?.theme?.profile?.components?.promotions?.hidden
-	const showNotifications = !orderingTheme?.theme?.profile?.components?.notification_settings?.hidden
+	const showCustomerPromotions = !theme?.profile?.components?.promotions?.hidden
+	const showNotifications = !theme?.profile?.components?.notification_settings?.hidden
 
 	const handleEditNotifications = (key: any, value: any) => {
 		setNotificationsList({
@@ -75,10 +73,13 @@ const NotificationsUI = (props: any) => {
 				titleAlign={'center'}
 				onActionLeft={goToBack}
 				showCall={false}
-				style={{
-					paddingHorizontal: 40,
-					paddingVertical: 0,
-				}}
+				style={{ paddingVertical: 0 }}
+				btnStyle={{ paddingLeft: 0 }}
+        buttonProps={{
+          bgColor: theme.colors.white,
+          borderColor: theme.colors.white,
+          textStyle: { color: theme.colors.btnFont }
+        }}
 			/>
 			{showCustomerPromotions && showNotifications && (
 				<>

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

@@ -9,7 +9,6 @@ export const Container = styled.ScrollView`
 export const NotificationsGroupSwitchWrapper = styled.View`
   flex-grow: 1;
   justify-content: space-between;
-	padding: 0 20px;
 `
 
 export const SwitchWrapper = styled.View`