ordering-ui-react-native 0.22.74 → 0.22.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.22.74",
+  "version": "0.22.75",
   "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,