Compare commits

...
Author SHA1 Message Date
Bill He 650b16aeae Remove Courier 2023-11-02 13:36:52 -07:00
Bill 9815437a80 Account dropdown onboarding entrypoints (#113)
* Account dropdown onboarding entrypoints

* Update based on latest designs
2023-10-31 14:29:36 -07:00
aleka 890a4b2c0e Padding fixes, markets data null fix, update .env.example (#112)
* update .env.example for token migration

* bump icon size in icon button

* add padding in rewards / fees page, panel changes

* fix markets data crashing

* fix market details overflow on tablet

* fix market filters

* prevent fees table overflow

* remove notifications close button on mobile

* fix nested button console warning

* update ToggleGroup value change logic

* panel hover impact button hover

* update dropdown icon in header
2023-10-31 17:11:46 -04:00
Bill 8d3cc76d14 Configurable URLs (#107)
* Configurable URLs

* add learnmore to tooltip

* Learnmore -> LearnMore
2023-10-31 11:02:45 -07:00
39 changed files with 623 additions and 333 deletions
+2 -2
View File
@@ -6,5 +6,5 @@ VITE_PK_ENCRYPTION_KEY=
VITE_WALLETCONNECT2_PROJECT_ID= VITE_WALLETCONNECT2_PROJECT_ID=
VITE_V3_TOKEN_ADDRESS= VITE_V3_TOKEN_ADDRESS=0x6d5bb505a4f85c10b122ccc36e30f57e2b86a291
VITE_TOKEN_MIGRATION_URI= VITE_TOKEN_MIGRATION_URI=https://bridge.dydx.trade/
+151 -16
View File
@@ -71,7 +71,19 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -130,7 +142,19 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -189,7 +213,19 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -248,7 +284,19 @@
"tos": "https://dydx.exchange/v4-terms", "tos": "https://dydx.exchange/v4-terms",
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -312,7 +360,16 @@
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog", "blogs": "https://www.dydx.foundation/blog",
"help": "https://help.dydx.exchange" "help": "https://help.dydx.exchange",
"foundation": "https://www.dydx.foundation",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -376,7 +433,16 @@
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog", "blogs": "https://www.dydx.foundation/blog",
"help": "https://help.dydx.exchange" "help": "https://help.dydx.exchange",
"foundation": "https://www.dydx.foundation",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -443,7 +509,17 @@
"documentation": "https://docs.dydx.exchange/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -507,7 +583,17 @@
"documentation": "https://docs.dydx.exchange/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -571,7 +657,17 @@
"documentation": "https://docs.dydx.exchange/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -635,7 +731,17 @@
"documentation": "https://docs.dydx.exchange/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -699,7 +805,17 @@
"documentation": "https://docs.dydx.exchange/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnMore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnMore": "https://help.dydx.exchange",
"stakingLearnMore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnMore": "https://help.dydx.exchange",
"walletLearnMore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -824,10 +940,20 @@
"privacy": "https://dydx.exchange/privacy", "privacy": "https://dydx.exchange/privacy",
"statusPage": "https://status.v4testnet.dydx.exchange/", "statusPage": "https://status.v4testnet.dydx.exchange/",
"mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}", "mintscan": "https://testnet.mintscan.io/dydx-testnet/txs/{tx_hash}",
"documentation": "https://v4-teacher.vercel.app/", "documentation": "https://docs.dydx.exchange/",
"community": "https://discord.com/invite/dydx", "community": "https://discord.com/invite/dydx",
"feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform", "feedback": "https://docs.google.com/forms/d/e/1FAIpQLSezLsWCKvAYDEb7L-2O4wOON1T56xxro9A2Azvl6IxXHP_15Q/viewform",
"blogs": "https://www.dydx.foundation/blog" "blogs": "https://www.dydx.foundation/blog",
"foundation": "https://www.dydx.foundation",
"help": "https://help.dydx.exchange/",
"initialMarginFractionLearnmore": "https://help.dydx.exchange/articles/5232637-maximum-position-sizes",
"reduceOnlyLearnmore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"mintscanBase": "https://testnet.mintscan.io/dydx-testnet",
"governanceLearnmore": "https://help.dydx.exchange",
"stakingLearnmore": "https://help.dydx.exchange",
"keplrDashboard": "https://testnet.keplr.app/",
"accountExportLearnmore": "https://help.dydx.exchange",
"walletLearnmore": "https://www.dydx.academy/video/defi-wallet"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
@@ -888,11 +1014,20 @@
"tos": "[HTTP link to TOS]", "tos": "[HTTP link to TOS]",
"privacy": "[HTTP link to Privacy Policy]", "privacy": "[HTTP link to Privacy Policy]",
"mintscan": "[HTTP link to Mintscan, with {tx_hash} placeholder]", "mintscan": "[HTTP link to Mintscan, with {tx_hash} placeholder]",
"documentation": "[HTTP link to documentation, can be null]", "mintscanBase": "[HTTP link to TOS mintsacn base url]",
"community": "[HTTP link to community, can be null]",
"feedback": "[HTTP link to feedback form, can be null]", "feedback": "[HTTP link to feedback form, can be null]",
"blogs": "[HTTP link to blogs, can be null]", "blogs": "[HTTP link to blogs, can be null]",
"help": "[HTTP link to help page, can be null]" "foundation": "[HTTP link to foundation, can be null]",
"initialMarginFractionLearnMore": "[HTTP link to initial margin fraction learn more, can be null]",
"reduceOnlyLearnMore": "https://help.dydx.exchange/articles/6345793-reduce-only-orders",
"documentation": "[HTTP link to documentation, can be null]",
"community": "[HTTP link to community, can be null]",
"help": "[HTTP link to help page, can be null]",
"governanceLearnMore": "[HTTP link to governance learn more, can be null]",
"stakingLearnMore": "[HTTP link to staking learn more, can be null]",
"keplrDashboard": "[HTTP link to keplr dashboard, can be null]",
"accountExportLearnMore": "[HTTP link to account export learn more, can be null]",
"walletLearnMore": "[HTTP link to wallet learn more, can be null]"
}, },
"wallets": { "wallets": {
"walletconnect": { "walletconnect": {
+1
View File
@@ -225,6 +225,7 @@ Styled.CollapsibleContent = styled(CollapsibleContent)`
`; `;
Styled.IconButton = styled(IconButton)` Styled.IconButton = styled(IconButton)`
--button-icon-size: 1em;
${Styled.CollapsibleRoot}[data-state='closed'] & { ${Styled.CollapsibleRoot}[data-state='closed'] & {
rotate: -0.5turn; rotate: -0.5turn;
} }
+3
View File
@@ -34,6 +34,7 @@ type PickDialogProps = Pick<
| 'slotHeaderInner' | 'slotHeaderInner'
| 'slotTrigger' | 'slotTrigger'
| 'slotFooter' | 'slotFooter'
| 'preventClose'
>; >;
export const ComboboxDialogMenu = < export const ComboboxDialogMenu = <
@@ -57,6 +58,7 @@ export const ComboboxDialogMenu = <
children, children,
placement = DialogPlacement.Default, placement = DialogPlacement.Default,
preventClose,
className, className,
}: ElementProps<MenuItemValue, MenuGroupValue> & }: ElementProps<MenuItemValue, MenuGroupValue> &
PickComboxMenuProps<MenuItemValue, MenuGroupValue> & PickComboxMenuProps<MenuItemValue, MenuGroupValue> &
@@ -72,6 +74,7 @@ export const ComboboxDialogMenu = <
slotTrigger={slotTrigger} slotTrigger={slotTrigger}
slotFooter={slotFooter} slotFooter={slotFooter}
placement={placement} placement={placement}
preventClose={preventClose}
className={className} className={className}
> >
<Styled.ComboboxMenu <Styled.ComboboxMenu
+3 -1
View File
@@ -33,9 +33,11 @@ export const DropdownHeaderMenu = <MenuItemValue extends string>({
return ( return (
<Root> <Root>
<Styled.Trigger className={className}> <Styled.Trigger className={className} asChild>
<div>
{children} {children}
<Styled.DropdownIconButton iconName={IconName.Caret} isToggle /> <Styled.DropdownIconButton iconName={IconName.Caret} isToggle />
</div>
</Styled.Trigger> </Styled.Trigger>
<Portal> <Portal>
<Styled.Content <Styled.Content
+7 -1
View File
@@ -24,9 +24,10 @@ import {
CommentIcon, CommentIcon,
CopyIcon, CopyIcon,
CubeIcon, CubeIcon,
DepositIcon,
DepthChartIcon,
DiscordIcon, DiscordIcon,
EtherscanIcon, EtherscanIcon,
DepthChartIcon,
ExportKeysIcon, ExportKeysIcon,
FeedbackIcon, FeedbackIcon,
FileIcon, FileIcon,
@@ -69,6 +70,7 @@ import {
WarningIcon, WarningIcon,
WebsiteIcon, WebsiteIcon,
WhitepaperIcon, WhitepaperIcon,
WithdrawIcon,
} from '@/icons'; } from '@/icons';
export enum IconName { export enum IconName {
@@ -93,6 +95,7 @@ export enum IconName {
Comment = 'Comment', Comment = 'Comment',
Copy = 'Copy', Copy = 'Copy',
Cube = 'Cube', Cube = 'Cube',
Deposit = 'Deposit',
DepthChart = 'DepthChart', DepthChart = 'DepthChart',
Discord = 'Discord', Discord = 'Discord',
Etherscan = 'Etherscan', Etherscan = 'Etherscan',
@@ -139,6 +142,7 @@ export enum IconName {
Warning = 'Warning', Warning = 'Warning',
Website = 'Website', Website = 'Website',
Whitepaper = 'Whitepaper', Whitepaper = 'Whitepaper',
Withdraw = 'Withdraw',
} }
const icons = { const icons = {
@@ -163,6 +167,7 @@ const icons = {
[IconName.Comment]: CommentIcon, [IconName.Comment]: CommentIcon,
[IconName.Copy]: CopyIcon, [IconName.Copy]: CopyIcon,
[IconName.Cube]: CubeIcon, [IconName.Cube]: CubeIcon,
[IconName.Deposit]: DepositIcon,
[IconName.DepthChart]: DepthChartIcon, [IconName.DepthChart]: DepthChartIcon,
[IconName.Discord]: DiscordIcon, [IconName.Discord]: DiscordIcon,
[IconName.Etherscan]: EtherscanIcon, [IconName.Etherscan]: EtherscanIcon,
@@ -208,6 +213,7 @@ const icons = {
[IconName.Warning]: WarningIcon, [IconName.Warning]: WarningIcon,
[IconName.Website]: WebsiteIcon, [IconName.Website]: WebsiteIcon,
[IconName.Whitepaper]: WhitepaperIcon, [IconName.Whitepaper]: WhitepaperIcon,
[IconName.Withdraw]: WithdrawIcon,
} as Record<IconName, ElementType>; } as Record<IconName, ElementType>;
type ElementProps = { type ElementProps = {
+1
View File
@@ -67,6 +67,7 @@ const Styled: Record<string, AnyStyledComponent> = {};
const buttonMixin = css` const buttonMixin = css`
// Params // Params
--button-icon-size: 1.125em; --button-icon-size: 1.125em;
--button-padding: 0;
// Rules // Rules
> * { > * {
+2 -2
View File
@@ -71,7 +71,7 @@ const NavItem = forwardRef(
)} )}
</span> </span>
{slotAfter} {slotAfter}
{subitems?.length && <Styled.Icon iconName={IconName.Caret} />} {subitems?.length && <Styled.Icon iconName={IconName.Triangle} />}
</> </>
); );
@@ -525,7 +525,7 @@ Styled.NavItem = styled(NavItem)<{ orientation: 'horizontal' | 'vertical' }>`
`; `;
Styled.Icon = styled(Icon)` Styled.Icon = styled(Icon)`
height: 0.75em; font-size: 0.375em;
transition: rotate 0.3s var(--ease-out-expo); transition: rotate 0.3s var(--ease-out-expo);
${Styled.List}[data-orientation="menu"] & { ${Styled.List}[data-orientation="menu"] & {
+23 -5
View File
@@ -31,7 +31,7 @@ export const Panel = ({
hasSeparator, hasSeparator,
className, className,
}: PanelProps & PanelStyleProps) => ( }: PanelProps & PanelStyleProps) => (
<Styled.Panel onClick={onClick}> <Styled.Panel onClick={onClick} className={className}>
<Styled.Left> <Styled.Left>
{href ? ( {href ? (
<Link to={href}> <Link to={href}>
@@ -53,7 +53,7 @@ export const Panel = ({
</Styled.Header> </Styled.Header>
) )
)} )}
<Styled.Content className={className}>{children}</Styled.Content> <Styled.Content>{children}</Styled.Content>
</Styled.Left> </Styled.Left>
{slotRight} {slotRight}
</Styled.Panel> </Styled.Panel>
@@ -61,11 +61,29 @@ export const Panel = ({
const Styled: Record<string, AnyStyledComponent> = {}; const Styled: Record<string, AnyStyledComponent> = {};
Styled.Panel = styled.section` Styled.Panel = styled.section<{ onClick?: () => void }>`
--panel-paddingY: 1rem;
--panel-paddingX: 1rem;
--panel-content-paddingY: var(--panel-paddingY);
--panel-content-paddingX: var(--panel-paddingX);
${layoutMixins.row} ${layoutMixins.row}
background-color: var(--color-layer-3); background-color: var(--color-layer-3);
border-radius: 0.875rem; border-radius: 0.875rem;
${({ onClick }) =>
onClick &&
css`
cursor: pointer;
&:hover {
button:not(:disabled) {
color: var(--button-hover-textColor);
filter: var(--button-hover-filter);
}
}
`}
`; `;
Styled.Left = styled.div` Styled.Left = styled.div`
@@ -75,7 +93,7 @@ Styled.Left = styled.div`
Styled.Header = styled.header<{ hasSeparator?: boolean }>` Styled.Header = styled.header<{ hasSeparator?: boolean }>`
${layoutMixins.spacedRow} ${layoutMixins.spacedRow}
padding: 1rem 1rem; padding: var(--panel-paddingY) var(--panel-paddingX);
${({ hasSeparator }) => ${({ hasSeparator }) =>
hasSeparator && hasSeparator &&
@@ -94,5 +112,5 @@ Styled.Content = styled.div`
${layoutMixins.scrollArea} ${layoutMixins.scrollArea}
${layoutMixins.stickyArea0} ${layoutMixins.stickyArea0}
--stickyArea0-background: transparent; --stickyArea0-background: transparent;
padding: 1rem 1rem; padding: var(--panel-content-paddingY) var(--panel-content-paddingX);
`; `;
+15 -4
View File
@@ -7,13 +7,15 @@ import { ButtonShape, ButtonSize } from '@/constants/buttons';
import { useBreakpoints } from '@/hooks'; import { useBreakpoints } from '@/hooks';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { type BaseButtonProps } from '@/components/BaseButton'; import { type BaseButtonProps } from '@/components/BaseButton';
import { ToggleButton } from '@/components/ToggleButton'; import { ToggleButton } from '@/components/ToggleButton';
type ElementProps<MenuItemValue extends string> = { type ElementProps<MenuItemValue extends string> = {
items: MenuItem<MenuItemValue>[]; items: MenuItem<MenuItemValue>[];
value: MenuItemValue; value: MenuItemValue;
onValueChange: (value: MenuItemValue) => void; onValueChange: (value: any) => void;
onInteraction?: () => void;
ensureSelected?: boolean;
}; };
type StyleProps = { type StyleProps = {
@@ -25,10 +27,14 @@ export const ToggleGroup = forwardRef(
{ {
items, items,
value, value,
ensureSelected = true,
onValueChange, onValueChange,
onInteraction,
className, className,
size, size,
shape = ButtonShape.Pill, shape = ButtonShape.Pill,
...buttonProps ...buttonProps
}: ElementProps<MenuItemValue> & StyleProps & BaseButtonProps, }: ElementProps<MenuItemValue> & StyleProps & BaseButtonProps,
ref: Ref<HTMLDivElement> ref: Ref<HTMLDivElement>
@@ -40,12 +46,17 @@ export const ToggleGroup = forwardRef(
ref={ref} ref={ref}
type="single" type="single"
value={value} value={value}
onValueChange={onValueChange} onValueChange={(newValue: MenuItemValue) => {
if ((ensureSelected && newValue) || !ensureSelected) {
onValueChange(newValue);
}
onInteraction?.();
}}
className={className} className={className}
loop loop
> >
{items.map((item) => ( {items.map((item) => (
<Item key={item.value} value={item.value} aria-label={item.label} asChild> <Item key={item.value} value={item.value} asChild>
<ToggleButton <ToggleButton
size={size ? size : isTablet ? ButtonSize.Small : ButtonSize.XSmall} size={size ? size : isTablet ? ButtonSize.Small : ButtonSize.XSmall}
shape={shape} shape={shape}
+19 -2
View File
@@ -2,11 +2,13 @@ import type { ReactNode } from 'react';
import styled, { AnyStyledComponent } from 'styled-components'; import styled, { AnyStyledComponent } from 'styled-components';
import { Content, Portal, Provider, Root, Trigger, Arrow } from '@radix-ui/react-tooltip'; import { Content, Portal, Provider, Root, Trigger, Arrow } from '@radix-ui/react-tooltip';
import { STRING_KEYS } from '@/constants/localization';
import { tooltipStrings } from '@/constants/tooltips'; import { tooltipStrings } from '@/constants/tooltips';
import { useStringGetter } from '@/hooks'; import { useStringGetter, useURLConfigs } from '@/hooks';
import { Icon, IconName } from '@/components/Icon'; import { Icon, IconName } from '@/components/Icon';
import { Link } from '@/components/Link';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { popoverMixins } from '@/styles/popoverMixins'; import { popoverMixins } from '@/styles/popoverMixins';
@@ -38,20 +40,24 @@ export const WithTooltip = ({
slotTooltip, slotTooltip,
}: ElementProps & StyleProps) => { }: ElementProps & StyleProps) => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const urlConfigs = useURLConfigs();
const getTooltipStrings = tooltip && tooltipStrings[tooltip]; const getTooltipStrings = tooltip && tooltipStrings[tooltip];
if (!getTooltipStrings && !tooltipString && !slotTooltip) return <>{children}</>; if (!getTooltipStrings && !tooltipString && !slotTooltip) return <>{children}</>;
let tooltipTitle; let tooltipTitle;
let tooltipBody; let tooltipBody;
let tooltipLearnMore;
if (getTooltipStrings) { if (getTooltipStrings) {
const { title, body } = getTooltipStrings({ const { title, body, learnMoreLink } = getTooltipStrings({
stringGetter, stringGetter,
stringParams, stringParams,
urlConfigs,
}); });
tooltipTitle = title; tooltipTitle = title;
tooltipBody = body; tooltipBody = body;
tooltipLearnMore = learnMoreLink;
} else { } else {
tooltipBody = tooltipString; tooltipBody = tooltipString;
} }
@@ -72,6 +78,13 @@ export const WithTooltip = ({
<dl> <dl>
{tooltipTitle && <dt>{tooltipTitle}</dt>} {tooltipTitle && <dt>{tooltipTitle}</dt>}
{tooltipBody && <dd>{tooltipBody}</dd>} {tooltipBody && <dd>{tooltipBody}</dd>}
{tooltipLearnMore && (
<dd>
<Styled.LearnMore href={tooltipLearnMore}>
{stringGetter({ key: STRING_KEYS.LEARN_MORE })}
</Styled.LearnMore>
</dd>
)}
<Styled.Arrow /> <Styled.Arrow />
</dl> </dl>
)} )}
@@ -142,3 +155,7 @@ Styled.Arrow = styled(Arrow)`
Styled.Icon = styled(Icon)` Styled.Icon = styled(Icon)`
color: var(--color-text-0); color: var(--color-text-0);
`; `;
Styled.LearnMore = styled(Link)`
--link-color: var(--color-accent);
`;
+4
View File
@@ -8,6 +8,8 @@ import {
WARNINGS_STRING_KEYS, WARNINGS_STRING_KEYS,
} from '@dydxprotocol/v4-localization'; } from '@dydxprotocol/v4-localization';
import { type LinksConfigs } from '@/hooks/useURLConfigs';
export { TOOLTIP_STRING_KEYS } from '@dydxprotocol/v4-localization'; export { TOOLTIP_STRING_KEYS } from '@dydxprotocol/v4-localization';
export enum SupportedLocales { export enum SupportedLocales {
@@ -79,9 +81,11 @@ export type TooltipStrings = {
[key: string]: ({ [key: string]: ({
stringGetter, stringGetter,
stringParams, stringParams,
urlConfigs,
}: { }: {
stringGetter: StringGetterFunction; stringGetter: StringGetterFunction;
stringParams?: any; stringParams?: any;
urlConfigs?: LinksConfigs;
}) => { }) => {
title: string; title: string;
body: string; body: string;
-4
View File
@@ -37,7 +37,3 @@ export const HISTORY_ROUTE = `${AppRoute.Portfolio}/${PortfolioRoute.History}/:s
export const DEFAULT_TRADE_ROUTE = `${AppRoute.Trade}/${DEFAULT_MARKETID}`; export const DEFAULT_TRADE_ROUTE = `${AppRoute.Trade}/${DEFAULT_MARKETID}`;
export const SETTINGS_ROUTE = `${AppRoute.Settings}/*`; export const SETTINGS_ROUTE = `${AppRoute.Settings}/*`;
export const DEFAULT_DOCUMENT_TITLE = 'dYdX'; export const DEFAULT_DOCUMENT_TITLE = 'dYdX';
export enum ExternalLink {
Foundation = 'https://dydx.foundation',
}
+4 -4
View File
@@ -57,10 +57,10 @@ export const tradeTooltips: TooltipStrings = {
title: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_TITLE }),
body: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_BODY }), body: stringGetter({ key: TOOLTIP_STRING_KEYS.INDEX_PRICE_BODY }),
}), }),
'initial-margin-fraction': ({ stringGetter }) => ({ 'initial-margin-fraction': ({ stringGetter, urlConfigs }) => ({
title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_TITLE }),
body: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_BODY }), body: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_MARGIN_FRACTION_BODY }),
learnMoreLink: 'https://help.dydx.exchange/articles/5232637-maximum-position-sizes', learnMoreLink: urlConfigs?.initialMarginFractionLearnMore,
}), }),
'initial-stop': ({ stringGetter }) => ({ 'initial-stop': ({ stringGetter }) => ({
title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_STOP_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.INITIAL_STOP_TITLE }),
@@ -146,10 +146,10 @@ export const tradeTooltips: TooltipStrings = {
title: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_TITLE }),
body: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_BODY }), body: stringGetter({ key: TOOLTIP_STRING_KEYS.REALIZED_PNL_BODY }),
}), }),
'reduce-only': ({ stringGetter }) => ({ 'reduce-only': ({ stringGetter, urlConfigs }) => ({
title: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_TITLE }), title: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_TITLE }),
body: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_BODY }), body: stringGetter({ key: TOOLTIP_STRING_KEYS.REDUCE_ONLY_BODY }),
learnMoreLink: 'https://help.dydx.exchange/articles/6345793-reduce-only-orders', learnMoreLink: urlConfigs?.reduceOnlyLearnMore,
}), }),
spread: () => ({ spread: () => ({
title: 'Spread', title: 'Spread',
+2
View File
@@ -22,6 +22,7 @@ import { useShouldShowFooter } from './useShouldShowFooter';
import { useSelectedNetwork } from './useSelectedNetwork'; import { useSelectedNetwork } from './useSelectedNetwork';
import { useStringGetter } from './useStringGetter'; import { useStringGetter } from './useStringGetter';
import { useSubaccount } from './useSubaccount'; import { useSubaccount } from './useSubaccount';
import { useURLConfigs } from './useURLConfigs';
export { export {
useApiState, useApiState,
@@ -48,4 +49,5 @@ export {
useSelectedNetwork, useSelectedNetwork,
useStringGetter, useStringGetter,
useSubaccount, useSubaccount,
useURLConfigs,
}; };
+12 -8
View File
@@ -6,8 +6,10 @@ import { MarketFilters, MARKET_FILTER_LABELS, type MarketData } from '@/constant
import { getAssets } from '@/state/assetsSelectors'; import { getAssets } from '@/state/assetsSelectors';
import { getPerpetualMarkets } from '@/state/perpetualsSelectors'; import { getPerpetualMarkets } from '@/state/perpetualsSelectors';
import { isTruthy } from '@/lib/isTruthy';
const filterFunctions = { const filterFunctions = {
[MarketFilters.ALL]: (market: MarketData) => true, [MarketFilters.ALL]: () => true,
[MarketFilters.LAYER_1]: (market: MarketData) => { [MarketFilters.LAYER_1]: (market: MarketData) => {
return market.asset.tags?.toArray().includes('Layer 1'); return market.asset.tags?.toArray().includes('Layer 1');
}, },
@@ -28,13 +30,15 @@ export const useMarketsData = (
const allAssets = useSelector(getAssets, shallowEqual) || {}; const allAssets = useSelector(getAssets, shallowEqual) || {};
const markets = useMemo(() => { const markets = useMemo(() => {
return Object.values(allPerpetualMarkets).map((marketData) => ({ return Object.values(allPerpetualMarkets)
asset: allAssets[marketData.assetId], .filter(isTruthy)
tickSizeDecimals: marketData.configs?.tickSizeDecimals, .map((marketData) => ({
...marketData, asset: allAssets[marketData.assetId],
...marketData.perpetual, tickSizeDecimals: marketData.configs?.tickSizeDecimals,
...marketData.configs, ...marketData,
})) as MarketData[]; ...marketData.perpetual,
...marketData.configs,
})) as MarketData[];
}, [allPerpetualMarkets, allAssets]); }, [allPerpetualMarkets, allAssets]);
const filteredMarkets = useMemo(() => { const filteredMarkets = useMemo(() => {
+50
View File
@@ -0,0 +1,50 @@
import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
import { useSelectedNetwork } from '@/hooks';
const FALLBACK_URL = 'https://help.dydx.exchange/';
export interface LinksConfigs {
tos: string,
privacy: string,
mintscan: string,
mintscanBase: string,
feedback?: string,
help?: string,
blogs?: string,
foundation?: string,
initialMarginFractionLearnMore?: string,
reduceOnlyLearnMore?: string,
documentation?: string,
community?: string,
governanceLearnMore?: string,
stakingLearnMore?: string,
keplrDashboard?: string,
accountExportLearnMore?: string,
walletLearnMore?: string
}
export const useURLConfigs = (): LinksConfigs => {
const { selectedNetwork } = useSelectedNetwork();
const linksConfigs = ENVIRONMENT_CONFIG_MAP[selectedNetwork].links as LinksConfigs;
return {
tos: linksConfigs.tos,
privacy: linksConfigs.privacy,
mintscan: linksConfigs.mintscan,
mintscanBase: linksConfigs.mintscanBase,
feedback: linksConfigs.feedback || FALLBACK_URL,
help: linksConfigs.help || FALLBACK_URL,
blogs: linksConfigs.blogs || FALLBACK_URL,
foundation: linksConfigs.foundation || FALLBACK_URL,
initialMarginFractionLearnMore: linksConfigs.initialMarginFractionLearnMore || FALLBACK_URL,
reduceOnlyLearnMore: linksConfigs.reduceOnlyLearnMore || FALLBACK_URL,
documentation: linksConfigs.documentation || FALLBACK_URL,
community: linksConfigs.community || FALLBACK_URL,
governanceLearnMore: linksConfigs.governanceLearnMore || FALLBACK_URL,
stakingLearnMore: linksConfigs.stakingLearnMore || FALLBACK_URL,
keplrDashboard: linksConfigs.keplrDashboard || FALLBACK_URL,
accountExportLearnMore: linksConfigs.accountExportLearnMore || FALLBACK_URL,
walletLearnMore: linksConfigs.walletLearnMore || FALLBACK_URL,
};
};
+11
View File
@@ -0,0 +1,11 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
<g clip-path="url(#clip0_18204_36775)">
<path d="M13.2426 6.25736C14.0817 7.09647 14.6531 8.16557 14.8846 9.32946C15.1162 10.4933 14.9973 11.6997 14.5432 12.7961C14.0891 13.8925 13.32 14.8295 12.3334 15.4888C11.3467 16.1481 10.1866 16.5 8.99993 16.5C7.81324 16.5 6.6532 16.1481 5.66651 15.4888C4.67981 14.8295 3.91078 13.8925 3.45665 12.7961C3.00253 11.6997 2.88371 10.4933 3.11522 9.32946C3.34673 8.16557 3.91817 7.09647 4.75729 6.25736" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round"/>
<path d="M11.25 9L9 11.25M9 11.25L6.75 9M9 11.25V1.6875" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round" stroke-linejoin="round"/>
</g>
<defs>
<clipPath id="clip0_18204_36775">
<rect width="18" height="18" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 886 B

+2
View File
@@ -19,6 +19,7 @@ export { default as CoinsIcon } from './coins.svg';
export { default as CommentIcon } from './comment.svg'; export { default as CommentIcon } from './comment.svg';
export { default as CopyIcon } from './copy.svg'; export { default as CopyIcon } from './copy.svg';
export { default as CubeIcon } from './cube.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 DepthChartIcon } from './depth-chart.svg';
export { default as DiscordIcon } from './discord.svg'; export { default as DiscordIcon } from './discord.svg';
export { default as ExportKeysIcon } from './export-keys.svg'; export { default as ExportKeysIcon } from './export-keys.svg';
@@ -59,6 +60,7 @@ export { default as TransferIcon } from './transfer.svg';
export { default as TriangleIcon } from './triangle.svg'; export { default as TriangleIcon } from './triangle.svg';
export { default as TryAgainIcon } from './try-again.svg'; export { default as TryAgainIcon } from './try-again.svg';
export { default as WarningIcon } from './warning.svg'; export { default as WarningIcon } from './warning.svg';
export { default as WithdrawIcon } from './withdraw.svg';
// Wallets // Wallets
export { default as BitkeepIcon } from './wallets/bitkeep.svg'; export { default as BitkeepIcon } from './wallets/bitkeep.svg';
+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
<path d="M13.2426 6.2573C14.0817 7.09641 14.6531 8.16551 14.8846 9.3294C15.1162 10.4933 14.9973 11.6997 14.5432 12.796C14.0891 13.8924 13.32 14.8295 12.3334 15.4888C11.3467 16.148 10.1866 16.4999 8.99993 16.4999C7.81324 16.4999 6.6532 16.148 5.66651 15.4888C4.67981 14.8295 3.91078 13.8924 3.45665 12.796C3.00253 11.6997 2.88371 10.4933 3.11522 9.3294C3.34673 8.16551 3.91817 7.09641 4.75729 6.2573" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round"/>
<path d="M11.25 2.9375L9 0.6875M9 0.6875L6.75 2.9375M9 0.6875V10.25" stroke="#C8C7D8" stroke-width="1.35" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 723 B

+5 -4
View File
@@ -8,7 +8,7 @@ import { STRING_KEYS } from '@/constants/localization';
import { AppRoute } from '@/constants/routes'; import { AppRoute } from '@/constants/routes';
import { LogoShortIcon, BellStrokeIcon } from '@/icons'; import { LogoShortIcon, BellStrokeIcon } from '@/icons';
import { useTokenConfigs, useStringGetter } from '@/hooks'; import { useTokenConfigs, useStringGetter, useURLConfigs } from '@/hooks';
import { Icon, IconName } from '@/components/Icon'; import { Icon, IconName } from '@/components/Icon';
import { IconButton } from '@/components/IconButton'; import { IconButton } from '@/components/IconButton';
@@ -28,6 +28,7 @@ import breakpoints from '@/styles/breakpoints';
export const HeaderDesktop = () => { export const HeaderDesktop = () => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { documentation, community, mintscanBase } = useURLConfigs();
const dispatch = useDispatch(); const dispatch = useDispatch();
const { chainTokenLabel } = useTokenConfigs(); const { chainTokenLabel } = useTokenConfigs();
@@ -63,19 +64,19 @@ export const HeaderDesktop = () => {
value: 'DOCUMENTATION', value: 'DOCUMENTATION',
slotBefore: <Icon iconName={IconName.Terminal} />, slotBefore: <Icon iconName={IconName.Terminal} />,
label: stringGetter({ key: STRING_KEYS.DOCUMENTATION }), label: stringGetter({ key: STRING_KEYS.DOCUMENTATION }),
href: 'https://docs.dydx.exchange/', href: documentation,
}, },
{ {
value: 'MINTSCAN', value: 'MINTSCAN',
slotBefore: <Icon iconName={IconName.Mintscan} />, slotBefore: <Icon iconName={IconName.Mintscan} />,
label: stringGetter({ key: STRING_KEYS.MINTSCAN }), label: stringGetter({ key: STRING_KEYS.MINTSCAN }),
href: 'https://testnet.mintscan.io/dydx-testnet', href: mintscanBase,
}, },
{ {
value: 'COMMUNITY', value: 'COMMUNITY',
slotBefore: <Icon iconName={IconName.Discord} />, slotBefore: <Icon iconName={IconName.Discord} />,
label: stringGetter({ key: STRING_KEYS.COMMUNITY }), label: stringGetter({ key: STRING_KEYS.COMMUNITY }),
href: 'https://discord.gg/dydx', href: community,
}, },
{ {
value: 'TERMS_OF_USE', value: 'TERMS_OF_USE',
+10 -6
View File
@@ -180,7 +180,7 @@ Styled.MobileProfileLayout = styled.div`
${layoutMixins.contentContainerPage} ${layoutMixins.contentContainerPage}
gap: 1rem; gap: 1rem;
padding: 1rem; padding: 1.25rem;
`; `;
Styled.Header = styled.header` Styled.Header = styled.header`
@@ -278,13 +278,17 @@ Styled.RewardsPanel = styled(Panel)`
`; `;
Styled.TablePanel = styled(Panel)` Styled.TablePanel = styled(Panel)`
max-width: calc(100vw - 2rem); --panel-content-paddingY: 0;
max-height: 10rem; --panel-content-paddingX: 0;
margin-top: 0.5rem;
padding: 0; > div > div {
border-radius: 0.875rem; margin-top: 0.5rem;
--scrollArea-height: 10rem;
border-radius: 0.875rem;
}
table { table {
max-height: 10rem;
--tableCell-padding: 0.25rem 1rem; --tableCell-padding: 0.25rem 1rem;
--tableRow-backgroundColor: var(--color-layer-3); --tableRow-backgroundColor: var(--color-layer-3);
background-color: var(--color-layer-3); background-color: var(--color-layer-3);
+131 -106
View File
@@ -1,12 +1,12 @@
import { useCallback, useEffect, useMemo, useState } from 'react'; import { useCallback, useMemo } from 'react';
import { Nullable } from '@dydxprotocol/v4-abacus'; import { Nullable } from '@dydxprotocol/v4-abacus';
import styled, { AnyStyledComponent } from 'styled-components'; import styled, { AnyStyledComponent } from 'styled-components';
import { shallowEqual, useSelector } from 'react-redux'; import { shallowEqual, useSelector } from 'react-redux';
import { FeeTier } from '@/constants/abacus'; import { FeeTier } from '@/constants/abacus';
import { FEE_DECIMALS, QUANTUM_MULTIPLIER } from '@/constants/numbers'; import { FEE_DECIMALS } from '@/constants/numbers';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { useAccounts, useBreakpoints, useStringGetter } from '@/hooks'; import { useBreakpoints, useStringGetter } from '@/hooks';
import { breakpoints } from '@/styles'; import { breakpoints } from '@/styles';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { tableMixins } from '@/styles/tableMixins'; import { tableMixins } from '@/styles/tableMixins';
@@ -29,9 +29,8 @@ const EQUALITY_SYMBOL_MAP = {
}; };
export const Fees = () => { export const Fees = () => {
const { dydxAddress } = useAccounts();
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { isNotTablet } = useBreakpoints(); const { isTablet, isNotTablet } = useBreakpoints();
const userFeeTier = useSelector(getUserFeeTier, shallowEqual); const userFeeTier = useSelector(getUserFeeTier, shallowEqual);
const userStats = useSelector(getUserStats, shallowEqual); const userStats = useSelector(getUserStats, shallowEqual);
const feeTiers = useSelector(getFeeTiers, shallowEqual); const feeTiers = useSelector(getFeeTiers, shallowEqual);
@@ -56,28 +55,28 @@ export const Fees = () => {
<Styled.AdditionalConditions> <Styled.AdditionalConditions>
{!isAdditional && !totalShare && !makerShare && <Output type={OutputType.Text} />} {!isAdditional && !totalShare && !makerShare && <Output type={OutputType.Text} />}
{!!totalShare && ( {!!totalShare && (
<Styled.TextRow> <Styled.AdditionalConditionsText>
{isAdditional && <span>{stringGetter({ key: STRING_KEYS.AND })}</span>} {isAdditional && stringGetter({ key: STRING_KEYS.AND })}{' '}
<span>{stringGetter({ key: STRING_KEYS.EXCHANGE_MARKET_SHARE })}</span> {stringGetter({ key: STRING_KEYS.EXCHANGE_MARKET_SHARE })}{' '}
<Styled.Highlighted>{'>'}</Styled.Highlighted> <Styled.Highlighted>{'>'}</Styled.Highlighted>{' '}
<Styled.HighlightOutput <Styled.HighlightOutput
type={OutputType.Percent} type={OutputType.Percent}
value={totalShare} value={totalShare}
fractionDigits={0} fractionDigits={0}
/> />
</Styled.TextRow> </Styled.AdditionalConditionsText>
)} )}
{!!makerShare && ( {!!makerShare && (
<Styled.TextRow> <Styled.AdditionalConditionsText>
{isAdditional && <span>{stringGetter({ key: STRING_KEYS.AND })}</span>} {isAdditional && stringGetter({ key: STRING_KEYS.AND })}{' '}
<span>{stringGetter({ key: STRING_KEYS.MAKER_MARKET_SHARE })}</span> {stringGetter({ key: STRING_KEYS.MAKER_MARKET_SHARE })}{' '}
<Styled.Highlighted>{'>'}</Styled.Highlighted> <Styled.Highlighted>{'>'}</Styled.Highlighted>{' '}
<Styled.HighlightOutput <Styled.HighlightOutput
type={OutputType.Percent} type={OutputType.Percent}
value={makerShare} value={makerShare}
fractionDigits={0} fractionDigits={0}
/> />
</Styled.TextRow> </Styled.AdditionalConditionsText>
)} )}
</Styled.AdditionalConditions> </Styled.AdditionalConditions>
), ),
@@ -103,91 +102,90 @@ export const Fees = () => {
}, },
]} ]}
/> />
<div>
<Styled.FeeTable <Styled.FeeTable
label="Fee Tiers" label="Fee Tiers"
data={feeTiers || []} data={feeTiers || []}
getRowKey={(row: FeeTier) => row.tier} getRowKey={(row: FeeTier) => row.tier}
getRowAttributes={(row: FeeTier) => ({ getRowAttributes={(row: FeeTier) => ({
'data-yours': row.tier === userFeeTier, 'data-yours': row.tier === userFeeTier,
})} })}
columns={( columns={(
[ [
{ {
columnKey: 'tier', columnKey: 'tier',
getCellValue: (row) => row.tier, getCellValue: (row) => row.tier,
label: stringGetter({ key: STRING_KEYS.TIER }), label: stringGetter({ key: STRING_KEYS.TIER }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ tier }) => ( renderCell: ({ tier }) => (
<Styled.Tier> <Styled.Tier>
<Styled.Output type={OutputType.Text} value={tier} /> <Styled.Output type={OutputType.Text} value={tier} />
{tier === userFeeTier && ( {tier === userFeeTier && (
<Styled.YouTag size={TagSize.Medium}> <Styled.YouTag size={TagSize.Medium}>
{stringGetter({ key: STRING_KEYS.YOU })} {stringGetter({ key: STRING_KEYS.YOU })}
</Styled.YouTag> </Styled.YouTag>
)} )}
</Styled.Tier> </Styled.Tier>
), ),
}, },
{ {
columnKey: 'volume', columnKey: 'volume',
getCellValue: (row) => row.volume, getCellValue: (row) => row.volume,
label: stringGetter({ key: STRING_KEYS.VOLUME_30D }), label: stringGetter({ key: STRING_KEYS.VOLUME_30D }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ symbol, volume, makerShare, totalShare }) => ( renderCell: ({ symbol, volume, makerShare, totalShare }) => (
<> <>
<span>{`${ <span>{`${
symbol in EQUALITY_SYMBOL_MAP symbol in EQUALITY_SYMBOL_MAP
? EQUALITY_SYMBOL_MAP[symbol as keyof typeof EQUALITY_SYMBOL_MAP] ? EQUALITY_SYMBOL_MAP[symbol as keyof typeof EQUALITY_SYMBOL_MAP]
: symbol : symbol
} `}</span> } `}</span>
<Styled.HighlightOutput type={OutputType.CompactFiat} value={volume} /> <Styled.HighlightOutput type={OutputType.CompactFiat} value={volume} />
{!isNotTablet && {isTablet &&
AdditionalConditions({ totalShare, makerShare, isAdditional: true })} AdditionalConditions({ totalShare, makerShare, isAdditional: true })}
</> </>
), ),
}, },
isNotTablet && { isNotTablet && {
columnKey: 'condition', columnKey: 'condition',
getCellValue: (row) => row.volume, getCellValue: (row) => row.volume,
label: stringGetter({ key: STRING_KEYS.ADDITIONAL_CONDITION }), label: stringGetter({ key: STRING_KEYS.ADDITIONAL_CONDITION }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ totalShare, makerShare }) => renderCell: ({ totalShare, makerShare }) =>
AdditionalConditions({ totalShare, makerShare }), AdditionalConditions({ totalShare, makerShare }),
}, },
{ {
columnKey: 'maker', columnKey: 'maker',
getCellValue: (row) => row.maker, getCellValue: (row) => row.maker,
label: stringGetter({ key: STRING_KEYS.MAKER }), label: stringGetter({ key: STRING_KEYS.MAKER }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ maker }) => ( renderCell: ({ maker }) => (
<Styled.HighlightOutput <Styled.HighlightOutput
type={OutputType.SmallPercent} type={OutputType.SmallPercent}
value={maker} value={maker}
fractionDigits={FEE_DECIMALS} fractionDigits={FEE_DECIMALS}
/> />
), ),
}, },
{ {
columnKey: 'taker', columnKey: 'taker',
getCellValue: (row) => row.taker, getCellValue: (row) => row.taker,
label: stringGetter({ key: STRING_KEYS.TAKER }), label: stringGetter({ key: STRING_KEYS.TAKER }),
allowsSorting: false, allowsSorting: false,
renderCell: ({ taker }) => ( renderCell: ({ taker }) => (
<Styled.HighlightOutput <Styled.HighlightOutput
type={OutputType.SmallPercent} type={OutputType.SmallPercent}
value={taker} value={taker}
fractionDigits={FEE_DECIMALS} fractionDigits={FEE_DECIMALS}
/> />
), ),
}, },
] as ColumnDef<FeeTier>[] ] as ColumnDef<FeeTier>[]
).filter(isTruthy)} ).filter(isTruthy)}
selectionBehavior="replace" selectionBehavior="replace"
withOuterBorder={isNotTablet} withOuterBorder={isNotTablet}
withInnerBorders withInnerBorders
/> />
</div>
</Styled.ContentWrapper> </Styled.ContentWrapper>
</AttachedExpandingSection> </AttachedExpandingSection>
); );
@@ -198,21 +196,43 @@ const Styled: Record<string, AnyStyledComponent> = {};
Styled.ContentWrapper = styled.div` Styled.ContentWrapper = styled.div`
${layoutMixins.flexColumn} ${layoutMixins.flexColumn}
gap: 1.5rem; gap: 1.5rem;
max-width: 100vw;
`; `;
Styled.AdditionalConditions = styled.div` Styled.AdditionalConditions = styled.div`
${tableMixins.cellContentColumn} ${tableMixins.cellContentColumn}
justify-content: end;
color: var(--color-text-0); color: var(--color-text-0);
font: var(--font-small-book);
> :nth-child(2) { > :nth-child(2) {
font: var(--font-base-book); font: var(--font-small-book);
}
`;
Styled.AdditionalConditionsText = styled.span`
display: flex;
gap: 0.5ch;
@media ${breakpoints.mobile} {
display: inline;
max-width: 8rem;
min-width: 0;
output {
display: inline;
}
} }
`; `;
Styled.FeesDetails = styled(Details)` Styled.FeesDetails = styled(Details)`
gap: 1rem; gap: 1rem;
@media ${breakpoints.notTablet} {
margin: 0 1.25rem;
}
@media ${breakpoints.tablet} { @media ${breakpoints.tablet} {
padding: 1rem 1rem 0 1rem; padding: 1rem 1rem 0 1rem;
--details-grid-numColumns: 1; --details-grid-numColumns: 1;
@@ -237,11 +257,7 @@ Styled.FeesDetails = styled(Details)`
} }
output { output {
font: var(--font-medium-book); font: var(--font-base-book);
@media ${breakpoints.tablet} {
font: var(--font-base-book);
}
} }
`; `;
@@ -271,6 +287,11 @@ Styled.FeeTable = styled(Table)`
font: var(--font-base-book); font: var(--font-base-book);
@media ${breakpoints.mobile} {
--tableCell-padding: 1rem 1.25rem;
font: var(--font-small-book);
}
tbody tr { tbody tr {
&[data-yours='true'] { &[data-yours='true'] {
background-color: var(--color-layer-3); background-color: var(--color-layer-3);
@@ -283,6 +304,10 @@ Styled.FeeTable = styled(Table)`
@media ${breakpoints.notTablet} { @media ${breakpoints.notTablet} {
--tableHeader-backgroundColor: var(--color-layer-1); --tableHeader-backgroundColor: var(--color-layer-1);
thead tr {
--border-width: 0;
}
} }
`; `;
+9 -4
View File
@@ -32,11 +32,11 @@ export const DYDXBalancePanel = () => {
const { chainTokenLabel } = useTokenConfigs(); const { chainTokenLabel } = useTokenConfigs();
return ( return (
<Panel <Styled.Panel
slotHeader={ slotHeader={
<Styled.Header> <Styled.Header>
<Styled.Title> <Styled.Title>
{/* <AssetIcon symbol="DYDX" /> */} <AssetIcon symbol={chainTokenLabel} />
{chainTokenLabel} {chainTokenLabel}
</Styled.Title> </Styled.Title>
<Styled.ReceiveAndTransferButtons> <Styled.ReceiveAndTransferButtons>
@@ -117,14 +117,19 @@ export const DYDXBalancePanel = () => {
]} ]}
/> />
</Styled.Content> </Styled.Content>
</Panel> </Styled.Panel>
); );
}; };
const Styled: Record<string, AnyStyledComponent> = {}; const Styled: Record<string, AnyStyledComponent> = {};
Styled.Panel = styled(Panel)`
--panel-paddingX: 1.5rem;
`;
Styled.Header = styled.div` Styled.Header = styled.div`
${layoutMixins.spacedRow} ${layoutMixins.spacedRow}
gap: 1rem;
padding: 1rem 1.5rem 0; padding: 1rem 1.5rem 0;
`; `;
@@ -177,7 +182,7 @@ Styled.WalletAndStakedBalance = styled(Details)`
--details-item-backgroundColor: var(--color-layer-6); --details-item-backgroundColor: var(--color-layer-6);
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
gap: 0.5rem; gap: 1rem;
> div { > div {
gap: 1rem; gap: 1rem;
+42 -40
View File
@@ -71,7 +71,7 @@ export const MigratePanel = () => {
</Styled.Description> </Styled.Description>
</Styled.MigratePanel> </Styled.MigratePanel>
) : ( ) : (
<Styled.MobileMigratePanel <Styled.MigratePanel
slotHeader={ slotHeader={
<Styled.MobileMigrateHeader> <Styled.MobileMigrateHeader>
<h3> <h3>
@@ -88,49 +88,52 @@ export const MigratePanel = () => {
</Styled.MobileMigrateHeader> </Styled.MobileMigrateHeader>
} }
> >
<Styled.WithReceipt <Styled.Column>
slotReceipt={ <Styled.WithReceipt
<Styled.Details slotReceipt={
items={[ <Styled.Details
{ items={[
key: 'available-to-migrate', {
label: ( key: 'available-to-migrate',
<Styled.InlineRow> label: (
{stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE })} <Styled.InlineRow>
<Tag>DYDX</Tag> {stringGetter({ key: STRING_KEYS.AVAILABLE_TO_MIGRATE })}
</Styled.InlineRow> <Tag>DYDX</Tag>
), </Styled.InlineRow>
value: <Output type={OutputType.Asset} value={tokenBalance} />, ),
}, value: <Output type={OutputType.Asset} value={tokenBalance} />,
]} },
/> ]}
} />
> }
{import.meta.env.VITE_TOKEN_MIGRATION_URI && ( >
<Button {import.meta.env.VITE_TOKEN_MIGRATION_URI && (
action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base} <Button
size={ButtonSize.Medium} action={tokenBalance ? ButtonAction.Primary : ButtonAction.Base}
slotRight={<Icon iconName={IconName.LinkOut} />} size={ButtonSize.Medium}
href={import.meta.env.VITE_TOKEN_MIGRATION_URI} slotRight={<Icon iconName={IconName.LinkOut} />}
> href={import.meta.env.VITE_TOKEN_MIGRATION_URI}
{stringGetter({ key: STRING_KEYS.MIGRATE_NOW })} >
</Button> {stringGetter({ key: STRING_KEYS.MIGRATE_NOW })}
)} </Button>
</Styled.WithReceipt> )}
<Styled.InlineRow> </Styled.WithReceipt>
{stringGetter({ key: STRING_KEYS.WANT_TO_LEARN })} <Styled.InlineRow>
<Link href={TOKEN_MIGRATION_LEARN_MORE_LINK} withIcon> {stringGetter({ key: STRING_KEYS.WANT_TO_LEARN })}
{stringGetter({ key: STRING_KEYS.CLICK_HERE })} <Link href={TOKEN_MIGRATION_LEARN_MORE_LINK} withIcon>
</Link> {stringGetter({ key: STRING_KEYS.CLICK_HERE })}
</Styled.InlineRow> </Link>
</Styled.MobileMigratePanel> </Styled.InlineRow>
</Styled.Column>
</Styled.MigratePanel>
); );
}; };
const Styled: Record<string, AnyStyledComponent> = {}; const Styled: Record<string, AnyStyledComponent> = {};
Styled.MigratePanel = styled(Panel)` Styled.MigratePanel = styled(Panel)`
padding: 1rem 1.5rem; --panel-paddingX: 1.5rem;
width: 100%;
`; `;
Styled.Title = styled.h3` Styled.Title = styled.h3`
@@ -163,10 +166,9 @@ Styled.Description = styled.div`
--link-color: var(--color-text-1); --link-color: var(--color-text-1);
`; `;
Styled.MobileMigratePanel = styled(Panel)` Styled.Column = styled.div`
${layoutMixins.flexColumn} ${layoutMixins.flexColumn}
gap: 1rem; gap: 1rem;
align-items: center; align-items: center;
`; `;
+26 -36
View File
@@ -5,7 +5,7 @@ import { STRING_KEYS } from '@/constants/localization';
import { ButtonAction, ButtonSize } from '@/constants/buttons'; import { ButtonAction, ButtonSize } from '@/constants/buttons';
import { DialogTypes } from '@/constants/dialogs'; import { DialogTypes } from '@/constants/dialogs';
import { useBreakpoints, useStringGetter } from '@/hooks'; import { useBreakpoints, useStringGetter, useURLConfigs } from '@/hooks';
import { breakpoints } from '@/styles'; import { breakpoints } from '@/styles';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
@@ -20,15 +20,10 @@ import { openDialog } from '@/state/dialogs';
import { DYDXBalancePanel } from './DYDXBalancePanel'; import { DYDXBalancePanel } from './DYDXBalancePanel';
import { MigratePanel } from './MigratePanel'; import { MigratePanel } from './MigratePanel';
// TODO: consolidate help link urls to env variables
const GOVERNANCE_HELP_URL = 'https://help.dydx.exchange/';
const STAKING_HELP_URL =
'https://docs.dydx.community/dydx-chain-documentation/staking/how-to-stake';
export const RewardsPage = () => { export const RewardsPage = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { governanceLearnMore, stakingLearnMore } = useURLConfigs();
const { isTablet, isNotTablet } = useBreakpoints(); const { isTablet, isNotTablet } = useBreakpoints();
const panelArrow = ( const panelArrow = (
@@ -45,11 +40,7 @@ export const RewardsPage = () => {
<Styled.Page> <Styled.Page>
{import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />} {import.meta.env.VITE_V3_TOKEN_ADDRESS && <MigratePanel />}
<Styled.PanelRow> <Styled.PanelRow>
{isTablet && ( {isTablet && <DYDXBalancePanel />}
<Styled.BalancePanelContainer>
<DYDXBalancePanel />
</Styled.BalancePanelContainer>
)}
<Styled.Panel <Styled.Panel
slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>} slotHeader={<Styled.Title>{stringGetter({ key: STRING_KEYS.GOVERNANCE })}</Styled.Title>}
@@ -58,7 +49,7 @@ export const RewardsPage = () => {
> >
<Styled.Description> <Styled.Description>
{stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })} {stringGetter({ key: STRING_KEYS.GOVERNANCE_DESCRIPTION })}
<Link href={GOVERNANCE_HELP_URL} onClick={(e) => e.stopPropagation()}> <Link href={governanceLearnMore} onClick={(e) => e.stopPropagation()}>
{stringGetter({ key: STRING_KEYS.LEARN_MORE })} {stringGetter({ key: STRING_KEYS.LEARN_MORE })}
</Link> </Link>
</Styled.Description> </Styled.Description>
@@ -71,17 +62,13 @@ export const RewardsPage = () => {
> >
<Styled.Description> <Styled.Description>
{stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })} {stringGetter({ key: STRING_KEYS.STAKING_DESCRIPTION })}
<Link href={STAKING_HELP_URL} onClick={(e) => e.stopPropagation()}> <Link href={stakingLearnMore} onClick={(e) => e.stopPropagation()}>
{stringGetter({ key: STRING_KEYS.LEARN_MORE })} {stringGetter({ key: STRING_KEYS.LEARN_MORE })}
</Link> </Link>
</Styled.Description> </Styled.Description>
</Styled.Panel> </Styled.Panel>
{isNotTablet && ( {isNotTablet && <DYDXBalancePanel />}
<Styled.BalancePanelContainer>
<DYDXBalancePanel />
</Styled.BalancePanelContainer>
)}
</Styled.PanelRow> </Styled.PanelRow>
</Styled.Page> </Styled.Page>
); );
@@ -92,10 +79,26 @@ const Styled: Record<string, AnyStyledComponent> = {};
Styled.Page = styled.div` Styled.Page = styled.div`
${layoutMixins.contentContainerPage} ${layoutMixins.contentContainerPage}
gap: 1.5rem; gap: 1.5rem;
padding: 2rem;
align-items: center;
> * {
--content-max-width: 70rem;
max-width: min(calc(100vw - 4rem), var(--content-max-width));
}
@media ${breakpoints.tablet} {
padding: 1.25rem;
> * {
max-width: calc(100vw - 2.5rem);
width: 100%;
}
}
`; `;
Styled.Panel = styled(Panel)` Styled.Panel = styled(Panel)`
padding: 1rem 1.5rem; --panel-paddingX: 1.5rem;
`; `;
Styled.Title = styled.h3` Styled.Title = styled.h3`
@@ -110,27 +113,14 @@ Styled.Description = styled.div`
`; `;
Styled.PanelRow = styled.div` Styled.PanelRow = styled.div`
${layoutMixins.spacedRow} ${layoutMixins.gridEqualColumns}
gap: 1.5rem; gap: 1.5rem;
max-width: min(100vw, var(--content-max-width));
align-items: flex-start;
> section { align-items: flex-start;
cursor: pointer;
}
@media ${breakpoints.tablet} { @media ${breakpoints.tablet} {
grid-auto-flow: row; grid-auto-flow: row;
grid-template-columns: 1fr; grid-template-columns: 1fr;
max-width: auto;
}
`;
Styled.BalancePanelContainer = styled.div`
width: 21.25rem;
@media ${breakpoints.tablet} {
width: auto;
} }
`; `;
@@ -140,5 +130,5 @@ Styled.IconButton = styled(IconButton)`
`; `;
Styled.Arrow = styled.div` Styled.Arrow = styled.div`
padding: 1rem 1.5rem; padding: 1rem;
`; `;
+2 -2
View File
@@ -227,8 +227,8 @@ export const HorizontalPanel = ({ isOpen = true, setIsOpen }: ElementProps) => {
}, },
]} ]}
value={view} value={view}
onValueChange={(newView: string) => { onValueChange={setView}
setView((newView || view) as PanelView); onInteraction={() => {
setIsOpen?.(true); setIsOpen?.(true);
}} }}
/> />
+1 -1
View File
@@ -2,7 +2,7 @@
:root { :root {
--fontFamily-base: "Satoshi", system-ui, -apple-system, Helvetica, Arial, sans-serif; --fontFamily-base: "Satoshi", system-ui, -apple-system, Helvetica, Arial, sans-serif;
--fontFamily-monospace: Courier, monospace, var(--fontFamily-base); --fontFamily-monospace: monospace, var(--fontFamily-base);
--fontWeight-base-0: 450; --fontWeight-base-0: 450;
--fontWeight-base-1: 500; --fontWeight-base-1: 500;
+1 -1
View File
@@ -29,7 +29,7 @@ export const MarketFilter = ({
<> <>
{!isSearch && ( {!isSearch && (
<ToggleGroup <ToggleGroup
items={Object.entries(filters).map(([key, value]) => ({ items={Object.values(filters).map((value) => ({
label: stringGetter({ key: MARKET_FILTER_LABELS[value] }), label: stringGetter({ key: MARKET_FILTER_LABELS[value] }),
value, value,
}))} }))}
-2
View File
@@ -198,8 +198,6 @@ Styled.Details = styled(Details)`
@media ${breakpoints.tablet} { @media ${breakpoints.tablet} {
${layoutMixins.withOuterAndInnerBorders} ${layoutMixins.withOuterAndInnerBorders}
display: grid;
grid-template-columns: repeat(auto-fit, minmax(9rem, 1fr));
font: var(--font-small-book); font: var(--font-small-book);
> * { > * {
+1 -3
View File
@@ -246,9 +246,7 @@ export const FundingChart = ({ selectedLocale }: ElementProps) => {
}[rate] || '', }[rate] || '',
}))} }))}
value={fundingRateView} value={fundingRateView}
onValueChange={(newRate: FundingRateResolution) => { onValueChange={setFundingRateView}
if (newRate) setFundingRateView(newRate);
}}
size={ButtonSize.XSmall} size={ButtonSize.XSmall}
/> />
</Styled.FundingRateToggle> </Styled.FundingRateToggle>
+5 -7
View File
@@ -2,7 +2,7 @@ import styled, { type AnyStyledComponent } from 'styled-components';
import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons'; import { ButtonAction, ButtonSize, ButtonType } from '@/constants/buttons';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { useBreakpoints, useStringGetter } from '@/hooks'; import { useBreakpoints, useStringGetter, useURLConfigs } from '@/hooks';
import { Button } from '@/components/Button'; import { Button } from '@/components/Button';
import { Dialog, DialogPlacement } from '@/components/Dialog'; import { Dialog, DialogPlacement } from '@/components/Dialog';
@@ -15,12 +15,10 @@ type ElementProps = {
setIsOpen: (open: boolean) => void; setIsOpen: (open: boolean) => void;
}; };
// TODO: replace placeholder URL with real URLs when avaialble
const KEPLR_DASHBOARD_URL = 'https://testnet.keplr.app/';
const HELP_URL = 'https://help.dydx.exchange/en/articles/2921366-how-do-i-create-an-account-or-sign-up';
export const ExternalNavKeplrDialog = ({ setIsOpen }: ElementProps) => { export const ExternalNavKeplrDialog = ({ setIsOpen }: ElementProps) => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { keplrDashboard, accountExportLearnMore } = useURLConfigs();
const { isTablet } = useBreakpoints(); const { isTablet } = useBreakpoints();
return ( return (
@@ -31,7 +29,7 @@ export const ExternalNavKeplrDialog = ({ setIsOpen }: ElementProps) => {
placement={isTablet ? DialogPlacement.FullScreen : DialogPlacement.Default} placement={isTablet ? DialogPlacement.FullScreen : DialogPlacement.Default}
> >
<Styled.Content> <Styled.Content>
<Styled.Button type={ButtonType.Link} size={ButtonSize.XLarge} href={KEPLR_DASHBOARD_URL}> <Styled.Button type={ButtonType.Link} size={ButtonSize.XLarge} href={keplrDashboard}>
<span> <span>
{stringGetter({ {stringGetter({
key: STRING_KEYS.NAVIGATE_TO_KEPLR, key: STRING_KEYS.NAVIGATE_TO_KEPLR,
@@ -48,7 +46,7 @@ export const ExternalNavKeplrDialog = ({ setIsOpen }: ElementProps) => {
/> />
</Styled.Button> </Styled.Button>
<Styled.Button type={ButtonType.Link} size={ButtonSize.XLarge} href={HELP_URL}> <Styled.Button type={ButtonType.Link} size={ButtonSize.XLarge} href={accountExportLearnMore}>
<span> <span>
{stringGetter({ {stringGetter({
key: STRING_KEYS.LEARN_TO_EXPORT, key: STRING_KEYS.LEARN_TO_EXPORT,
+14 -29
View File
@@ -2,10 +2,10 @@ import { useMemo } from 'react';
import styled, { AnyStyledComponent } from 'styled-components'; import styled, { AnyStyledComponent } from 'styled-components';
import { STRING_KEYS } from '@/constants/localization'; import { STRING_KEYS } from '@/constants/localization';
import { useStringGetter } from '@/hooks'; import { useStringGetter, useURLConfigs } from '@/hooks';
import { ChatIcon, FeedbackIcon, FileIcon, TerminalIcon } from '@/icons';
import { ComboboxDialogMenu } from '@/components/ComboboxDialogMenu'; import { ComboboxDialogMenu } from '@/components/ComboboxDialogMenu';
import { Icon, IconName } from '@/components/Icon';
import { isTruthy } from '@/lib/isTruthy'; import { isTruthy } from '@/lib/isTruthy';
@@ -13,39 +13,24 @@ type ElementProps = {
setIsOpen: (open: boolean) => void; setIsOpen: (open: boolean) => void;
}; };
const HELP_LINKS = {
apiDocumentation: 'https://v4-teacher.vercel.app/',
helpCenter: null,
feedback: null,
};
export const HelpDialog = ({ setIsOpen }: ElementProps) => { export const HelpDialog = ({ setIsOpen }: ElementProps) => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { help: helpCenter, community } = useURLConfigs();
const HELP_ITEMS = useMemo( const HELP_ITEMS = useMemo(
() => [ () => [
{ {
group: 'help-items', group: 'help-items',
items: [ items: [
HELP_LINKS.helpCenter && { helpCenter && {
value: 'help-center', value: 'help-center',
label: stringGetter({ key: STRING_KEYS.HELP_CENTER }), label: stringGetter({ key: STRING_KEYS.HELP_CENTER }),
description: stringGetter({ key: STRING_KEYS.HELP_CENTER_DESCRIPTION }), description: stringGetter({ key: STRING_KEYS.HELP_CENTER_DESCRIPTION }),
onSelect: () => { onSelect: () => {
HELP_LINKS.helpCenter && globalThis.open(HELP_LINKS.helpCenter, '_blank'); helpCenter && globalThis.open(helpCenter, '_blank');
setIsOpen(false); setIsOpen(false);
}, },
slotBefore: <FileIcon />, slotBefore: <Icon iconName={IconName.File} />,
},
HELP_LINKS.apiDocumentation && {
value: 'api-documentation',
label: stringGetter({ key: STRING_KEYS.API_DOCUMENTATION }),
description: stringGetter({ key: STRING_KEYS.API_DOCUMENTATION_DESCRIPTION }),
onSelect: () => {
HELP_LINKS.apiDocumentation && globalThis.open(HELP_LINKS.apiDocumentation, '_blank');
setIsOpen(false);
},
slotBefore: <TerminalIcon />,
}, },
globalThis?.Intercom && { globalThis?.Intercom && {
value: 'live-chat', value: 'live-chat',
@@ -55,22 +40,22 @@ export const HelpDialog = ({ setIsOpen }: ElementProps) => {
globalThis.Intercom('show'); globalThis.Intercom('show');
setIsOpen(false); setIsOpen(false);
}, },
slotBefore: <ChatIcon />, slotBefore: <Icon iconName={IconName.Chat} />,
}, },
HELP_LINKS.feedback && { community && {
value: 'feedback', value: 'community',
label: stringGetter({ key: STRING_KEYS.PROVIDE_FEEDBACK }), label: stringGetter({ key: STRING_KEYS.COMMUNITY }),
description: stringGetter({ key: STRING_KEYS.PROVIDE_FEEDBACK_DESCRIPTION }), description: stringGetter({ key: STRING_KEYS.COMMUNITY_DESCRIPTION }),
onSelect: () => { onSelect: () => {
HELP_LINKS.feedback && globalThis.open(HELP_LINKS.feedback, '_blank'); community && globalThis.open(community, '_blank');
setIsOpen(false); setIsOpen(false);
}, },
slotBefore: <FeedbackIcon />, slotBefore: <Icon iconName={IconName.Discord} />,
}, },
].filter(isTruthy), ].filter(isTruthy),
}, },
], ],
[stringGetter] [stringGetter, helpCenter, community]
); );
return ( return (
@@ -13,16 +13,15 @@ import { Button } from '@/components/Button';
import { Icon } from '@/components/Icon'; import { Icon } from '@/components/Icon';
import { Link } from '@/components/Link'; import { Link } from '@/components/Link';
import { useAccounts, useStringGetter } from '@/hooks'; import { useAccounts, useStringGetter, useURLConfigs } from '@/hooks';
import { useDisplayedWallets } from '@/hooks/useDisplayedWallets'; import { useDisplayedWallets } from '@/hooks/useDisplayedWallets';
import { breakpoints } from '@/styles'; import { breakpoints } from '@/styles';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
const aboutWalletsLink = `https://www.dydx.academy/video/defi-wallet`;
export const ChooseWallet = () => { export const ChooseWallet = () => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { walletLearnMore } = useURLConfigs();
const displayedWallets = useDisplayedWallets(); const displayedWallets = useDisplayedWallets();
@@ -63,7 +62,7 @@ export const ChooseWallet = () => {
</Styled.Wallets> </Styled.Wallets>
<Styled.Footer> <Styled.Footer>
<Link href={aboutWalletsLink} withIcon> <Link href={walletLearnMore} withIcon>
{stringGetter({ key: STRING_KEYS.ABOUT_WALLETS })} {stringGetter({ key: STRING_KEYS.ABOUT_WALLETS })}
</Link> </Link>
</Styled.Footer> </Styled.Footer>
+1 -3
View File
@@ -73,9 +73,7 @@ export const TradeDialog = ({ isOpen, setIsOpen, slotTrigger }: ElementProps) =>
<Styled.ToggleGroup <Styled.ToggleGroup
items={allTradeTypeItems} items={allTradeTypeItems}
value={selectedTradeType} value={selectedTradeType}
onValueChange={(tradeType: TradeTypes) => onValueChange={onTradeTypeChange}
onTradeTypeChange(tradeType || selectedTradeType)
}
/> />
), ),
}, },
+1 -1
View File
@@ -209,7 +209,7 @@ export const ClosePositionForm = ({
value: value.toString(), value: value.toString(),
}))} }))}
value={percent?.toString() ?? ''} value={percent?.toString() ?? ''}
onValueChange={(value: any) => onSelectPercentage((value || percent?.toString()) ?? '')} onValueChange={onSelectPercentage}
shape={ButtonShape.Rectangle} shape={ButtonShape.Rectangle}
/> />
@@ -153,9 +153,7 @@ export const MarketLeverageInput = ({
value: MustBigNumber(leverageAmount).toFixed(LEVERAGE_DECIMALS), value: MustBigNumber(leverageAmount).toFixed(LEVERAGE_DECIMALS),
}))} }))}
value={MustBigNumber(formattedLeverageValue).abs().toFixed(LEVERAGE_DECIMALS)} // sign agnostic value={MustBigNumber(formattedLeverageValue).abs().toFixed(LEVERAGE_DECIMALS)} // sign agnostic
onValueChange={(option?: number) => onValueChange={updateLeverage}
updateLeverage(option === undefined ? formattedLeverageValue : option)
}
shape={ButtonShape.Rectangle} shape={ButtonShape.Rectangle}
/> />
</> </>
+48 -27
View File
@@ -15,6 +15,7 @@ import {
useTokenConfigs, useTokenConfigs,
useStringGetter, useStringGetter,
useAccountBalance, useAccountBalance,
useURLConfigs,
} from '@/hooks'; } from '@/hooks';
import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton'; import { OnboardingTriggerButton } from '@/views/dialogs/OnboardingTriggerButton';
@@ -36,10 +37,9 @@ import { truncateAddress } from '@/lib/wallet';
import { layoutMixins } from '@/styles/layoutMixins'; import { layoutMixins } from '@/styles/layoutMixins';
import { headerMixins } from '@/styles/headerMixins'; import { headerMixins } from '@/styles/headerMixins';
const explorerBaseUri = 'https://testnet.mintscan.io/dydx-testnet';
export const AccountMenu = () => { export const AccountMenu = () => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const { mintscanBase } = useURLConfigs();
const { isTablet } = useBreakpoints(); const { isTablet } = useBreakpoints();
const dispatch = useDispatch(); const dispatch = useDispatch();
const onboardingState = useSelector(getOnboardingState); const onboardingState = useSelector(getOnboardingState);
@@ -92,7 +92,7 @@ export const AccountMenu = () => {
/> />
<IconButton <IconButton
action={ButtonAction.Base} action={ButtonAction.Base}
href={`${explorerBaseUri}/account/${dydxAddress}`} href={`${mintscanBase}/account/${dydxAddress}`}
iconName={IconName.LinkOut} iconName={IconName.LinkOut}
shape={ButtonShape.Square} shape={ButtonShape.Square}
type={ButtonType.Link} type={ButtonType.Link}
@@ -139,7 +139,7 @@ export const AccountMenu = () => {
fractionDigits={2} fractionDigits={2}
/> />
</div> </div>
<AssetActions asset={DydxChainAsset.USDC} dispatch={dispatch} /> <AssetActions asset={DydxChainAsset.USDC} dispatch={dispatch} withOnboarding />
</div> </div>
</Styled.Balances> </Styled.Balances>
</Styled.AccountInfo> </Styled.AccountInfo>
@@ -167,7 +167,7 @@ export const AccountMenu = () => {
// value: 'ViewInExplorer', // value: 'ViewInExplorer',
// icon: <Icon iconName={IconName.Etherscan} />, // icon: <Icon iconName={IconName.Etherscan} />,
// label: stringGetter({ key: STRING_KEYS.OPEN_IN_ETHERSCAN }), // label: stringGetter({ key: STRING_KEYS.OPEN_IN_ETHERSCAN }),
// onSelect: () => globalThis.open(`${explorerBaseUri}/address/${address}`), // onSelect: () => globalThis.open(`${mintscanBase}/address/${address}`),
// separator: true, // separator: true,
// }, // },
...(onboardingState === OnboardingState.AccountConnected && hdKey ...(onboardingState === OnboardingState.AccountConnected && hdKey
@@ -212,28 +212,45 @@ export const AccountMenu = () => {
); );
}; };
const AssetActions = memo(({ asset, dispatch }: { asset: DydxChainAsset; dispatch: Dispatch }) => ( const AssetActions = memo(
<Styled.InlineRow> ({
{[ asset,
// TODO(@rosepuppy): Add withdraw action for USDC dispatch,
{ withOnboarding,
dialogType: DialogTypes.Receive, }: {
iconName: IconName.Qr, asset: DydxChainAsset;
}, dispatch: Dispatch;
{ dialogType: DialogTypes.Transfer, iconName: IconName.Send }, withOnboarding?: boolean;
].map(({ iconName, dialogType }) => ( }) => (
<IconButton <Styled.InlineRow>
key={dialogType} {[
action={ButtonAction.Base} withOnboarding && {
shape={ButtonShape.Square} dialogType: DialogTypes.Withdraw,
iconName={iconName} iconName: IconName.Withdraw,
onClick={() => },
dispatch(openDialog({ type: dialogType, dialogProps: { selectedAsset: asset } })) withOnboarding && {
} dialogType: DialogTypes.Deposit,
/> iconName: IconName.Deposit,
))} },
</Styled.InlineRow> {
)); dialogType: DialogTypes.Transfer,
dialogProps: { selectedAsset: asset },
iconName: IconName.Send,
},
]
.filter(isTruthy)
.map(({ iconName, dialogType, dialogProps }) => (
<Styled.IconButton
key={dialogType}
action={ButtonAction.Base}
shape={ButtonShape.Square}
iconName={iconName}
onClick={() => dispatch(openDialog({ type: dialogType, dialogProps }))}
/>
))}
</Styled.InlineRow>
)
);
const Styled: Record<string, AnyStyledComponent> = {}; const Styled: Record<string, AnyStyledComponent> = {};
@@ -351,3 +368,7 @@ Styled.ConnectToChain = styled(Styled.Column)`
font: var(--font-small-book); font: var(--font-small-book);
} }
`; `;
Styled.IconButton = styled(IconButton)`
--button-padding: 0 0.25rem;
`;
+6 -5
View File
@@ -1,10 +1,13 @@
import React, { useMemo } from 'react'; import React, { useMemo } from 'react';
import styled from 'styled-components';
import { layoutMixins } from '@/styles/layoutMixins';
import { groupBy } from 'lodash'; import { groupBy } from 'lodash';
import { type Notification, NotificationStatus } from '@/constants/notifications'; import { type Notification, NotificationStatus } from '@/constants/notifications';
import { useBreakpoints } from '@/hooks';
import { useNotifications } from '@/hooks/useNotifications'; import { useNotifications } from '@/hooks/useNotifications';
import { CloseIcon } from '@/icons';
import { Button } from '@/components/Button'; import { Button } from '@/components/Button';
import { ButtonAction, ButtonSize } from '@/constants/buttons'; import { ButtonAction, ButtonSize } from '@/constants/buttons';
@@ -13,10 +16,6 @@ import { DialogPlacement } from '@/components/Dialog';
import { Output, OutputType } from '@/components/Output'; import { Output, OutputType } from '@/components/Output';
import { IconButton } from '@/components/IconButton'; import { IconButton } from '@/components/IconButton';
import { Toolbar } from '@/components/Toolbar'; import { Toolbar } from '@/components/Toolbar';
import { CloseIcon } from '@/icons';
import styled from 'styled-components';
import { layoutMixins } from '@/styles/layoutMixins';
type ElementProps = { type ElementProps = {
slotTrigger?: React.ReactNode; slotTrigger?: React.ReactNode;
@@ -27,6 +26,7 @@ export const NotificationsMenu = ({
slotTrigger, slotTrigger,
placement = DialogPlacement.Sidebar, placement = DialogPlacement.Sidebar,
}: ElementProps) => { }: ElementProps) => {
const { isTablet } = useBreakpoints();
const { const {
notifications, notifications,
getDisplayData, getDisplayData,
@@ -173,6 +173,7 @@ export const NotificationsMenu = ({
</$FooterToolbar> </$FooterToolbar>
} }
placement={placement} placement={placement}
preventClose={isTablet}
/> />
); );
}; };