fix discount calculating

src/components/OrderSummary/OrderSummary.tsx

@@ -44,13 +44,17 @@ export default function OrderSummary() {
             <ProText type="secondary">{t("cart.basketTotal")}</ProText>
             <ArabicPrice price={subtotal} />
           </div>
-          {orderType != OrderType.DineIn && <div className={styles.summaryRow}>
+          {orderType != OrderType.DineIn && (
-            <ProText type="secondary">{t("cart.deliveryFee")}</ProText>
+            <div className={styles.summaryRow}>
-            <ArabicPrice price={Number(restaurant?.delivery_fees || 0)} />
+              <ProText type="secondary">{t("cart.deliveryFee")}</ProText>
-          </div>}
+              <ArabicPrice price={Number(restaurant?.delivery_fees || 0)} />
+            </div>
+          )}
           <div className={styles.summaryRow}>
             <ProText type="secondary">{t("cart.discount")}</ProText>
-            <ArabicPrice price={highestLoyaltyItem?.price || 0} />
+            <ArabicPrice
+              price={useLoyaltyPoints ? highestLoyaltyItem?.price || 0 : 0}
+            />
           </div>
           <div className={styles.summaryRow}>
             <ProText type="secondary">{t("cart.tax")}</ProText>

src/features/order/orderSlice.ts

@@ -650,7 +650,11 @@ export const selectGrandTotal = (state: RootState) => {
       ? Number(state.order.restaurant?.delivery_fees) || 0
       : 0;
 
-  return subtotal + taxAmount - loyaltyDiscount + deliveryFee;
+      return (
-};
+        subtotal +
+        taxAmount -
+        (state.order.useLoyaltyPoints ? loyaltyDiscount : 0) +
+        deliveryFee
+      );};
 
 export default orderSlice.reducer;