From eae20fdbd53c86c8f8c1211a1eb18ee8a28dd145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Wo=C5=82odko?= Date: Sun, 29 Dec 2024 16:27:11 +0100 Subject: [PATCH 1/7] Add audit label --- .../components/AuditLabel/AuditLabel.tsx | 20 +++++++++++++++++++ src/pages/RootPage.tsx | 2 ++ src/static/icons.ts | 4 +++- src/static/svg/auditIcon.svg | 3 +++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx create mode 100644 src/static/svg/auditIcon.svg diff --git a/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx b/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx new file mode 100644 index 00000000..9551dc4d --- /dev/null +++ b/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx @@ -0,0 +1,20 @@ +import { Box, Typography } from '@mui/material' +import { colors, typography } from '@static/theme' +import icons from '@static/icons' +export const AuditLabel = () => { + return ( + + Shield + + Audited by Sec3 + + + ) +} diff --git a/src/pages/RootPage.tsx b/src/pages/RootPage.tsx index 13c9c6f5..10d511a5 100644 --- a/src/pages/RootPage.tsx +++ b/src/pages/RootPage.tsx @@ -15,6 +15,7 @@ import { actions } from '@store/reducers/positions' import { NormalBanner } from './LeaderboardPage/components/LeaderboardBanner/NormalBanner' import { NetworkType } from '@store/consts/static' import { network } from '@store/selectors/solanaConnection' +import { AuditLabel } from './LeaderboardPage/components/AuditLabel/AuditLabel' const BANNER_STORAGE_KEY = 'invariant-banner-state' const BANNER_HIDE_DURATION = 1000 * 60 * 60 * 24 // 24 hours @@ -114,6 +115,7 @@ const RootPage: React.FC = memo(() => { + diff --git a/src/static/icons.ts b/src/static/icons.ts index 418aeace..e713f854 100644 --- a/src/static/icons.ts +++ b/src/static/icons.ts @@ -49,6 +49,7 @@ import lockIcon from './svg/lockIcon.svg' import airdrop from './svg/airdrop.svg' import nightly from './svg/nightly.svg' import airdropRainbow from './svg/airdropRainbow.svg' +import auditIcon from './svg/auditIcon.svg' const icons: { [key: string]: string } = { clear: clearIcon, @@ -101,7 +102,8 @@ const icons: { [key: string]: string } = { lockIcon, airdrop, nightly, - airdropRainbow + airdropRainbow, + auditIcon } export default icons diff --git a/src/static/svg/auditIcon.svg b/src/static/svg/auditIcon.svg new file mode 100644 index 00000000..9bbd9aaa --- /dev/null +++ b/src/static/svg/auditIcon.svg @@ -0,0 +1,3 @@ + + + From 44ebc8dddf9b501834d906ba0379cea9488e4f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Wo=C5=82odko?= Date: Sun, 29 Dec 2024 16:30:41 +0100 Subject: [PATCH 2/7] change opacity --- src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx b/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx index 9551dc4d..b129540b 100644 --- a/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx +++ b/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx @@ -9,6 +9,7 @@ export const AuditLabel = () => { width: '100%', justifyContent: 'center', margin: '20px 0', + opacity: 0.3, alignItems: 'center' }}> Shield From 816ea445cdc4ccaed61a1a7ee4d16672a0319aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Wo=C5=82odko?= Date: Mon, 30 Dec 2024 08:11:20 +0100 Subject: [PATCH 3/7] Change location --- src/pages/RootPage.tsx | 2 -- src/pages/SwapPage/SwapPage.tsx | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/RootPage.tsx b/src/pages/RootPage.tsx index 10d511a5..13c9c6f5 100644 --- a/src/pages/RootPage.tsx +++ b/src/pages/RootPage.tsx @@ -15,7 +15,6 @@ import { actions } from '@store/reducers/positions' import { NormalBanner } from './LeaderboardPage/components/LeaderboardBanner/NormalBanner' import { NetworkType } from '@store/consts/static' import { network } from '@store/selectors/solanaConnection' -import { AuditLabel } from './LeaderboardPage/components/AuditLabel/AuditLabel' const BANNER_STORAGE_KEY = 'invariant-banner-state' const BANNER_HIDE_DURATION = 1000 * 60 * 60 * 24 // 24 hours @@ -115,7 +114,6 @@ const RootPage: React.FC = memo(() => { - diff --git a/src/pages/SwapPage/SwapPage.tsx b/src/pages/SwapPage/SwapPage.tsx index 83884533..4c72f37f 100644 --- a/src/pages/SwapPage/SwapPage.tsx +++ b/src/pages/SwapPage/SwapPage.tsx @@ -2,6 +2,7 @@ import WrappedSwap from '@containers/WrappedSwap/WrappedSwap' import useStyles from './styles' import { Grid } from '@mui/material' import { useParams } from 'react-router-dom' +import { AuditLabel } from '@pages/LeaderboardPage/components/AuditLabel/AuditLabel' export const SwapPage: React.FC = () => { const { classes } = useStyles() @@ -13,6 +14,7 @@ export const SwapPage: React.FC = () => { return ( + ) } From 49ae405931b4d4cb5192795788682c8ca36884d0 Mon Sep 17 00:00:00 2001 From: kuba80-02 <55158958+kuba80-02@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:16:36 +0000 Subject: [PATCH 4/7] update --- src/containers/WrappedSwap/WrappedSwap.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/containers/WrappedSwap/WrappedSwap.tsx b/src/containers/WrappedSwap/WrappedSwap.tsx index ae215456..c0c51c71 100644 --- a/src/containers/WrappedSwap/WrappedSwap.tsx +++ b/src/containers/WrappedSwap/WrappedSwap.tsx @@ -43,6 +43,7 @@ import { getCurrentSolanaConnection } from '@utils/web3/connection' import { VariantType } from 'notistack' import { BN } from '@coral-xyz/anchor' import { useLocation } from 'react-router-dom' +import { AuditLabel } from '@pages/LeaderboardPage/components/AuditLabel/AuditLabel' type Props = { initialTokenFrom: string @@ -342,6 +343,7 @@ export const WrappedSwap = ({ initialTokenFrom, initialTokenTo }: Props) => { } return ( + <> { }} canNavigate={canNavigate} /> + + ) } From c27c6372531f6bbf3d876a3668d32306c7f0d321 Mon Sep 17 00:00:00 2001 From: kuba80-02 <55158958+kuba80-02@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:23:38 +0000 Subject: [PATCH 5/7] update --- src/pages/SwapPage/SwapPage.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/SwapPage/SwapPage.tsx b/src/pages/SwapPage/SwapPage.tsx index 4c72f37f..83884533 100644 --- a/src/pages/SwapPage/SwapPage.tsx +++ b/src/pages/SwapPage/SwapPage.tsx @@ -2,7 +2,6 @@ import WrappedSwap from '@containers/WrappedSwap/WrappedSwap' import useStyles from './styles' import { Grid } from '@mui/material' import { useParams } from 'react-router-dom' -import { AuditLabel } from '@pages/LeaderboardPage/components/AuditLabel/AuditLabel' export const SwapPage: React.FC = () => { const { classes } = useStyles() @@ -14,7 +13,6 @@ export const SwapPage: React.FC = () => { return ( - ) } From d732ca782116248731e80b4e1c047ca2a6b48190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Wo=C5=82odko?= Date: Mon, 30 Dec 2024 19:34:17 +0100 Subject: [PATCH 6/7] update --- src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx b/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx index b129540b..df07624e 100644 --- a/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx +++ b/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx @@ -9,7 +9,7 @@ export const AuditLabel = () => { width: '100%', justifyContent: 'center', margin: '20px 0', - opacity: 0.3, + opacity: 0.2, alignItems: 'center' }}> Shield From fdca17bbde98f747a36629aca21e7c93ca57eea3 Mon Sep 17 00:00:00 2001 From: Piotr Matlak Date: Fri, 3 Jan 2025 15:45:39 +0100 Subject: [PATCH 7/7] update audit label --- src/components/Swap/Swap.tsx | 2 ++ src/containers/WrappedSwap/WrappedSwap.tsx | 4 --- .../components/AuditLabel/AuditLabel.tsx | 21 ------------ src/static/icons.ts | 4 +-- src/static/svg/audit.svg | 33 +++++++++++++++++++ src/static/svg/auditIcon.svg | 3 -- 6 files changed, 37 insertions(+), 30 deletions(-) delete mode 100644 src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx create mode 100644 src/static/svg/audit.svg delete mode 100644 src/static/svg/auditIcon.svg diff --git a/src/components/Swap/Swap.tsx b/src/components/Swap/Swap.tsx index 2721a965..320f52a1 100644 --- a/src/components/Swap/Swap.tsx +++ b/src/components/Swap/Swap.tsx @@ -43,6 +43,7 @@ import { DECIMAL, fromFee, SimulationStatus } from '@invariant-labs/sdk-eclipse/ import { PoolWithAddress } from '@store/reducers/pools' import { PublicKey } from '@solana/web3.js' import { Tick, Tickmap } from '@invariant-labs/sdk-eclipse/lib/market' +import icons from '@static/icons' export interface Pools { tokenX: PublicKey @@ -992,6 +993,7 @@ export const Swap: React.FC = ({ /> )} + Audit ) } diff --git a/src/containers/WrappedSwap/WrappedSwap.tsx b/src/containers/WrappedSwap/WrappedSwap.tsx index c0c51c71..ae215456 100644 --- a/src/containers/WrappedSwap/WrappedSwap.tsx +++ b/src/containers/WrappedSwap/WrappedSwap.tsx @@ -43,7 +43,6 @@ import { getCurrentSolanaConnection } from '@utils/web3/connection' import { VariantType } from 'notistack' import { BN } from '@coral-xyz/anchor' import { useLocation } from 'react-router-dom' -import { AuditLabel } from '@pages/LeaderboardPage/components/AuditLabel/AuditLabel' type Props = { initialTokenFrom: string @@ -343,7 +342,6 @@ export const WrappedSwap = ({ initialTokenFrom, initialTokenTo }: Props) => { } return ( - <> { }} canNavigate={canNavigate} /> - - ) } diff --git a/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx b/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx deleted file mode 100644 index df07624e..00000000 --- a/src/pages/LeaderboardPage/components/AuditLabel/AuditLabel.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import { Box, Typography } from '@mui/material' -import { colors, typography } from '@static/theme' -import icons from '@static/icons' -export const AuditLabel = () => { - return ( - - Shield - - Audited by Sec3 - - - ) -} diff --git a/src/static/icons.ts b/src/static/icons.ts index e713f854..2dbfbebe 100644 --- a/src/static/icons.ts +++ b/src/static/icons.ts @@ -49,7 +49,7 @@ import lockIcon from './svg/lockIcon.svg' import airdrop from './svg/airdrop.svg' import nightly from './svg/nightly.svg' import airdropRainbow from './svg/airdropRainbow.svg' -import auditIcon from './svg/auditIcon.svg' +import audit from './svg/audit.svg' const icons: { [key: string]: string } = { clear: clearIcon, @@ -103,7 +103,7 @@ const icons: { [key: string]: string } = { airdrop, nightly, airdropRainbow, - auditIcon + audit } export default icons diff --git a/src/static/svg/audit.svg b/src/static/svg/audit.svg new file mode 100644 index 00000000..a0c3dc26 --- /dev/null +++ b/src/static/svg/audit.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/static/svg/auditIcon.svg b/src/static/svg/auditIcon.svg deleted file mode 100644 index 9bbd9aaa..00000000 --- a/src/static/svg/auditIcon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -