diff --git a/packages/tradershub/package.json b/packages/tradershub/package.json index ea8bed96f50a..57d76071f473 100644 --- a/packages/tradershub/package.json +++ b/packages/tradershub/package.json @@ -38,6 +38,7 @@ "react-i18next": "^11.11.0", "react-router-dom": "^5.2.0", "react-transition-group": "4.4.2", + "tailwind-merge": "^1.14.0", "usehooks-ts": "^2.7.0", "yup": "^0.32.11" }, diff --git a/packages/tradershub/src/components/ActionScreen/ActionScreen.tsx b/packages/tradershub/src/components/ActionScreen/ActionScreen.tsx index fae375e7275f..2b063771162f 100644 --- a/packages/tradershub/src/components/ActionScreen/ActionScreen.tsx +++ b/packages/tradershub/src/components/ActionScreen/ActionScreen.tsx @@ -1,5 +1,5 @@ import React, { ComponentProps, isValidElement, ReactNode } from 'react'; -import { clsx } from 'clsx'; +import { twMerge } from 'tailwind-merge'; import { Text } from '@deriv-com/ui'; type TActionScreenProps = { @@ -29,7 +29,9 @@ const ActionScreen = ({ titleSize = 'md', }: TActionScreenProps) => { return ( -
+
{icon}
{title && ( diff --git a/packages/tradershub/src/components/AppContainer/AppContainer.tsx b/packages/tradershub/src/components/AppContainer/AppContainer.tsx index 147bcff25bec..e4c3c5539476 100644 --- a/packages/tradershub/src/components/AppContainer/AppContainer.tsx +++ b/packages/tradershub/src/components/AppContainer/AppContainer.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from 'react'; -import { clsx } from 'clsx'; +import { twMerge } from 'tailwind-merge'; type TAppContainerProps = { children: ReactNode; @@ -13,7 +13,7 @@ type TAppContainerProps = { */ const AppContainer = ({ children, className }: TAppContainerProps) => ( -
+
{children}
); diff --git a/packages/tradershub/src/components/ButtonGroup/ButtonGroup.tsx b/packages/tradershub/src/components/ButtonGroup/ButtonGroup.tsx index 799b669c3f34..289679ed65c7 100644 --- a/packages/tradershub/src/components/ButtonGroup/ButtonGroup.tsx +++ b/packages/tradershub/src/components/ButtonGroup/ButtonGroup.tsx @@ -1,5 +1,5 @@ import React, { FC, PropsWithChildren } from 'react'; -import { clsx } from 'clsx'; +import { twMerge } from 'tailwind-merge'; type TButtonGroupProps = { className?: string }; @@ -13,7 +13,7 @@ type TButtonGroupProps = { className?: string }; */ const ButtonGroup: FC> = ({ children, className }) => ( -
{children}
+
{children}
); export default ButtonGroup; diff --git a/packages/tradershub/src/components/CFDSection/CFDHeading/CFDHeading.tsx b/packages/tradershub/src/components/CFDSection/CFDHeading/CFDHeading.tsx index 4907175219d5..d2b27bd2b147 100644 --- a/packages/tradershub/src/components/CFDSection/CFDHeading/CFDHeading.tsx +++ b/packages/tradershub/src/components/CFDSection/CFDHeading/CFDHeading.tsx @@ -1,6 +1,6 @@ import React, { Fragment } from 'react'; -import { clsx } from 'clsx'; import { useHistory } from 'react-router-dom'; +import { twMerge } from 'tailwind-merge'; import { StaticLink, TitleDescriptionLoader } from '@/components'; import { useRegulationFlags } from '@/hooks'; import { useIsEuRegion } from '@deriv/api'; @@ -15,7 +15,7 @@ const CompareAccountsButton = ({ className }: { className?: string }) => { return (