diff --git a/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.png b/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.png index 9280432..52fec8a 100644 Binary files a/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.png and b/public/images/tokens/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2.png differ 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 35d11a1..9fa569e 100644 Binary files a/public/images/tokens/0xC60F8AF409Eac14d4926e641170382f313749Fdc.png and b/public/images/tokens/0xC60F8AF409Eac14d4926e641170382f313749Fdc.png differ 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 = () => (