ordering-ui-react-native 0.22.74 → 0.22.76

package/package.json

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

package/themes/business/src/components/OrdersOption/index.tsx

@@ -412,9 +412,9 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
         ordersStoraged[status] = await _retrieveStoreData(`${status}_orders`) ?? []
       }
 
-      if (!_combineTabs && combineTabs) {
-        setCombineTabsState(combineTabs)
-        _setStoreData('combine_pending_and_progress_orders', combineTabs);
+      if (_combineTabs || !_combineTabs && combineTabs) {
+        _combineTabs && setCombineTabsState(_combineTabs)
+        _setStoreData('combine_pending_and_progress_orders', _combineTabs || combineTabs);
       }
 
       if (!lastConnection) {
@@ -457,10 +457,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     }
   }, [isNetConnected]);
 
-  useEffect(() => {
-    setCombineTabsState(combineTabs)
-  }, [combineTabs])
-
   return (
     <>
       <View style={styles.header}>
@@ -1032,7 +1028,10 @@ export const OrdersOption = (props: OrdersOptionParams) => {
   const [, t] = useLanguage();
   const [configState] = useConfig()
   const [checkNotificationStatus, setCheckNotificationStatus] = useState({ open: false, checked: false })
-  const combineTabs = configState?.configs?.combine_pending_and_progress_orders?.value === '1'
+
+  const getCombineTabsStoraged = async () => await _retrieveStoreData('combine_pending_and_progress_orders')
+  const combineTabs = configState?.configs?.combine_pending_and_progress_orders?.value === '1' || getCombineTabsStoraged()
+
   const ordersProps = {
     ...props,
     UIComponent: OrdersOptionUI,

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

@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { TouchableOpacity, View } from 'react-native';
+import { TouchableOpacity, View, Vibration } from 'react-native';
 import { useOrder, useLanguage, useUtils, useConfig, useEvent } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import {
@@ -69,6 +69,11 @@ export const BusinessItemAccordion = (props: any) => {
 		}
 	}, [isActive, viewedCart])
 
+	const handleGoToStore = () => {
+		Vibration.vibrate(100)
+		props.onNavigationRedirect('Business', { store: cart?.business?.slug })
+	}
+
 	return (
 		<BIContainer isClosed={isClosed} isMultiCheckout={isMultiCheckout} checkoutVisible={!isActive && !isClosed && !!isProducts && !checkoutButtonDisabled}>
 			<BIHeader
@@ -82,7 +87,7 @@ export const BusinessItemAccordion = (props: any) => {
 						<View style={{ flexDirection: 'row' }}>
 							{props.onNavigationRedirect && !isClosed && !isGiftCart && (
 								<>
-									<TouchableOpacity onPress={() => props.onNavigationRedirect('Business', { store: cart?.business?.slug })}>
+									<TouchableOpacity onPress={() => handleGoToStore()}>
 										<OText color={theme.colors.primary} size={12} lineHeight={18} style={{ textDecorationLine: 'underline' }}>{t('GO_TO_STORE', 'Go to store')}</OText>
 									</TouchableOpacity>
 								</>

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

@@ -114,6 +114,7 @@ const CartUI = (props: any) => {
   }
 
   const handleUpsellingPage = (individualCart: any) => {
+    Vibration.vibrate(100)
     const isProductCartParam = !!individualCart?.products?.length
     setOpenUpselling(false)
     setCanOpenUpselling(false)

package/themes/original/src/components/UpsellingProducts/UpsellingContent.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { Platform, StyleSheet, View } from 'react-native'
+import { Platform, StyleSheet, View, Vibration } from 'react-native'
 import {
     useLanguage,
     useOrder,
@@ -90,6 +90,11 @@ export const UpsellingContent = (props: any) => {
         setShowTitle(contentOffset.y > 30)
     }
 
+    const handleClickCheckout = () => {
+        Vibration.vibrate(100)
+        handleUpsellingPage(cart)
+    }
+
     return (
         <>
             <View style={styles.wrapperNavbar}>
@@ -160,7 +165,7 @@ export const UpsellingContent = (props: any) => {
                     text={t('CHECKOUT', 'Checkout')}
                     textStyle={{ fontSize: 14 }}
                     style={{ ...styles.closeUpsellingButton }}
-                    onClick={() => handleUpsellingPage(cart)}
+                    onClick={() => handleClickCheckout()}
                 />
             </View>
         </>