diff --git a/src/components/shared_ui/button/button.tsx b/src/components/shared_ui/button/button.tsx index f0b174ed..50ff1c54 100644 --- a/src/components/shared_ui/button/button.tsx +++ b/src/components/shared_ui/button/button.tsx @@ -1,9 +1,12 @@ -import classNames from 'classnames'; import React from 'react'; -import ButtonLoading from './button_loading'; -import Text from '../text'; +import classNames from 'classnames'; + import { Icon } from '@/utils/tmp/dummy'; +import Text from '../text'; + +import ButtonLoading from './button_loading'; + export type TButtonCommonProps = { alternate: boolean; black: boolean; diff --git a/src/components/shared_ui/button/button_loading.tsx b/src/components/shared_ui/button/button_loading.tsx index a9d8d9e7..ef87162f 100644 --- a/src/components/shared_ui/button/button_loading.tsx +++ b/src/components/shared_ui/button/button_loading.tsx @@ -1,4 +1,5 @@ import Loading, { TLoadingProps } from '../loading/loading'; + import '../loading/loading.scss'; const ButtonLoading = ( diff --git a/src/components/shared_ui/button/index.ts b/src/components/shared_ui/button/index.ts index a6968c5e..64460f3e 100644 --- a/src/components/shared_ui/button/index.ts +++ b/src/components/shared_ui/button/index.ts @@ -1,4 +1,5 @@ import Button from './button'; + import './button.scss'; export default Button; diff --git a/src/components/shared_ui/loading/index.ts b/src/components/shared_ui/loading/index.ts index c170e770..ccb3022c 100644 --- a/src/components/shared_ui/loading/index.ts +++ b/src/components/shared_ui/loading/index.ts @@ -1,4 +1,5 @@ import Loading from './loading'; + import './loading.scss'; export default Loading; diff --git a/src/components/shared_ui/loading/loading.tsx b/src/components/shared_ui/loading/loading.tsx index 80a313ce..d3f63a62 100644 --- a/src/components/shared_ui/loading/loading.tsx +++ b/src/components/shared_ui/loading/loading.tsx @@ -1,5 +1,6 @@ import React from 'react'; import classNames from 'classnames'; + import Text from '../text/text'; export type TLoadingProps = React.HTMLProps & { diff --git a/src/components/shared_ui/modal/__tests__/modal.spec.tsx b/src/components/shared_ui/modal/__tests__/modal.spec.tsx index c4b9a216..75727ebf 100644 --- a/src/components/shared_ui/modal/__tests__/modal.spec.tsx +++ b/src/components/shared_ui/modal/__tests__/modal.spec.tsx @@ -1,4 +1,5 @@ -import { render, screen, fireEvent } from '@testing-library/react'; +import { fireEvent, render, screen } from '@testing-library/react'; + import Modal from '../modal'; const modalRoot = document.createElement('div'); diff --git a/src/components/shared_ui/modal/index.ts b/src/components/shared_ui/modal/index.ts index b7aea668..ae6504d0 100644 --- a/src/components/shared_ui/modal/index.ts +++ b/src/components/shared_ui/modal/index.ts @@ -1,4 +1,5 @@ import Modal from './modal'; + import './modal.scss'; export default Modal; diff --git a/src/components/shared_ui/modal/modal.tsx b/src/components/shared_ui/modal/modal.tsx index b15f2634..b987388f 100644 --- a/src/components/shared_ui/modal/modal.tsx +++ b/src/components/shared_ui/modal/modal.tsx @@ -1,13 +1,16 @@ import React from 'react'; -import classNames from 'classnames'; import ReactDOM from 'react-dom'; import { CSSTransition } from 'react-transition-group'; -import Body from './modal-body'; -import Footer from './modal-footer'; -import Text from '../text/text'; +import classNames from 'classnames'; + import { useOnClickOutside } from '@/hooks/useOnClickOutside'; import { Icon } from '@/utils/tmp/dummy'; +import Text from '../text/text'; + +import Body from './modal-body'; +import Footer from './modal-footer'; + interface IClickEvent extends MouseEvent { path?: HTMLElement[]; } diff --git a/src/pages/dashboard/cards.tsx b/src/pages/dashboard/cards.tsx index 591584d2..a3375626 100644 --- a/src/pages/dashboard/cards.tsx +++ b/src/pages/dashboard/cards.tsx @@ -4,12 +4,13 @@ import classNames from 'classnames'; import { observer } from 'mobx-react-lite'; import { localize } from '@deriv-com/translations'; -import Dialog from '@/components/shared_ui/dialog'; import { NOTIFICATION_TYPE } from '@/components/bot-notification/bot-notification-utils'; import DesktopWrapper from '@/components/shared_ui/desktop-wrapper'; +import Dialog from '@/components/shared_ui/dialog'; import MobileFullPageModal from '@/components/shared_ui/mobile-full-page-modal'; import MobileWrapper from '@/components/shared_ui/mobile-wrapper'; +import Text from '@/components/shared_ui/text'; import { DBOT_TABS } from '@/constants/bot-contents'; import { useStore } from '@/hooks/useStore'; import { Icon } from '@/utils/tmp/dummy'; @@ -18,7 +19,6 @@ import { rudderStackSendQsOpenEventFromDashboard } from '../bot-builder/quick-st import DashboardBotList from './load-bot-preview/dashboard-bot-list'; import GoogleDrive from './load-bot-preview/google-drive'; -import Text from '@/components/shared_ui/text'; type TCardProps = { has_dashboard_strategies: boolean; diff --git a/src/pages/dashboard/load-bot-preview/google-drive.tsx b/src/pages/dashboard/load-bot-preview/google-drive.tsx index 87ea7244..a6ec48a7 100644 --- a/src/pages/dashboard/load-bot-preview/google-drive.tsx +++ b/src/pages/dashboard/load-bot-preview/google-drive.tsx @@ -2,10 +2,10 @@ import React from 'react'; import classnames from 'classnames'; import { observer } from 'mobx-react-lite'; +import Button from '@/components/shared_ui/button'; import StaticUrl from '@/components/shared_ui/static-url'; import { useStore } from '@/hooks/useStore'; import { Icon, Localize, localize } from '@/utils/tmp/dummy'; -import Button from '@/components/shared_ui/button'; const GoogleDrive = observer(() => { const { ui, google_drive, load_modal } = useStore(); diff --git a/src/pages/dashboard/load-bot-preview/save-modal.tsx b/src/pages/dashboard/load-bot-preview/save-modal.tsx index da14c7ee..61ee7fd1 100644 --- a/src/pages/dashboard/load-bot-preview/save-modal.tsx +++ b/src/pages/dashboard/load-bot-preview/save-modal.tsx @@ -5,7 +5,10 @@ import { observer } from 'mobx-react-lite'; import { Text } from '@deriv-com/ui'; +import Button from '@/components/shared_ui/button'; +import Input from '@/components/shared_ui/input'; import MobileFullPageModal from '@/components/shared_ui/mobile-full-page-modal'; +import Modal from '@/components/shared_ui/modal'; import RadioGroup from '@/components/shared_ui/radio-group'; import ThemedScrollbars from '@/components/shared_ui/themed-scrollbars'; import { config, save_types } from '@/external/bot-skeleton'; @@ -13,9 +16,6 @@ import { useStore } from '@/hooks/useStore'; import { Icon, localize } from '@/utils/tmp/dummy'; import IconRadio from './icon-radio'; -import Modal from '@/components/shared_ui/modal'; -import Button from '@/components/shared_ui/button'; -import Input from '@/components/shared_ui/input'; type TSaveModalForm = { bot_name: string;