diff --git a/src/custom/CustomTooltip/customTooltip.tsx b/src/custom/CustomTooltip/customTooltip.tsx index 2b823043..a6256749 100644 --- a/src/custom/CustomTooltip/customTooltip.tsx +++ b/src/custom/CustomTooltip/customTooltip.tsx @@ -1,14 +1,14 @@ -import { type TooltipProps } from '@mui/material'; +import { Tooltip, type TooltipProps } from '@mui/material'; import React from 'react'; -import { Tooltip } from '../../base/Tooltip'; +import { CHARCOAL, WHITE } from '../../theme'; type CustomTooltipProps = { - title: string; + title: string | React.ReactNode; onClick?: (event: React.MouseEvent) => void; children: React.ReactNode; } & Omit; -function StyledTooltip({ +function CustomTooltip({ title, onClick, placement, @@ -16,10 +16,33 @@ function StyledTooltip({ ...props }: CustomTooltipProps): JSX.Element { return ( - + {children} ); } -export default StyledTooltip; +export default CustomTooltip; diff --git a/src/custom/Feedback/FeedbackButton.tsx b/src/custom/Feedback/FeedbackButton.tsx index 830f840e..b83867cb 100644 --- a/src/custom/Feedback/FeedbackButton.tsx +++ b/src/custom/Feedback/FeedbackButton.tsx @@ -1,6 +1,5 @@ import Typography from '@mui/material/Typography'; import React, { CSSProperties, useRef, useState } from 'react'; -import { Tooltip } from '../../base/Tooltip'; import { CalenderIcon, CloseIcon, @@ -10,6 +9,7 @@ import { SuccessIcon } from '../../icons'; import { CULTURED } from '../../theme'; +import { CustomTooltip } from '../CustomTooltip'; import { ModalCard } from '../ModalCard'; import { ActionWrapper, @@ -25,14 +25,13 @@ import { FeedbackTextArea, HelperWrapper, InnerComponentWrapper, - MeetWrapper, StyledCheckbox, StyledLink, StyledTextArea } from './style'; const tooltipContent = ( - +

Some account and system information may be sent to Layer5. We will use it to fix problems and improve our services, subject to our{' '} @@ -43,7 +42,7 @@ const tooltipContent = ( Terms of Service . We may email you for more information or updates. - +

); interface FeedbackDataItem { @@ -184,11 +183,11 @@ const FeedbackComponent: React.FC = ({ leftHeaderIcon={} title="Feedback" helpArea={ - + - + } helpText={'Help'} content={ diff --git a/src/custom/Feedback/style.tsx b/src/custom/Feedback/style.tsx index 45bace6e..36cd8edf 100644 --- a/src/custom/Feedback/style.tsx +++ b/src/custom/Feedback/style.tsx @@ -180,10 +180,6 @@ export const StyledTextArea = styled('textarea')(({ theme }) => ({ } })); -export const MeetWrapper = styled('p')(({ theme }) => ({ - color: theme.palette.mode === 'dark' ? SNOW_WHITE : DARK_JUNGLE_GREEN -})); - export const StyledLink = styled('a')({ textDecoration: 'underline', color: 'inherit',