Skip to content

Commit 02354d9

Browse files
authored
[WALL] Aizad/WALL-3925/Removing SVGs inside of Wallets/Component package and replace it with deriv/quill-icon (deriv-com#14890)
* chore: remove svg from walletalertmessage and other svgs * chore: migrate WalletClipboard and remove svg icons * chore: migrate PasswordViewerIcon * chore: migrate DatePicker component * chore: migrate WalletError component * chore: fix Options icon issue in mobile
1 parent a5bd749 commit 02354d9

21 files changed

+21
-113
lines changed

packages/wallets/src/components/Base/WalletAlertMessage/WalletAlertMessage.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
import React, { ReactNode } from 'react';
2-
import ErrorCircleCrossmark from '../../../public/images/error-circle-crossmark.svg';
3-
import InfoCircleDots from '../../../public/images/info-circle-dots.svg';
4-
import SuccessCircleCheckmark from '../../../public/images/success-circle-checkmark.svg';
2+
import { LegacyLossIcon, LegacySettlementFillIcon, LegacyWonIcon } from '@deriv/quill-icons';
53
import { WalletText } from '../index';
64
import './WalletAlertMessage.scss';
75

86
const typeMapper = {
97
error: {
108
color: 'error',
11-
icon: ErrorCircleCrossmark,
9+
fill: '#EC3F3F',
10+
icon: LegacyLossIcon,
1211
},
1312
info: {
1413
color: 'blue',
15-
icon: InfoCircleDots,
14+
fill: '#377CFC',
15+
icon: LegacySettlementFillIcon,
1616
},
1717
success: {
1818
color: 'success',
19-
icon: SuccessCircleCheckmark,
19+
fill: '#4BB4B3',
20+
icon: LegacyWonIcon,
2021
},
21-
};
22+
} as const;
2223

