From 1823690299b2c8b548cb9dd894f6164be3154514 Mon Sep 17 00:00:00 2001 From: Bill He Date: Tue, 31 Oct 2023 10:47:30 -0700 Subject: [PATCH] Update based on latest designs --- src/components/Icon.tsx | 16 ++++++++-------- src/icons/deposit.svg | 11 +++++++++++ src/icons/download.svg | 6 ------ src/icons/index.ts | 4 ++-- src/icons/upload.svg | 3 --- src/icons/withdraw.svg | 4 ++++ src/views/menus/AccountMenu.tsx | 30 ++++++++++++------------------ 7 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 src/icons/deposit.svg delete mode 100644 src/icons/download.svg delete mode 100644 src/icons/upload.svg create mode 100644 src/icons/withdraw.svg diff --git a/src/components/Icon.tsx b/src/components/Icon.tsx index 1c37aac..e90094a 100644 --- a/src/components/Icon.tsx +++ b/src/components/Icon.tsx @@ -24,10 +24,10 @@ import { CommentIcon, CopyIcon, CubeIcon, - DiscordIcon, - DownloadIcon, - EtherscanIcon, + DepositIcon, DepthChartIcon, + DiscordIcon, + EtherscanIcon, ExportKeysIcon, FeedbackIcon, FileIcon, @@ -67,10 +67,10 @@ import { TransferIcon, TriangleIcon, TryAgainIcon, - UploadIcon, WarningIcon, WebsiteIcon, WhitepaperIcon, + WithdrawIcon, } from '@/icons'; export enum IconName { @@ -95,9 +95,9 @@ export enum IconName { Comment = 'Comment', Copy = 'Copy', Cube = 'Cube', + Deposit = 'Deposit', DepthChart = 'DepthChart', Discord = 'Discord', - Download = 'Download', Etherscan = 'Etherscan', ExportKeys = 'ExportKeys', Feedback = 'Feedback', @@ -139,10 +139,10 @@ export enum IconName { Transfer = 'Transfer', Triangle = 'Triangle', TryAgain = 'TryAgain', - Upload = 'Upload', Warning = 'Warning', Website = 'Website', Whitepaper = 'Whitepaper', + Withdraw = 'Withdraw', } const icons = { @@ -167,9 +167,9 @@ const icons = { [IconName.Comment]: CommentIcon, [IconName.Copy]: CopyIcon, [IconName.Cube]: CubeIcon, + [IconName.Deposit]: DepositIcon, [IconName.DepthChart]: DepthChartIcon, [IconName.Discord]: DiscordIcon, - [IconName.Download]: DownloadIcon, [IconName.Etherscan]: EtherscanIcon, [IconName.ExportKeys]: ExportKeysIcon, [IconName.Feedback]: FeedbackIcon, @@ -210,10 +210,10 @@ const icons = { [IconName.Transfer]: TransferIcon, [IconName.Triangle]: TriangleIcon, [IconName.TryAgain]: TryAgainIcon, - [IconName.Upload]: UploadIcon, [IconName.Warning]: WarningIcon, [IconName.Website]: WebsiteIcon, [IconName.Whitepaper]: WhitepaperIcon, + [IconName.Withdraw]: WithdrawIcon, } as Record; type ElementProps = { diff --git a/src/icons/deposit.svg b/src/icons/deposit.svg new file mode 100644 index 0000000..4d42be9 --- /dev/null +++ b/src/icons/deposit.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/download.svg b/src/icons/download.svg deleted file mode 100644 index 584c00c..0000000 --- a/src/icons/download.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/icons/index.ts b/src/icons/index.ts index ae49a19..661156b 100644 --- a/src/icons/index.ts +++ b/src/icons/index.ts @@ -19,9 +19,9 @@ export { default as CoinsIcon } from './coins.svg'; export { default as CommentIcon } from './comment.svg'; export { default as CopyIcon } from './copy.svg'; export { default as CubeIcon } from './cube.svg'; +export { default as DepositIcon } from './deposit.svg'; export { default as DepthChartIcon } from './depth-chart.svg'; export { default as DiscordIcon } from './discord.svg'; -export { default as DownloadIcon } from './download.svg'; export { default as ExportKeysIcon } from './export-keys.svg'; export { default as FeedbackIcon } from './feedback.svg'; export { default as FileIcon } from './file.svg'; @@ -59,8 +59,8 @@ export { default as TradeIcon } from './trade.svg'; export { default as TransferIcon } from './transfer.svg'; export { default as TriangleIcon } from './triangle.svg'; export { default as TryAgainIcon } from './try-again.svg'; -export { default as UploadIcon } from './upload.svg'; export { default as WarningIcon } from './warning.svg'; +export { default as WithdrawIcon } from './withdraw.svg'; // Wallets export { default as BitkeepIcon } from './wallets/bitkeep.svg'; diff --git a/src/icons/upload.svg b/src/icons/upload.svg deleted file mode 100644 index ea56561..0000000 --- a/src/icons/upload.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/icons/withdraw.svg b/src/icons/withdraw.svg new file mode 100644 index 0000000..9e99e29 --- /dev/null +++ b/src/icons/withdraw.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/views/menus/AccountMenu.tsx b/src/views/menus/AccountMenu.tsx index 10e7451..2755387 100644 --- a/src/views/menus/AccountMenu.tsx +++ b/src/views/menus/AccountMenu.tsx @@ -224,29 +224,23 @@ const AssetActions = memo( }) => ( {[ - // TODO(@rosepuppy): Add withdraw action for USDC - { - dialogType: DialogTypes.Receive, - dialogProps: { selectedAsset: asset }, - iconName: IconName.Qr, + withOnboarding && { + dialogType: DialogTypes.Withdraw, + iconName: IconName.Withdraw, + }, + withOnboarding && { + dialogType: DialogTypes.Deposit, + iconName: IconName.Deposit, }, { dialogType: DialogTypes.Transfer, dialogProps: { selectedAsset: asset }, iconName: IconName.Send, }, - withOnboarding && { - dialogType: DialogTypes.Withdraw, - iconName: IconName.Upload, - }, - withOnboarding && { - dialogType: DialogTypes.Deposit, - iconName: IconName.Download, - }, ] .filter(isTruthy) .map(({ iconName, dialogType, dialogProps }) => ( -