ordering-ui-react-native 0.22.72 → 0.22.73

package/package.json

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

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -545,18 +545,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             ))}
           </View>
         )}
-
-      {(!!props.order?.error || props.order?.error?.length > 0) && (
-        <NotFoundSource
-          btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
-          content={
-            props.order.error[0] ||
-            props.order.error ||
-            t('NETWORK_ERROR', 'Network Error')
-          }
-          onClickButton={() => navigation.navigate('Orders')}
-        />
-      )}
       {!((!order || Object.keys(order).length === 0) &&
         (props.order?.error?.length < 1 || !props.order?.error)) && (
           <View style={{ flex: 1 }}>
@@ -704,6 +692,18 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             )}
           </View>
         )}
+
+      {(!!props.order?.error || props.order?.error?.length > 0) && (
+        <NotFoundSource
+          btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
+          content={
+            props.order.error[0] ||
+            props.order.error ||
+            t('NETWORK_ERROR', 'Network Error')
+          }
+          onClickButton={() => navigation.navigate('Orders')}
+        />
+      )}
       {alertState?.open && (
         <Alert
           open={alertState.open}

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

@@ -55,6 +55,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     navigation,
     setCurrentFilters,
     tabs,
+    combineTabs,
+    setCombineTabsState,
     isNetConnected,
     currentTabSelected,
     setCurrentTabSelected,
@@ -127,7 +129,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
       backColor: '#E63757'
     }
   ]
-  const combineTabs = configState?.configs?.combine_pending_and_progress_orders?.value === '1'
   const [selectedTabStatus, setSelectedTabStatus] = useState<any>(deliveryStatus)
   const [openedSelect, setOpenedSelect] = useState('')
   const [lastDateConnection, setLastDateConnection] = useState(null)
@@ -405,11 +406,17 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     const manageStoragedOrders = async () => {
       setInternetLoading(true)
       let lastConnection = await _retrieveStoreData('last_date_connection');
+      let _combineTabs = await _retrieveStoreData('combine_pending_and_progress_orders')
       let ordersStoraged: any = {}
       for (const status of orderStatuses) {
         ordersStoraged[status] = await _retrieveStoreData(`${status}_orders`) ?? []
       }
 
+      if (!_combineTabs && combineTabs) {
+        setCombineTabsState(combineTabs)
+        _setStoreData('combine_pending_and_progress_orders', combineTabs);
+      }
+
       if (!lastConnection) {
         const formattedDate = parseDate(new Date())
         lastConnection = formattedDate
@@ -443,12 +450,17 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
     if (isNetConnected) {
       _setStoreData('last_date_connection', null);
+      _setStoreData('combine_pending_and_progress_orders', null);
       orderStatuses.forEach((key: any) => _setStoreData(`${key}_orders`, null))
     } else if (isNetConnected === false) {
       manageStoragedOrders()
     }
   }, [isNetConnected]);
 
+  useEffect(() => {
+    setCombineTabsState(combineTabs)
+  }, [combineTabs])
+
   return (
     <>
       <View style={styles.header}>
@@ -1026,6 +1038,7 @@ export const OrdersOption = (props: OrdersOptionParams) => {
     UIComponent: OrdersOptionUI,
     useDefualtSessionManager: true,
     asDashboard: true,
+    combineTabs,
     isIos: Platform.OS === 'ios',
     orderStatus: [
       { key: 0, text: t('PENDING', 'Pending') },

package/themes/business/src/types/index.tsx

@@ -323,6 +323,8 @@ export interface OrdersOptionParams {
   orderDetailsProps?: any;
   isNetConnected?: boolean;
   isDriverApp?: boolean;
+  combineTabs?: boolean;
+  setCombineTabsState?: any;
 }
 export interface ActiveOrdersParams {
   orders?: any;

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

@@ -26,7 +26,6 @@ export const StripeCardsListUI = (props: any) => {
 	const {
 		onSelectCard,
 		deleteCard,
-		cardSelected,
 		cardsList,
 		handleCardClick,
 		onOpen,
@@ -58,7 +57,7 @@ export const StripeCardsListUI = (props: any) => {
 	}, [cardsList?.loading])
 
 	useEffect(() => {
-		if (newCardAdded && addNewCardAsDefault){	
+		if (newCardAdded && addNewCardAsDefault) {
 			handleCardSelected(newCardAdded)
 		}
 	}, [JSON.stringify(newCardAdded)])
@@ -104,7 +103,7 @@ export const StripeCardsListUI = (props: any) => {
 						<OSItem key={card.id} isUnique={cardsList.cards.length} isInvalid={!card?.zipcode && validateZipcodeCard}>
 							<OSItemContent onPress={() => handleCardSelected(card)}>
 								<View style={styles.viewStyle}>
-									{(card.id === cardSelected?.id || card.id === paySelected?.data?.id) ? (
+									{(card.id === paySelected?.data?.id) ? (
 										<OIcon
 											src={theme.images.general.radio_act}
 											width={16}