ordering-ui-react-native 0.18.34 → 0.18.36

package/package.json

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

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

@@ -101,12 +101,26 @@ const MultiCheckoutUI = (props: any) => {
   const loyalBusinessIds = creditPointPlan?.businesses?.filter((b: any) => b.accumulates).map((item: any) => item.business_id) ?? []
   const creditPointPlanOnBusiness = businessIds.every((bid: any) => loyalBusinessIds.includes(bid)) && creditPointPlan
 
-  const loyaltyRewardValue = creditPointPlanOnBusiness?.accumulation_rate
-    ? Math.round(openCarts.reduce((sum: any, cart: any) => sum + cart?.subtotal, 0) / creditPointPlanOnBusiness?.accumulation_rate) : 0
-
   const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
   const [phoneUpdate, setPhoneUpdate] = useState(false);
   const [userErrors, setUserErrors] = useState<any>([]);
+
+  const getIncludedTaxes = (cart: any) => {
+    if (cart?.taxes === null || !cart?.taxes) {
+      return cart.business.tax_type === 1 ? cart?.tax : 0
+    } else {
+      return cart?.taxes.reduce((taxIncluded: number, tax: any) => {
+        return taxIncluded + (tax.type === 1 ? tax.summary?.tax : 0)
+      }, 0)
+    }
+  }
+
+  const loyaltyRewardValue = creditPointPlanOnBusiness?.accumulation_rate
+    ? Math.round(
+      openCarts.reduce((sum: any, cart: any) => sum + cart?.subtotal + getIncludedTaxes(cart), 0) /
+      creditPointPlanOnBusiness?.accumulation_rate
+    ) : 0
+
   const handleMomentClick = () => {
     if (isPreOrder) {
       navigation.navigate('MomentOption')

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

@@ -62,7 +62,6 @@ const OrderSummaryUI = (props: any) => {
   const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled;
 
   const cart = orderState?.carts?.[`businessId:${props.cart.business_id}`]
-  const loyaltyRewardValue = Math.round(cart?.subtotal / loyaltyRewardRate)
 
   const walletName: any = {
     cash: {
@@ -73,6 +72,18 @@ const OrderSummaryUI = (props: any) => {
     }
   }
 
+  const getIncludedTaxes = () => {
+    if (cart?.taxes === null || !cart?.taxes) {
+      return cart.business.tax_type === 1 ? cart?.tax : 0
+    } else {
+      return cart?.taxes.reduce((taxIncluded: number, tax: any) => {
+        return taxIncluded + (tax.type === 1 ? tax.summary?.tax : 0)
+      }, 0)
+    }
+  }
+
+  const loyaltyRewardValue = Math.round((cart?.subtotal + getIncludedTaxes()) / loyaltyRewardRate)
+
   const handleDeleteClick = (product: any) => {
     removeProduct(product, cart)
   }
@@ -89,16 +100,6 @@ const OrderSummaryUI = (props: any) => {
     })
   }
 
-  const getIncludedTaxes = () => {
-    if (cart?.taxes === null || !cart?.taxes) {
-      return cart.business.tax_type === 1 ? cart?.tax : 0
-    } else {
-      return cart?.taxes.reduce((taxIncluded: number, tax: any) => {
-        return taxIncluded + (tax.type === 1 ? tax.summary?.tax : 0)
-      }, 0)
-    }
-  }
-
   const getIncludedTaxesDiscounts = () => {
     return cart?.taxes?.filter((tax: any) => tax?.type === 1)?.reduce((carry: number, tax: any) => carry + (tax?.summary?.tax_after_discount ?? tax?.summary?.tax), 0)
   }

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

@@ -238,7 +238,7 @@ const ProfileListUI = (props: ProfileParams) => {
 							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('HELP', 'Help')}</OText>
 						</ListItem>
 					)}
-					{!showNotifications && (
+					{showNotifications && (
 						<ListItem onPress={() => navigation.navigate('Notifications', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
 							<NotificationBadge style={{ borderRadius: 100 / 2 }} />
 							<Ionicons name='notifications-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />