diff --git a/src/entities/HeaderAccount/HeaderAccount.tsx b/src/entities/HeaderAccount/HeaderAccount.tsx index f68f3835..41e19ccf 100644 --- a/src/entities/HeaderAccount/HeaderAccount.tsx +++ b/src/entities/HeaderAccount/HeaderAccount.tsx @@ -54,6 +54,10 @@ const HeaderAccount: FC = ({ isMenuModalOpen, handleClose, c dispatch(loginActions.errorReset()) } + const closeModal = () => { + setIsModalClosing(true) + } + const onLogout = () => { dispatch(logout()) } @@ -73,7 +77,7 @@ const HeaderAccount: FC = ({ isMenuModalOpen, handleClose, c isModalClosing={isModalClosing} setIsModalClosing={setIsModalClosing}> }> - + )} diff --git a/src/features/CallBack/ui/CallBack/CallBack.module.scss b/src/features/CallBack/ui/CallBack/CallBack.module.scss index 0af86877..b4ffcacf 100644 --- a/src/features/CallBack/ui/CallBack/CallBack.module.scss +++ b/src/features/CallBack/ui/CallBack/CallBack.module.scss @@ -1,4 +1,4 @@ -@use '../../../../shared/styles/utils/variables' as var; +@use '@/shared/styles/utils/variables' as var; .form { position: relative; @@ -27,18 +27,14 @@ padding: 0; border: none; cursor: pointer; +} - path { - width: 100%; - height: 100%; - fill: var.$black; - transition: fill 300ms; - } +.close-icon { + fill: var.$body-color; + transition: 0.25s; &:hover { - path { - fill: var.$theme-primary-color; - } + fill: var.$header-color; } } diff --git a/src/features/CallBack/ui/CallBack/CallBack.tsx b/src/features/CallBack/ui/CallBack/CallBack.tsx index a795c34f..1c086091 100644 --- a/src/features/CallBack/ui/CallBack/CallBack.tsx +++ b/src/features/CallBack/ui/CallBack/CallBack.tsx @@ -1,7 +1,7 @@ import { ErrorMessage, Field, Form, Formik, FormikHelpers } from 'formik' import React, { useCallback } from 'react' -import IconClose from '@/assets/icons/IconClose.svg' +import IconClose from '@/assets/icons/iconHeaderMenuClose.svg' import { CallBackData } from '@/features/CallBack/models/types/types' import { validationSchema } from '@/features/CallBack/models/validation/validation' import { Button, ButtonSize, ButtonTheme } from '@/shared/ui/Button/Button' @@ -51,7 +51,7 @@ export const CallBack: React.FC = ({ setIsModalClosing }) => { {({ isValid, dirty, isSubmitting }) => (
Заказать обратный звонок