ordering-ui-react-native 0.17.75 → 0.17.77

package/package.json

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

package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx

@@ -557,7 +557,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 			<PageBanner position='app_business_listing' />
 
 			<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100 }} />
-			<ListWrapper ph={isChewLayout && 20}>
+			<ListWrapper style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
 				{!businessId && (
 					<BusinessTypeFilter
 						images={props.images}

package/themes/original/src/components/BusinessesListing/Layout/Original/styles.tsx

@@ -67,7 +67,6 @@ export const HeaderWrapper = styled.ImageBackground`
 
 export const ListWrapper = styled.View`
 	background-color: ${(props: any) => props.theme.colors.backgroundLight};
-	padding-horizontal: ${(props: any) => props.ph ?? 40}px;
 `;
 
 export const FeaturedWrapper = styled.View`

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

@@ -1,9 +1,5 @@
 import styled from 'styled-components/native'
 
-export const ContainerButtons = styled.View`
-    margin-vertical: 50px
-`
-
 export const Container = styled.ScrollView`
     position: relative;
     flex: 1;
@@ -13,7 +9,7 @@ export const Container = styled.ScrollView`
 export const NotificationsGroupSwitchWrapper = styled.View`
   flex-grow: 1;
   justify-content: space-between;
-	paddingHorizontal: 20px;
+	padding: 0 20px;
 `
 
 export const SwitchWrapper = styled.View`

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

@@ -72,9 +72,9 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
 	useEffect(() => {
 		if (loading || error) return
-		const orders = _orders.map((order: any) => order?.cart_group_id
-			? _orders
-				.filter((_order : any) => _order?.cart_group_id === order?.cart_group_id)
+		const ordersReduced = _orders.map((order: any) => order?.cart_group_id
+		? _orders
+				?.filter((_order : any) => _order?.cart_group_id === order?.cart_group_id)
 				?.reduce((orderCompleted : any, currentOrder : any) => ({
 					...orderCompleted,
 					total: orderCompleted.summary?.total + currentOrder?.summary?.total,
@@ -84,17 +84,19 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 					review: orderCompleted.review && currentOrder.review,
 					user_review: orderCompleted.user_review && currentOrder.user_review,
 					products: [orderCompleted.products, currentOrder.products].flat()
-				})).filter((order: any) => {
-					const isDuplicate = uniqueOrders.includes(order?.cart_group_id)
-					if (!isDuplicate) {
-						uniqueOrders.push(order?.cart_group_id)
-						return true
-					}
-					return false
-				})
-			: order)
+				}))
+				: order)
+		const orders = ordersReduced?.filter((order: any) => {
+			if (!order?.cart_group_id) return true
+			const isDuplicate = uniqueOrders.includes(order?.cart_group_id)
+			if (!isDuplicate) {
+				uniqueOrders.push(order?.cart_group_id)
+				return true
+			}
+			return false
+		})
 		setOrders(orders)
-	}, [JSON.stringify(_orders)])
+	}, [_orders?.length])
 
 	const getOrderStatus = (s: string) => {
 		const status = parseInt(s)