2324
type TProps = {
2425
children?: ReactNode;
@@ -29,14 +30,13 @@ type TProps = {
2930
const WalletAlertMessage: React.FC<TProps> = ({ children, message, type }) => {
3031
const Icon = typeMapper[type].icon;
3132
const color = typeMapper[type].color;
33+
const fill = typeMapper[type].fill;
3234

3335
return (
3436
<div className='wallets-alert-message' data-testid='dt_wallet-alert-message'>
3537
<div className='wallets-alert-message__icon-container'>
3638
<div className='wallets-alert-message__icon-container__line' />
37-
<div className='wallets-alert-message__icon-container__icon'>
38-
<Icon />
39-
</div>
39+
<Icon className='wallets-alert-message__icon-container__icon' fill={fill} iconSize='xs' />
4040
</div>
4141
<div className='wallets-alert-message__message-container'>
4242
<WalletText color={color} size='xs'>

packages/wallets/src/components/Base/WalletClipboard/WalletClipboard.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import React, { useEffect, useRef, useState } from 'react';
22
import { useCopyToClipboard, useHover } from 'usehooks-ts';
3+
import { LegacyCopy1pxIcon, LegacyWonIcon } from '@deriv/quill-icons';
34
import useDevice from '../../../hooks/useDevice';
4-
import Clipboard from '../../../public/images/clipboard.svg';
5-
import CheckmarkCircle from '../../../public/images/ic-checkmark-circle.svg';
65
import { Tooltip } from '../Tooltip';
76
import './WalletClipboard.scss';
87

@@ -40,7 +39,7 @@ const WalletClipboard = ({
4039
return (
4140
<Tooltip alignment='right' isVisible={isHovered && !isMobile} message={isCopied ? 'Copied!' : 'Copy'}>
4241
<button className='wallets-clipboard' onClick={onClick} ref={hoverRef}>
43-
{isCopied ? <CheckmarkCircle /> : <Clipboard />}
42+
{isCopied ? <LegacyWonIcon iconSize='xs' /> : <LegacyCopy1pxIcon iconSize='xs' />}
4443
</button>
4544
</Tooltip>
4645
);

packages/wallets/src/components/Base/WalletPasswordField/PasswordViewerIcon.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22
import classNames from 'classnames';
3-
import PasswordHide from '../../../public/images/ic-password-hide.svg';
4-
import PasswordShow from '../../../public/images/ic-password-show.svg';
3+
import { LegacyVisibility1pxIcon, LegacyVisibilityOff1pxIcon } from '@deriv/quill-icons';
54
import { IconButton } from '../IconButton';
65
import './PasswordViewerIcon.scss';
76

@@ -17,7 +16,7 @@ const PasswordViewerIcon: React.FC<PasswordViewerIconProps> = ({ isIconDisabled,
1716
'wallets-password-viewer-icon--disabled': isIconDisabled,
1817
})}
1918
color='transparent'
20-
icon={viewPassword ? <PasswordShow /> : <PasswordHide />}
19+
icon={viewPassword ? <LegacyVisibility1pxIcon iconSize='xs' /> : <LegacyVisibilityOff1pxIcon iconSize='xs' />}
2120
isRound
2221
onClick={() => !isIconDisabled && setViewPassword(!viewPassword)}
2322
size='sm'

packages/wallets/src/components/DatePicker/DatePicker.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useRef, useState } from 'react';
22
import Calendar, { CalendarProps } from 'react-calendar';
33
import { useOnClickOutside } from 'usehooks-ts';
4-
import CalendarIcon from '../../public/images/ic-calendar.svg';
4+
import { LegacyCalendar1pxIcon } from '@deriv/quill-icons';
55
import unixToDateString from '../../utils/utils';
66
import FlowTextField, { TFlowFieldProps } from '../FlowField/FlowTextField';
77
import customFormatShortWeekday from './utils';
@@ -67,7 +67,7 @@ const DatePicker = ({
6767
disabled={disabled}
6868
onClick={toggleCalendar}
6969
>
70-
<CalendarIcon />
70+
<LegacyCalendar1pxIcon iconSize='xs' />
7171
</button>
7272
)}
7373
showMessage

packages/wallets/src/components/DerivAppsSection/DerivAppsTradingAccount.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const DerivAppsTradingAccount: React.FC = () => {
1717
return (
1818
<div className='wallets-deriv-apps-section wallets-deriv-apps-section__border'>
1919
<div className={isMobile ? 'wallets-deriv-apps-section__icon-small' : 'wallets-deriv-apps-section__icon'}>
20-
<WalletMarketIcon icon='IcWalletOptionsLight' size='lg' />
20+
<WalletMarketIcon icon='IcWalletOptionsLight' size={isMobile ? 'md' : 'lg'} />
2121
</div>
2222
<div className='wallets-deriv-apps-section__details'>
2323
<div className='wallets-deriv-apps-section__title-and-badge'>

packages/wallets/src/components/WalletError/WalletError.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { ComponentProps } from 'react';
2+
import { LegacyWarningIcon } from '@deriv/quill-icons';
23
import useDevice from '../../hooks/useDevice';
3-
import ErrorIcon from '../../public/images/error-icon.svg';
44
import { ModalStepWrapper } from '../Base';
55
import WalletButton from '../Base/WalletButton/WalletButton';
66
import { WalletsActionScreen } from '../WalletsActionScreen';
@@ -28,7 +28,7 @@ const WalletError: React.FC<TProps> = ({
2828
<div className='wallets-error'>
2929
<WalletsActionScreen
3030
description={errorMessage}
31-
icon={<ErrorIcon />}
31+
icon={<LegacyWarningIcon fill='#FF444F' iconSize='2xl' />}
3232
renderButtons={() => (
3333
<WalletButton isFullWidth={isMobile} onClick={onClick} size='lg' variant={buttonVariant}>
3434
{buttonText}

packages/wallets/src/components/WalletsErrorScreen/WalletsErrorScreen.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import ErrorIcon from '../../public/images/error-icon.svg';
2+
import { LegacyWarningIcon } from '@deriv/quill-icons';
33
import { WalletButton } from '../Base';
44
import { WalletsActionScreen } from '../WalletsActionScreen';
55

@@ -13,7 +13,7 @@ const ErrorState: React.FC<TProps> = ({
1313
return (
1414
<WalletsActionScreen
1515
description={message}
16-
icon={<ErrorIcon data-testid='dt_error_icon' />}
16+
icon={<LegacyWarningIcon data-testid='dt_error_icon' fill='#FF444F' iconSize='2xl' />}
1717
renderButtons={() => (
1818
<WalletButton onClick={() => window.location.reload()} size='lg' variant='ghost'>
1919
Try again

packages/wallets/src/public/images/clipboard.svg

-7
This file was deleted.

packages/wallets/src/public/images/error-circle-crossmark.svg

-1
This file was deleted.

packages/wallets/src/public/images/error-icon.svg

-1
This file was deleted.

packages/wallets/src/public/images/ic-appstore-binary-bot.svg

-14
This file was deleted.

packages/wallets/src/public/images/ic-appstore-deriv-bot.svg

-14
This file was deleted.

packages/wallets/src/public/images/ic-appstore-deriv-go.svg

-14
This file was deleted.

0 commit comments

Comments
 (0)