From 8e949e2fb2c91f08554031a0afd4825bede9ab68 Mon Sep 17 00:00:00 2001 From: tiendn Date: Thu, 29 Jun 2023 10:41:15 +0700 Subject: [PATCH] style: update UI with feedback --- ...74f5511ba144990A8aeBaF20AFBD3B56EedCb2.png | Bin 1315 -> 3830 bytes ...74f5511ba144990A8aeBaF20AFBD3B56EedCb2.svg | 139 +++++++++- ...0F8AF409Eac14d4926e641170382f313749Fdc.png | Bin 5675 -> 1425 bytes ...0F8AF409Eac14d4926e641170382f313749Fdc.svg | 256 +++++++++++++++++- .../CurrencyInputPanel/NumericalInput.tsx | 4 +- src/components/CurrencyInputPanel/index.tsx | 16 +- .../CurrencyInputPanel/styles.module.scss | 12 +- src/components/Logo/CurrencyLogo.tsx | 5 +- src/components/Logo/DoubleLogo.tsx | 5 +- src/components/Navbar/Navigation.tsx | 12 +- src/components/Navbar/index.tsx | 8 +- src/components/Navbar/style.module.scss | 18 +- src/config/localization/translations.json | 2 +- src/utils/getTokenLogoURL.ts | 2 +- .../Swap/components/AdvancedSwapDetails.tsx | 6 +- .../Swap/components/CurrencyInputHeader.tsx | 53 ++-- src/views/Swap/index.tsx | 4 +- style.scss | 2 +- 18 files changed, 487 insertions(+), 57 deletions(-) diff --git a/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.png b/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.png index 92804329a79ed3d2f989b3c0bb555198baf911c8..52fec8a022049364ee9e3e2ade7a377203a6e629 100644 GIT binary patch literal 3830 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 COGCi` diff --git a/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.svg b/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.svg index efb4d4d..35e4cf8 100644 --- a/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.svg +++ b/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.svg @@ -1 +1,138 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/tokens/0xC60F8AF409Eac14d4926e641170382f313749Fdc.png b/public/images/tokens/0xC60F8AF409Eac14d4926e641170382f313749Fdc.png index 35d11a1767e18b249be53e67f68f144fd19e5aba..9fa569e9e436fdeb3563ec82f30109c4f763cea5 100644 GIT binary patch delta 1413 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 RUuggU002ovPDHLkV1fhM*k%9# diff --git a/public/images/tokens/0xC60F8AF409Eac14d4926e641170382f313749Fdc.svg b/public/images/tokens/0xC60F8AF409Eac14d4926e641170382f313749Fdc.svg index c6b89e5..f5316c1 100644 --- a/public/images/tokens/0xC60F8AF409Eac14d4926e641170382f313749Fdc.svg +++ b/public/images/tokens/0xC60F8AF409Eac14d4926e641170382f313749Fdc.svg @@ -1 +1,255 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/CurrencyInputPanel/NumericalInput.tsx b/src/components/CurrencyInputPanel/NumericalInput.tsx index 68f2d43..8a6aebd 100644 --- a/src/components/CurrencyInputPanel/NumericalInput.tsx +++ b/src/components/CurrencyInputPanel/NumericalInput.tsx @@ -1,7 +1,7 @@ import { memo } from 'react' import { useTranslation } from 'contexts/Localization' import { escapeRegExp } from '../../utils' -import { Form } from '@astraprotocol/astra-ui' +import { Form, Typography } from '@astraprotocol/astra-ui' import styles from './styles.module.scss' import clsx from 'clsx' @@ -49,7 +49,7 @@ export const Input = memo(function InnerInput({ spellCheck="false" className={clsx( styles.input, - 'padding-left-sm padding-right-sm padding-top-md padding-bottom-md same-bg-color-20 border radius-lg', + 'padding-left-sm padding-right-sm padding-top-md padding-bottom-md border radius-lg ', rest.className, )} /> diff --git a/src/components/CurrencyInputPanel/index.tsx b/src/components/CurrencyInputPanel/index.tsx index 85c3a0f..8def8ca 100644 --- a/src/components/CurrencyInputPanel/index.tsx +++ b/src/components/CurrencyInputPanel/index.tsx @@ -12,6 +12,7 @@ import { CurrencyLogo, DoubleCurrencyLogo } from '../Logo' import { Input as NumericalInput } from './NumericalInput' import { useModal } from 'components/Modal' import styles from './styles.module.scss' +import numeral from 'numeral' interface CurrencyInputPanelProps { value: string @@ -61,6 +62,9 @@ export default function CurrencyInputPanel({ showCommonBases={showCommonBases} />, ) + + const balance = selectedCurrencyBalance?.toSignificant(6) + return (
@@ -121,16 +125,16 @@ export default function CurrencyInputPanel({ > {!hideBalance && !!currency ? t('Balance: %balance%', { - balance: selectedCurrencyBalance?.toSignificant(6) ?? t('Loading'), + balance: balance ? numeral(balance).format('0,0[.]0[0000]') : t('Loading'), }) : ' -'} )}
-
+
{ onUserInput(val) @@ -139,7 +143,11 @@ export default function CurrencyInputPanel({
{account && currency && showMaxButton && label !== 'To' && ( - + {t('Max').toLocaleUpperCase(locale)} )} diff --git a/src/components/CurrencyInputPanel/styles.module.scss b/src/components/CurrencyInputPanel/styles.module.scss index d5a8c4a..ed0ecc7 100644 --- a/src/components/CurrencyInputPanel/styles.module.scss +++ b/src/components/CurrencyInputPanel/styles.module.scss @@ -4,7 +4,7 @@ position: relative; font-weight: 500; outline: none; - border: none; + // border: none; flex: 1 1 auto; font-size: 16px; text-align: right; @@ -30,6 +30,16 @@ ::placeholder { color: var(--contrast-color-theme-70); } + + &:focus { + border-color: #2295FF; + border-width: 2px; + } + + &:hover { + border-color: #ffffff2e; + background-color: rgb(255 255 255 / 12%); + } } .inputRow { diff --git a/src/components/Logo/CurrencyLogo.tsx b/src/components/Logo/CurrencyLogo.tsx index 7cc643e..3daf86e 100644 --- a/src/components/Logo/CurrencyLogo.tsx +++ b/src/components/Logo/CurrencyLogo.tsx @@ -6,6 +6,9 @@ import getTokenLogoURL from '../../utils/getTokenLogoURL' import AstraIcon from './AstraIcon' import Logo from './Logo' +export const isETHER = (currency: Currency | Token) => + JSON.stringify(currency) === JSON.stringify(ETHER) || currency?.symbol === 'WASA' + export default function CurrencyLogo({ currency, size = 24, @@ -29,7 +32,7 @@ export default function CurrencyLogo({ return [] }, [currency, uriLocations]) - if (JSON.stringify(currency) === JSON.stringify(ETHER) || currency?.symbol === 'WASA') { + if (isETHER(currency)) { return } diff --git a/src/components/Logo/DoubleLogo.tsx b/src/components/Logo/DoubleLogo.tsx index 14cc4eb..cf6ec35 100644 --- a/src/components/Logo/DoubleLogo.tsx +++ b/src/components/Logo/DoubleLogo.tsx @@ -1,7 +1,7 @@ import { Currency } from '@solarswap/sdk' import clsx from 'clsx' -import CurrencyLogo from './CurrencyLogo' +import CurrencyLogo, { isETHER } from './CurrencyLogo' interface DoubleCurrencyLogoProps { margin?: boolean @@ -16,9 +16,10 @@ export default function DoubleCurrencyLogo({ size = 20, margin = false, }: DoubleCurrencyLogoProps) { + const isASA = isETHER(currency0) return (
- {currency0 && } + {currency0 && } {currency1 && }
) diff --git a/src/components/Navbar/Navigation.tsx b/src/components/Navbar/Navigation.tsx index 804b455..4499c8c 100644 --- a/src/components/Navbar/Navigation.tsx +++ b/src/components/Navbar/Navigation.tsx @@ -50,6 +50,7 @@ export default function Navigation({ items }: NavigationProps) { }, [items]) const _renderLink = ( + isSubmenu: boolean, link: string, content: React.ReactNode, index: number, @@ -63,13 +64,16 @@ export default function Navigation({ items }: NavigationProps) { } > {locale ? ( @@ -132,7 +136,7 @@ export default function Navigation({ items }: NavigationProps) { ) : ( <> {prefixIcon && prefixIcon} - {_renderLink(link, label!, 1, 0)} + {_renderLink(false, link, label!, 1, 0)} )} @@ -154,6 +158,7 @@ export default function Navigation({ items }: NavigationProps) { // onClick={event => _showSubMenu(event, [id, menu.id])} > {_renderLink( + true, menu?.link || '', menu.label, index, @@ -165,13 +170,14 @@ export default function Navigation({ items }: NavigationProps) { )} {menu.submenus && (
    {menu.submenus.map(sub2 => (
  • {_renderLink( + true, sub2.link, sub2.label, index, diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx index f1e6b73..6b55a74 100644 --- a/src/components/Navbar/index.tsx +++ b/src/components/Navbar/index.tsx @@ -105,6 +105,11 @@ export default function Navbar() { label: t('Liquidity'), link: '/liquidity', }, + // { + // id: '1.3', + // label: t('Bridge'), + // link: 'https://bridge.astranaut.io', + // }, ], }, { @@ -143,7 +148,6 @@ export default function Navbar() { return MENU_ITEMS }, [currentLanguage]) - const ModalMobileNav = () => (