diff --git a/src/pages/History/AccordionWrapper2.tsx b/src/pages/History/AccordionWrapper2.tsx index 93e90b3..09d7499 100644 --- a/src/pages/History/AccordionWrapper2.tsx +++ b/src/pages/History/AccordionWrapper2.tsx @@ -100,10 +100,10 @@ export default function AccordionWrapper2({ tariff, price, last, first, createdA fontWeight: 500, color: /* valuesByKey.expired */ false ? theme.palette.text.disabled : theme.palette.gray.dark, px: 0, - width: "200px", + width: upMd? "200px" : "auto", maxWidth: "200px", overflow: "hidden", - textOverflow: "ellipsis" + textOverflow: "ellipsis", }} > {tariff.isCustom ? "Мой тариф" : tariff.name} @@ -112,7 +112,7 @@ export default function AccordionWrapper2({ tariff, price, last, first, createdA setPaymentValueField(e.target.value.replace(/^0+(?=\d\.)/, ""))} + onChange={(e) => { + const value = parseFloat(e.target.value.replace(/^0+(?=\d\.)/, "")); + setPaymentValueField(isNaN(value) ? "" : value.toString()); + }} id="payment-amount" gap={upMd ? "16px" : "10px"} color={"#F2F3F7"} diff --git a/src/utils/hooks/useCart.ts b/src/utils/hooks/useCart.ts index d8fac09..c370423 100644 --- a/src/utils/hooks/useCart.ts +++ b/src/utils/hooks/useCart.ts @@ -16,5 +16,7 @@ export function useCart(): CartData { return calcCart(cartTariffs ?? [], discounts ?? [], purchasesAmount, userId, isUserNko); }, [cartTariffs, discounts, purchasesAmount, userId, isUserNko]); + console.log("Тут калькулятор покалькулировал. Вот что говорит: ", cart) + return cart; }