diff --git a/src/components/CustomTariffAccordion.tsx b/src/components/CustomTariffAccordion.tsx index cb8b1c5..5f3d474 100644 --- a/src/components/CustomTariffAccordion.tsx +++ b/src/components/CustomTariffAccordion.tsx @@ -1,10 +1,5 @@ import { useState } from "react"; -import { - Box, Typography, - IconButton, - useMediaQuery, - useTheme -} from "@mui/material"; +import { Box, Typography, IconButton, useMediaQuery, useTheme } from "@mui/material"; import ExpandIcon from "@components/icons/ExpandIcon"; import { currencyFormatter } from "@root/utils/currencyFormatter"; import { removeTariffFromCart } from "@root/stores/user"; @@ -12,148 +7,145 @@ import { enqueueSnackbar } from "notistack"; import { TariffCartData, getMessageFromFetchError } from "@frontend/kitui"; import { ReactComponent as CrossIcon } from "@root/assets/Icons/cross.svg"; - interface Props { - tariffCartData: TariffCartData; + tariffCartData: TariffCartData; } export default function CustomTariffAccordion({ tariffCartData }: Props) { - const theme = useTheme(); - const upMd = useMediaQuery(theme.breakpoints.up("md")); - const upSm = useMediaQuery(theme.breakpoints.up("sm")); - const [isExpanded, setIsExpanded] = useState(false); + const theme = useTheme(); + const upMd = useMediaQuery(theme.breakpoints.up("md")); + const upSm = useMediaQuery(theme.breakpoints.up("sm")); + const [isExpanded, setIsExpanded] = useState(false); - function handleDeleteClick() { - removeTariffFromCart(tariffCartData.id) - .then(() => { - enqueueSnackbar("Тариф удален"); - }) - .catch((error) => { - const message = getMessageFromFetchError(error); - if (message) enqueueSnackbar(message); - }); - } + function handleDeleteClick() { + removeTariffFromCart(tariffCartData.id) + .then(() => { + enqueueSnackbar("Тариф удален"); + }) + .catch((error) => { + const message = getMessageFromFetchError(error); + if (message) enqueueSnackbar(message); + }); + } - return ( + return ( + + setIsExpanded((prev) => !prev)} + sx={{ + height: "72px", + pr: "20px", + pl: "30px", + display: "flex", + gap: "15px", + alignItems: "center", + justifyContent: "space-between", + cursor: "pointer", + userSelect: "none", + }} > - + + + + Кастомный тариф + + + - setIsExpanded((prev) => !prev)} - sx={{ - height: "72px", - pr: "20px", - pl: "30px", - display: "flex", - gap: "15px", - alignItems: "center", - justifyContent: "space-between", - cursor: "pointer", - userSelect: "none", - }} - > - - - - - Кастомный тариф - - - - {currencyFormatter.format(tariffCartData.price / 100)} - - - - - - - {isExpanded && tariffCartData.privileges.map((privilege) => ( - - - {privilege.description} - - - - {currencyFormatter.format(privilege.price / 100)} - - - - ))} - + {currencyFormatter.format(tariffCartData.price / 100)} + + + + + - ); + {isExpanded && + tariffCartData.privileges.map((privilege) => ( + + + {privilege.description} + + + + {currencyFormatter.format(privilege.price / 100)} + + + + ))} + + + ); } diff --git a/src/pages/SavedTariffs/SaveWrapper.tsx b/src/pages/SavedTariffs/SaveWrapper.tsx index 0a24ba3..10d4887 100644 --- a/src/pages/SavedTariffs/SaveWrapper.tsx +++ b/src/pages/SavedTariffs/SaveWrapper.tsx @@ -13,10 +13,10 @@ import { PrivilegeCartData, getMessageFromFetchError } from "@frontend/kitui"; interface Props { content: PrivilegeCartData[]; - serviceKey: string; + name: string; } -const SaveWrapper: FC = ({ content, serviceKey }) => { +const SaveWrapper: FC = ({ content, name }) => { const theme = useTheme(); const upMd = useMediaQuery(theme.breakpoints.up("md")); const upSm = useMediaQuery(theme.breakpoints.up("sm")); @@ -46,7 +46,7 @@ const SaveWrapper: FC = ({ content, serviceKey }) => { boxShadow: cardShadow, }} > - {content.map(({ tariffName, price, description, tariffId }, index) => ( + {content.map(({ price, description, privilegeId }, index) => ( = ({ content, serviceKey }) => { color: "#7E2AEA", }} > - {extractDateFromString(tariffName)} + {extractDateFromString(name)} = ({ content, serviceKey }) => { {new Intl.NumberFormat("ru-RU").format(price)} руб. handleTariffItemClick(tariffId)} + onClick={() => handleTariffItemClick(privilegeId)} variant="contained" sx={{ mr: "25px", diff --git a/src/pages/SavedTariffs/index.tsx b/src/pages/SavedTariffs/index.tsx index 2fc1861..f4ef0d9 100644 --- a/src/pages/SavedTariffs/index.tsx +++ b/src/pages/SavedTariffs/index.tsx @@ -41,7 +41,7 @@ export default function Faq() { {cart.services.map(({ serviceKey, tariffs }) => serviceKey === "custom" - ? tariffs.map(({ privileges }) => ) + ? tariffs.map(({ privileges, name }) => ) : null )}