ordering-ui-react-native 0.15.86 → 0.15.87-release

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

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import {
 	OrderTypeControl,
 	useLanguage,
@@ -6,28 +6,32 @@ import {
 } from 'ordering-components/native'
 import { useTheme } from 'styled-components/native';
 import { Platform, View } from 'react-native'
-import { BgImage, ListWrapper, MaskCont, OrderTypeWrapper, Wrapper } from './styles'
+import { BgImage, ListWrapper, MaskCont, OrderTypeWrapper, OTab, OTabs, TabBtn, Wrapper } from './styles'
 import { OrderTypeSelectParams } from '../../types'
 import { OIcon, OText } from '../shared'
 import NavBar from '../NavBar';
 import { ORDER_TYPES } from '../../config/constants';
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 	const {
 		navigation,
 		handleChangeOrderType,
+		handleChangeType,
 		typeSelected,
 		defaultValue,
 		configTypes,
 		orderTypes,
-		setOrderTypeValue
+		setOrderTypeValue,
+		isChewLayout,
+		chewOrderTypes
 	} = props
 
 	const theme = useTheme();
 	const [orderState] = useOrder();
 	const [, t] = useLanguage();
 	const _orderTypes = orderTypes.filter((type: any) => configTypes?.includes(type.value));
-	
+
 	const items = _orderTypes.map((type) => {
 		return {
 			value: type.value,
@@ -42,43 +46,87 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 		if (!orderState.loading) {
 			setOrderTypeValue && setOrderTypeValue(orderType)
 			handleChangeOrderType(orderType)
-			goToBack();
+			if (!isChewLayout) {
+				goToBack();
+			}
 		}
 	}
 
+	useEffect(() => {
+		handleChangeType(typeSelected)
+	}, [typeSelected])
+
 	return (
 		<Wrapper>
-			<NavBar
-				onActionLeft={() => goToBack()}
-				btnStyle={{ paddingLeft: 0 }}
-				paddingTop={0}
-				style={{ paddingBottom: 0 }}
-				title={t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will your order type?')}
-				titleAlign={'center'}
-				titleStyle={{ fontSize: 14 }}
-			/>
-			{
-			items.length > 0 && (
-				<ListWrapper>
-				{
-					items && items.map((item: any, idx: number) => 
-						<OrderTypeWrapper activeOpacity={0.8} key={idx} disabled={orderState.loading} onPress={() => handleChangeOrderTypeCallback(item.value)}>
-							<BgImage source={theme.images.orderTypes[`type${item?.value || 1}`]} resizeMode={'cover'} style={{opacity: item?.value == typeSelected || typeSelected === undefined ? 1 : 0.4}}>
-								<MaskCont>
-									<OText size={12} lineHeight={18} color={theme.colors.white} weight={Platform.OS === 'android' ? 'bold' : '600'}>{item?.label}</OText>
-									<OText size={10} lineHeight={15} color={theme.colors.white}>{item?.description}</OText>
-									<View style={{flexDirection: 'row', alignItems: 'center'}}>
-										<OText size={10} lineHeight={15} color={theme.colors.white}>{t('START_MY_ORDER', 'Start my order')}</OText>
-										<OIcon src={theme.images.general.arrow_left} width={16} color={theme.colors.white} style={{transform: [{ rotate: '180deg' }], marginStart: 4}} />
-									</View>
-								</MaskCont>
-							</BgImage>
-						</OrderTypeWrapper>
-					)
-				}
-				</ListWrapper>
-				)
-			}
+			{isChewLayout ? (
+				<View>
+					<OTabs
+						horizontal
+						showsHorizontalScrollIndicator={false}
+					>
+						{chewOrderTypes?.map((type: any) => (
+							<TabBtn
+								key={type.value}
+								onPress={() => handleChangeOrderTypeCallback(type.value)}
+							>
+								<OTab
+									style={{
+										borderBottomColor:
+											type.value === typeSelected
+												? theme.colors.textNormal
+												: theme.colors.border,
+									}}>
+									<OText
+										size={14}
+										color={
+											type.value === typeSelected
+												? theme.colors.textNormal
+												: theme.colors.disabled
+										}
+										weight={type.value === typeSelected ? 'bold' : 'normal'}>
+										{type.name}
+									</OText>
+								</OTab>
+							</TabBtn>
+						))}
+					</OTabs>
+				</View>
+			) : (
+				<>
+					<NavBar
+						onActionLeft={() => goToBack()}
+						btnStyle={{ paddingLeft: 0 }}
+						paddingTop={0}
+						style={{ paddingBottom: 0 }}
+						title={t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will your order type?')}
+						titleAlign={'center'}
+						titleStyle={{ fontSize: 14 }}
+					/>
+					{
+						items.length > 0 && (
+							<ListWrapper>
+								{
+									items && items.map((item: any, idx: number) =>
+										<OrderTypeWrapper activeOpacity={0.8} key={idx} disabled={orderState.loading} onPress={() => handleChangeOrderTypeCallback(item.value)}>
+											<BgImage source={theme.images.orderTypes[`type${item?.value || 1}`]} resizeMode={'cover'} style={{ opacity: item?.value == typeSelected || typeSelected === undefined ? 1 : 0.4 }}>
+												<MaskCont>
+													<OText size={12} lineHeight={18} color={theme.colors.white} weight={Platform.OS === 'android' ? 'bold' : '600'}>{item?.label}</OText>
+													<OText size={10} lineHeight={15} color={theme.colors.white}>{item?.description}</OText>
+													<View style={{ flexDirection: 'row', alignItems: 'center' }}>
+														<OText size={10} lineHeight={15} color={theme.colors.white}>{t('START_MY_ORDER', 'Start my order')}</OText>
+														<AntDesignIcon name='arrowleft' size={26} color={theme.colors.white} style={{ transform: [{ rotate: '180deg' }], marginStart: 4 }} />
+													</View>
+												</MaskCont>
+											</BgImage>
+										</OrderTypeWrapper>
+									)
+								}
+							</ListWrapper>
+						)
+					}
+				</>
+			)}
+
 		</Wrapper>
 	)
 }

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

@@ -24,4 +24,22 @@ export const MaskCont = styled.View`
   padding: 16px 39px;
   background-color: #0000004D;
   height: 100%;
-`;
+`;
+
+export const OTabs = styled.View`
+  flex-direction: row;
+  width: 100%;
+  margin-bottom: -1px;
+  justify-content: space-between;
+`;
+
+export const OTab = styled.View`
+  padding-bottom: 10px;
+  border-bottom-width: 1px;
+  padding-horizontal: 10px;
+`;
+
+export const TabBtn = styled.TouchableOpacity`
+  min-height: 30px;
+  height: 30px;
+`;

package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/index.tsx

@@ -0,0 +1,140 @@
+import React from 'react'
+import { useOrder } from 'ordering-components/native'
+import { BusinessController } from '../../BusinessController'
+import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
+
+import { ListWrapper } from './styles'
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  Dimensions
+} from 'react-native';
+import { PreviousBusinessOrderedParams } from '../../../types';
+
+const BusinessControllerList = ({ businesses, onBusinessClick, navigation, orderState, style }: any) => {
+  return (
+    <>
+      {businesses?.result?.map((business: any, i: number) => (
+        <BusinessController
+          key={`${business.id}_` + i}
+          business={business}
+          isBusinessOpen={business.open}
+          handleCustomClick={() => onBusinessClick(business)}
+          orderType={orderState?.options?.type}
+          navigation={navigation}
+          businessHeader={business?.header}
+          businessFeatured={business?.featured}
+          businessLogo={business?.logo}
+          businessReviews={business?.reviews}
+          businessDeliveryPrice={business?.delivery_price}
+          businessDeliveryTime={business?.delivery_time}
+          businessPickupTime={business?.pickup_time}
+          businessDistance={business?.distance}
+          style={style}
+        />
+      ))}
+    </>
+  )
+}
+
+const BusinessSkeletons = () => {
+  return (
+    <>
+      {[...Array(4).keys()].map((item, i) => (
+        <Placeholder
+          Animation={Fade}
+          key={i}
+          style={{ marginBottom: 20 }}>
+          <View style={{ width: '100%' }}>
+            <PlaceholderLine
+              height={200}
+              style={{ marginBottom: 20, borderRadius: 25 }}
+            />
+            <View style={{ paddingHorizontal: 10 }}>
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'space-between',
+                }}>
+                <PlaceholderLine
+                  height={25}
+                  width={40}
+                  style={{ marginBottom: 10 }}
+                />
+                <PlaceholderLine
+                  height={25}
+                  width={20}
+                  style={{ marginBottom: 10 }}
+                />
+              </View>
+              <PlaceholderLine
+                height={20}
+                width={30}
+                style={{ marginBottom: 10 }}
+              />
+              <PlaceholderLine
+                height={20}
+                width={80}
+                style={{ marginBottom: 10 }}
+              />
+            </View>
+          </View>
+        </Placeholder>
+      ))}
+    </>
+  )
+}
+
+export const PreviousBusinessOrdered = (props: PreviousBusinessOrderedParams) => {
+  const {
+    navigation,
+    businesses,
+    onNavigationRedirect,
+    isBusinessesSearchList,
+  } = props
+
+  const [orderState] = useOrder()
+  const windowWidth = Dimensions.get('window').width;
+  const onBusinessClick = (business: any) => {
+    onNavigationRedirect('Business', { store: business.slug, logo: business.logo, header: business.header })
+  }
+
+  const styles = StyleSheet.create({
+    container: {
+      marginBottom: 0,
+    },
+  });
+
+  return (
+    <ScrollView horizontal={isBusinessesSearchList} style={styles.container} showsVerticalScrollIndicator={false}>
+      {isBusinessesSearchList ? (
+        <>
+          {!businesses?.loading && (
+            <BusinessControllerList
+              style={{ width: windowWidth - 120, marginRight: 20 }}
+              onBusinessClick={onBusinessClick}
+              orderState={orderState}
+              navigation={navigation}
+              businesses={businesses}
+            />
+          )}
+        </>
+      ) : (
+        <ListWrapper>
+          {businesses?.loading ? (
+            <BusinessSkeletons />
+          ) : (
+            <BusinessControllerList
+              onBusinessClick={onBusinessClick}
+              orderState={orderState}
+              navigation={navigation}
+              businesses={businesses}
+            />
+          )}
+        </ListWrapper>
+      )}
+
+    </ScrollView>
+  )
+}

package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/styles.tsx

@@ -0,0 +1,6 @@
+import styled, { css } from 'styled-components/native'
+
+export const ListWrapper = styled.View`
+	background-color: ${(props: any) => props.theme.colors.backgroundLight};
+	padding-horizontal: ${(props : any) => props.isBusinessesSearchList ? '0' : '40px'};
+`;

package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/index.tsx

@@ -0,0 +1,53 @@
+import React from 'react'
+import { ScrollView, StyleSheet, Dimensions } from 'react-native'
+import {
+  ListWrapper
+} from './styles'
+
+import { SingleProductCard } from '../../SingleProductCard'
+import { PreviousProductsOrderedParams } from '../../../types'
+
+export const PreviousProductsOrdered = (props: PreviousProductsOrderedParams) => {
+  const {
+    products,
+    onProductClick,
+    isBusinessesSearchList
+  } = props
+
+  const windowWidth = Dimensions.get('window').width;
+
+  const styles = StyleSheet.create({
+    container: {
+      marginBottom: 0,
+    },
+  });
+
+  const ProductList = ({ style }: any) => {
+    return (
+      <>
+        {products?.map((product: any) => (
+            <SingleProductCard
+              key={product?.id}
+              isSoldOut={(product.inventoried && !product.quantity)}
+              product={product}
+              businessId={product?.business?.id}
+              onProductClick={onProductClick}
+              style={style}
+              productAddedToCartLength={0}
+            />
+        ))}
+      </>
+    )
+  }
+  return (
+    <ScrollView horizontal={isBusinessesSearchList} style={styles.container} showsVerticalScrollIndicator={false}>
+      {isBusinessesSearchList ? (
+        <ProductList style={{ width: windowWidth - 80, marginRight: 20 }} />
+      ) : (
+        <ListWrapper isBusinessesSearchList={isBusinessesSearchList}>
+          <ProductList />
+        </ListWrapper>
+      )}
+    </ScrollView>
+  )
+}

package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/styles.tsx

@@ -0,0 +1,6 @@
+import styled from 'styled-components/native'
+
+export const ListWrapper = styled.View`
+	background-color: ${(props: any) => props.theme.colors.backgroundLight};
+	padding-horizontal: ${(props : any) => props.isBusinessesSearchList ? '0' : '40px'};
+`;

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

@@ -6,10 +6,11 @@ import { OText, OButton } from '../shared'
 import { NotFoundSource } from '../NotFoundSource'
 import { ActiveOrders } from '../ActiveOrders'
 import { PreviousOrders } from '../PreviousOrders'
-
+import { PreviousBusinessOrdered } from './PreviousBusinessOrdered'
+import { PreviousProductsOrdered } from './PreviousProductsOrdered'
 import { OptionTitle, NoOrdersWrapper } from './styles'
 import { OrdersOptionParams } from '../../types'
-
+import { _setStoreData } from '../../providers/StoreUtil';
 import {
 	Placeholder,
 	PlaceholderLine,
@@ -35,15 +36,28 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		setOrdersLength,
 		ordersLength,
 		refreshOrders,
-		setRefreshOrders
+		setRefreshOrders,
+		reorderState,
+		handleReorder,
+		handleUpdateOrderList,
+		isBusiness,
+		isProducts,
+		businessOrderIds,
+		products,
+		businessesSearchList,
+		hideOrders,
+		BusinessControllerSkeletons,
+		businesses,
+		businessPaginationProps
 	} = props
 
 	const theme = useTheme();
 
 	const [, t] = useLanguage()
-	const [, { reorder }] = useOrder()
-	const { showToast } = useToast()
+	const [{ carts }] = useOrder()
+	const [, { showToast }] = useToast()
 	const { loading, error, orders: values } = orderList
+	const [businessLoading, setBusinessLoading] = useState(true)
 
 	const imageFails = activeOrders
 		? theme.images.general.emptyActiveOrders
@@ -51,26 +65,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
 	const orders = customArray || values || []
 
-	const [reorderLoading, setReorderLoading] = useState(false)
-
-
-	const handleReorder = async (orderId: number) => {
-		setReorderLoading(true)
-		try {
-			const { error, result } = await reorder(orderId)
-			if (!error) {
-				onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: result.uuid })
-				setReorderLoading(false)
-				return
-			}
-			setReorderLoading(false)
-
-		} catch (err: any) {
-			showToast(ToastType.Error, t('ERROR', err.message))
-			setReorderLoading(false)
-		}
-	}
-
 	const getOrderStatus = (s: string) => {
 		const status = parseInt(s)
 		const orderStatus = [
@@ -105,6 +99,48 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		return objectStatus && objectStatus
 	}
 
+	const onProductClick = (product: any) => {
+		if (product?.product_id && product?.category_id && product?.businessId &&
+			product?.business.slug && product?.business.header && product?.business.logo) {
+			onNavigationRedirect('ProductDetails', {
+				isRedirect: 'business',
+				businessId: product?.businessId,
+				categoryId: product?.category_id,
+				productId: product?.product_id,
+				business: {
+					store: product?.business.slug,
+					header: product?.business.header,
+					logo: product?.business.logo,
+				}
+			})
+		} else {
+			showToast(ToastType.Error, t('ERROR_FAILED_REDIRECT_IDS', 'Failed to redirect product for ids'))
+		}
+	}
+
+	useEffect(() => {
+		const _businessId = 'businessId:' + reorderState?.result?.business_id
+		if (reorderState?.error) {
+			if (reorderState?.result?.business_id) {
+				_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+				navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
+			}
+		}
+		if (!reorderState?.error && reorderState.loading === false && reorderState?.result?.business_id) {
+			const cartProducts = carts?.[_businessId]?.products
+			const available = cartProducts.every((product: any) => product.valid === true)
+			const orderProducts = orders.find((order: any) => order?.id === reorderState?.result?.orderId)?.products
+
+			if (available && reorderState?.result?.uuid && (cartProducts?.length === orderProducts?.length)) {
+				onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+			} else {
+				_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+				cartProducts?.length !== orderProducts?.length && _setStoreData('already-removed', JSON.stringify('removed'))
+				navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
+			}
+		}
+	}, [reorderState])
+
 	useFocusEffect(
 		React.useCallback(() => {
 			loadOrders(false, false, false, true)
@@ -128,10 +164,10 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		} else if (!preOrders) {
 			setOrdersLength && setOrdersLength({ ...ordersLength, previousOrdersLength: updateOrders?.length })
 		}
-	}, [orders, activeOrders])
+	}, [orders, activeOrders, preOrders])
 
 	useEffect(() => {
-		if(refreshOrders){
+		if (refreshOrders) {
 			loadOrders(false, false, false, true)
 			setRefreshOrders && setRefreshOrders(false)
 		}
@@ -153,18 +189,21 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
 				</NoOrdersWrapper>
 			)}
-			{(ordersLength.activeOrdersLength > 0 || ordersLength.previousOrdersLength > 0) && (
+			{(ordersLength?.activeOrdersLength > 0 || ordersLength?.previousOrdersLength > 0) && (
 				<>
-					<OptionTitle>
-						<OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal} mBottom={10} >
-							{titleContent || (activeOrders
-								? t('ACTIVE', 'Active')
-								: preOrders
-									? t('PREORDERS', 'Preorders')
-									: t('PAST', 'Past'))}
-						</OText>
-					</OptionTitle>
-					{!(ordersLength.activeOrdersLength === 0 && ordersLength.previousOrdersLength === 0) &&
+					{((titleContent && ((isBusiness && businessOrderIds?.length > 0) || isProducts)) || !titleContent) && (
+						<OptionTitle titleContent={!!titleContent} isBusinessesSearchList={!!businessesSearchList}>
+							<OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal} mBottom={10} >
+								{titleContent || (activeOrders
+									? t('ACTIVE', 'Active')
+									: preOrders
+										? t('PREORDERS', 'Preorders')
+										: t('PAST', 'Past'))}
+							</OText>
+						</OptionTitle>
+					)}
+
+					{!(ordersLength?.activeOrdersLength === 0 && ordersLength?.previousOrdersLength === 0) &&
 						!loading &&
 						orders.filter((order: any) => orderStatus.includes(order.status)).length === 0 &&
 						(
@@ -176,7 +215,48 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 						)}
 				</>
 			)}
-			{loading && (
+			{isBusiness && !!businessesSearchList && businesses?.loading &&  (
+				<ScrollView horizontal>
+					<BusinessControllerSkeletons paginationProps={businessPaginationProps} />
+				</ScrollView>
+			)}
+			{isBusiness && (
+				<PreviousBusinessOrdered
+					onNavigationRedirect={onNavigationRedirect}
+					isBusinessesSearchList={!!businessesSearchList}
+					businesses={businesses}
+				/>
+			)}
+
+			{isProducts && !loading && (
+				<PreviousProductsOrdered
+					products={products}
+					onProductClick={onProductClick}
+					isBusinessesSearchList={!!businessesSearchList}
+				/>
+			)}
+			{(loading && isProducts) && (
+				<>
+					{[...Array(!!businessesSearchList ? 1 : 4).keys()].map(
+						(item, i) => (
+							<Placeholder key={i} style={{ padding: 5, paddingLeft: !!businessesSearchList ? 0 : 40, marginBottom: !!businessesSearchList ? 38 : 0 }} Animation={Fade}>
+								<View style={{ flexDirection: 'row' }}>
+									<PlaceholderLine
+										width={24}
+										height={70}
+										style={{ marginRight: 10, marginBottom: 10 }}
+									/>
+									<Placeholder style={{ paddingVertical: 10 }}>
+										<PlaceholderLine width={60} style={{ marginBottom: 25 }} />
+										<PlaceholderLine width={20} />
+									</Placeholder>
+								</View>
+							</Placeholder>
+						),
+					)}
+				</>
+			)}
+			{loading && !hideOrders && (
 				<>
 					{!activeOrders ? (
 						<Placeholder style={{ marginTop: 30 }} Animation={Fade}>
@@ -207,35 +287,38 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 					)}
 				</>
 			)}
-			{!loading && !error && orders.length > 0 && (
+			{!loading && !error && orders.length > 0 && !hideOrders && (
 				preOrders ? (
 					<ActiveOrders
 						orders={orders.filter((order: any) => orderStatus.includes(order.status))}
 						pagination={pagination}
 						loadMoreOrders={loadMoreOrders}
-						reorderLoading={reorderLoading}
+						reorderLoading={reorderState?.loading}
 						customArray={customArray}
 						getOrderStatus={getOrderStatus}
 						onNavigationRedirect={onNavigationRedirect}
+						handleUpdateOrderList={handleUpdateOrderList}
 					/>
 				) : activeOrders ? (
 					<ActiveOrders
 						orders={orders.filter((order: any) => orderStatus.includes(order.status))}
 						pagination={pagination}
-						reorderLoading={reorderLoading}
+						reorderLoading={reorderState?.loading}
 						customArray={customArray}
 						getOrderStatus={getOrderStatus}
 						onNavigationRedirect={onNavigationRedirect}
+						handleUpdateOrderList={handleUpdateOrderList}
 					/>
 				) : (
 					<PreviousOrders
-						reorderLoading={reorderLoading}
+						reorderLoading={reorderState?.loading}
 						orders={orders.filter((order: any) => orderStatus.includes(order.status)).sort((a: any, b: any) => a?.id < b?.id)}
 						pagination={pagination}
 						loadMoreOrders={loadMoreOrders}
 						getOrderStatus={getOrderStatus}
 						onNavigationRedirect={onNavigationRedirect}
 						handleReorder={handleReorder}
+						handleUpdateOrderList={handleUpdateOrderList}
 					/>
 				)
 			)}
@@ -244,13 +327,22 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 }
 
 export const OrdersOption = (props: OrdersOptionParams) => {
+	const getAllOrders = props.activeOrders && props.pastOrders && props.preOrders
+
 	const MyOrdersProps = {
 		...props,
 		UIComponent: OrdersOptionUI,
-		orderStatus: props.preOrders ? [13] : props.activeOrders
-			? [0, 3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23]
-			: [1, 2, 5, 6, 10, 11, 12, 15, 16, 17],
+		orderStatus: getAllOrders
+			? [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
+			: props.preOrders ? [13] : props.activeOrders
+				? [0, 3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23]
+				: [1, 2, 5, 6, 10, 11, 12, 15, 16, 17],
 		useDefualtSessionManager: true,
+		paginationSettings: {
+			initialPage: 1,
+			pageSize: getAllOrders ? 30 : 10,
+			controlType: 'infinity'
+		}
 	}
 
 	return <OrderList {...MyOrdersProps} />