Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TRAH] Aizad/Fix Build Failed on Traderhub #12735

Merged
merged 4 commits into from
Jan 4, 2024
Merged

[TRAH] Aizad/Fix Build Failed on Traderhub #12735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41c4732
fix: build error
aizad-deriv Jan 4, 2024
e18efb9
fix: update component directory
aizad-deriv Jan 4, 2024
db83dcb
Merge branch 'master' of github.com:aizad-deriv/deriv-app into aizad/…
aizad-deriv Jan 4, 2024
37201dc
fix: other issues
aizad-deriv Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions packages/tradershub/src/components/Base/index.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...c/components/Base/Clipboard/Clipboard.tsx → ...ub/src/components/Clipboard/Clipboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useEffect, useRef, useState } from 'react';
import { useCopyToClipboard, useHover } from 'usehooks-ts';
import { Button, useBreakpoint } from '@deriv/quill-design';
import ClipboardIcon from '../../../public/images/clipboard.svg';
import CheckmarkCircle from '../../../public/images/ic-checkmark-circle.svg';
import ClipboardIcon from '../../public/images/clipboard.svg';
import CheckmarkCircle from '../../public/images/ic-checkmark-circle.svg';
import { Tooltip } from '../Tooltip';

type TClipboardProps = {
Expand Down
0 ...ub/src/components/Base/Clipboard/index.ts → ...dershub/src/components/Clipboard/index.ts
View file
Open in desktop
File renamed without changes.
0 ...onents/Base/Tooltip/Tooltip.classnames.ts → .../components/Tooltip/Tooltip.classnames.ts
View file
Open in desktop
File renamed without changes.
0 ...b/src/components/Base/Tooltip/Tooltip.tsx → ...ershub/src/components/Tooltip/Tooltip.tsx
View file
Open in desktop
File renamed without changes.
0 ...shub/src/components/Base/Tooltip/index.ts → ...radershub/src/components/Tooltip/index.ts
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions packages/tradershub/src/components/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export * from './Base';
export * from './ActionScreen';
export * from './ButtonGroup';
export * from './ButtonGroup';
export * from './Clipboard';
export * from './ContentSwitcher';
export * from './CurrencySwitcher';
export * from './Dialog';
Expand All @@ -9,6 +10,7 @@ export * from './Modal';
export * from './ModalStepWrapper';
export * from './OptionsAndMultipliersSection';
export * from './StaticLink';
export * from './Tooltip';
export * from './TotalAssets';
export * from './TradingAccountCard';
export * from './TradingAccountsList';
export * from './TradingAccountsList';
5 changes: 3 additions & 2 deletions packages/tradershub/src/features/cfd/modals/DxtradePasswordModal/DxtradePasswordModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import {
useCreateOtherCFDAccount,
useDxtradeAccountsList,
} from '@deriv/api';
import { Provider } from '@deriv/library';
import { Button, useBreakpoint } from '@deriv/quill-design';
import { ActionScreen, ButtonGroup, Dialog, ModalStepWrapper, useModal } from '../../../../components';
import { ActionScreen, ButtonGroup, Dialog, ModalStepWrapper } from '../../../../components';
import DxTradePasswordIcon from '../../../../public/images/cfd/dxtrade-password.svg';
import { PlatformDetails } from '../../constants';
import { CFDSuccess, CreatePassword, EnterPassword } from '../../screens';
Expand All @@ -20,7 +21,7 @@ const DxtradePasswordModal = () => {
const { error, isLoading, isSuccess, mutate, status } = useCreateOtherCFDAccount();
const { isSuccess: dxtradeAccountListSuccess } = useDxtradeAccountsList();
const { data: activeTrading } = useActiveTradingAccount();
const { hide } = useModal();
const { hide } = Provider.useModal();
const accountType = activeTrading?.is_virtual ? 'demo' : 'real';
const dxtradePlatform = PlatformDetails.dxtrade.platform;

Expand Down
2 changes: 1 addition & 1 deletion packages/tradershub/src/features/cfd/screens/CFDCompareAccounts/CompareAccountsTitleIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Fragment, useRef } from 'react';
import { useHover } from 'usehooks-ts';
import { Text, useBreakpoint } from '@deriv/quill-design';
import { Tooltip } from '../../../../components/Base/Tooltip';
import { Tooltip } from '../../../../components';
import InfoIcon from '../../../../public/images/ic-info-outline.svg';
import { THooks, TPlatforms } from '../../../../types';
import { CFDPlatforms } from '../../constants';
Expand Down
2 changes: 1 addition & 1 deletion ...rshub/src/features/cfd/screens/MT5TradeScreen/MT5TradeDetailsItem/MT5TradeDetailsItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FC, useRef } from 'react';
import { useHover } from 'usehooks-ts';
import { qtMerge, Text, useBreakpoint } from '@deriv/quill-design';
import { Clipboard, Tooltip } from '../../../../../components/Base';
import { Clipboard, Tooltip } from '../../../../../components';
import EditIcon from '../../../../../public/images/ic-edit.svg';

type TMT5TradeDetailsItemProps = {
Expand Down