@thecb/components 7.11.0-beta.3 → 7.11.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "7.11.0-beta.3",
+  "version": "7.11.0-beta.5",
   "description": "Common lib for CityBase react components",
   "main": "dist/index.cjs.js",
   "typings": "dist/index.d.ts",

package/src/components/molecules/partial-amount-form/PartialAmountForm.js

@@ -47,7 +47,10 @@ const PartialAmountForm = ({
         maxAmount
       )}`;
       console.log("max amount in form is", maxAmount);
-      errorMessages[numberLessThanOrEqualTo.error] = maxAmountError;
+      return {
+        ...errorMessages,
+        [numberLessThanOrEqualTo.error]: maxAmountError
+      };
     }
     console.log("error messages are", errorMessages);
     return errorMessages;

package/src/components/molecules/partial-amount-form/PartialAmountForm.state.js

@@ -13,14 +13,17 @@ export const createPartialAmountFormState = (
   minimum = 1,
   blockPartialPaymentOverpay = false
 ) => {
+  const getPaymentMax = (maximum, itemAmount) => {
+    if (blockPartialPaymentOverpay) {
+      return !maximum || itemAmount < maximum ? itemAmount : maximum;
+    }
+    return maximum;
+  };
   const formConfig = lineItems.reduce((acc, item) => {
     console.log("maximum is", maximum);
     console.log("item amount is", item.amount);
     console.log("block payment overpay", blockPartialPaymentOverpay);
-    let paymentMax = maximum;
-    if (blockPartialPaymentOverpay) {
-      paymentMax = !maximum || item.amount < maximum ? item.amount : maximum;
-    }
+
     console.log("payment max is", paymentMax);
     const validators = [
       required(),
@@ -34,7 +37,7 @@ export const createPartialAmountFormState = (
     if (!!maximum || blockPartialPaymentOverpay) {
       validators.push(
         validateSum(
-          numberLessThanOrEqualTo(paymentMax),
+          numberLessThanOrEqualTo(getPaymentMax(maximum, item.amount)),
           lineItems
             .filter(lineItem => lineItem != item)
             .reduce((acc, curr) => [...acc, curr.id], [])