From 8bb6e9afd5fb23ac8df23d4c71afc312d58d7889 Mon Sep 17 00:00:00 2001 From: nguyentiendung Date: Wed, 3 Jul 2024 14:30:52 +0700 Subject: [PATCH 1/4] [Issue-222] Remove the logic that differentiates between Native tokens and Local tokens in case show sub-logo --- .../src/components/TokenItem/TokenBalanceDetailItem.tsx | 2 +- .../src/components/TokenItem/TokenBalanceSelectionItem.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx index 6749a4e41ad..0f05688b012 100644 --- a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx +++ b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx @@ -38,7 +38,7 @@ function Component ( convertedBalanceValue={total.convertedValue} decimal={0} displayToken={symbol} - isShowSubLogo={!!chain && !slug.includes('NATIVE')} + isShowSubLogo={true} middleItem={ ( <> diff --git a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx index da74d366369..19cb3702fc8 100644 --- a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx +++ b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx @@ -40,7 +40,7 @@ function Component ( convertedBalanceValue={total.convertedValue} decimal={0} displayToken={symbol} - isShowSubLogo={!!chain && !slug.includes('NATIVE')} + isShowSubLogo={true} middleItem={ ( <> From 6a38725abea75d488e8143506c2b0a268ac93c30 Mon Sep 17 00:00:00 2001 From: nguyentiendung Date: Wed, 3 Jul 2024 19:50:25 +0700 Subject: [PATCH 2/4] [Issue-222] Update shadow for sublogo --- .../src/components/TokenItem/TokenBalanceDetailItem.tsx | 4 ++++ .../src/components/TokenItem/TokenBalanceSelectionItem.tsx | 3 +++ 2 files changed, 7 insertions(+) diff --git a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx index 0f05688b012..4cbf342db93 100644 --- a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx +++ b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx @@ -111,6 +111,10 @@ export const TokenBalanceDetailItem = styled(Component)(({ theme: { token padding: 12 }, + '.-sub-logo .ant-image-img': { + boxShadow: '-2px 0px 4px 0px rgba(0, 0, 0, .45)' + }, + '.ant-number .ant-typography': { fontSize: 'inherit !important', lineHeight: 'inherit' diff --git a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx index 19cb3702fc8..0a20df948bb 100644 --- a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx +++ b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx @@ -122,6 +122,9 @@ export const TokenBalanceSelectionItem = styled(Component)(({ theme: { to '.ant-web3-block': { padding: 12 }, + '.-sub-logo .ant-image-img': { + boxShadow: '-2px 0px 4px 0px rgba(0, 0, 0, .45)' + }, '.ant-number .ant-typography': { fontSize: 'inherit !important', From 7dd4cb1131cc108b37699557b5a2a3297ee048ee Mon Sep 17 00:00:00 2001 From: nguyentiendung Date: Thu, 4 Jul 2024 18:32:08 +0700 Subject: [PATCH 3/4] [Issue-222] Improve UI for sublogo --- .../src/components/TokenItem/TokenBalanceDetailItem.tsx | 4 ---- .../src/components/TokenItem/TokenBalanceSelectionItem.tsx | 3 --- packages/extension-koni/public/main.css | 4 ++++ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx index 4cbf342db93..0f05688b012 100644 --- a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx +++ b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceDetailItem.tsx @@ -111,10 +111,6 @@ export const TokenBalanceDetailItem = styled(Component)(({ theme: { token padding: 12 }, - '.-sub-logo .ant-image-img': { - boxShadow: '-2px 0px 4px 0px rgba(0, 0, 0, .45)' - }, - '.ant-number .ant-typography': { fontSize: 'inherit !important', lineHeight: 'inherit' diff --git a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx index 0a20df948bb..19cb3702fc8 100644 --- a/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx +++ b/packages/extension-koni-ui/src/components/TokenItem/TokenBalanceSelectionItem.tsx @@ -122,9 +122,6 @@ export const TokenBalanceSelectionItem = styled(Component)(({ theme: { to '.ant-web3-block': { padding: 12 }, - '.-sub-logo .ant-image-img': { - boxShadow: '-2px 0px 4px 0px rgba(0, 0, 0, .45)' - }, '.ant-number .ant-typography': { fontSize: 'inherit !important', diff --git a/packages/extension-koni/public/main.css b/packages/extension-koni/public/main.css index 6e85e1467c7..379cdd37358 100644 --- a/packages/extension-koni/public/main.css +++ b/packages/extension-koni/public/main.css @@ -576,6 +576,10 @@ div#popup-container { max-width: calc(390px - 48px); } +.-sub-logo .ant-image-img { + box-shadow: -2px 0px 4px 0px rgba(0, 0, 0, .45) +} + /* slick */ .slick-list,.slick-slider,.slick-track{position:relative;display:block}.slick-loading .slick-slide,.slick-loading .slick-track{visibility:hidden}.slick-slider{box-sizing:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-touch-callout:none;-khtml-user-select:none;-ms-touch-action:pan-y;touch-action:pan-y;-webkit-tap-highlight-color:transparent}.slick-list{overflow:hidden;margin:0;padding:0}.slick-list:focus{outline:0}.slick-list.dragging{cursor:pointer;cursor:hand}.slick-slider .slick-list,.slick-slider .slick-track{-webkit-transform:translate3d(0,0,0);-moz-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.slick-track{top:0;left:0}.slick-track:after,.slick-track:before{display:table;content:''}.slick-track:after{clear:both}.slick-slide{display:none;float:left;height:100%;min-height:1px}[dir=rtl] .slick-slide{float:right}.slick-slide img{display:block}.slick-slide.slick-loading img{display:none}.slick-slide.dragging img{pointer-events:none}.slick-initialized .slick-slide{display:block}.slick-vertical .slick-slide{display:block;height:auto;border:1px solid transparent}.slick-arrow.slick-hidden{display:none} From 05f727bc79622e4c043e06e0ed9118c06b8b1bf8 Mon Sep 17 00:00:00 2001 From: nguyentiendung Date: Fri, 5 Jul 2024 15:48:40 +0700 Subject: [PATCH 4/4] [Issue-222] Improve UI for sub-logo --- packages/extension-koni/public/main.css | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/extension-koni/public/main.css b/packages/extension-koni/public/main.css index 379cdd37358..0dd84dbe288 100644 --- a/packages/extension-koni/public/main.css +++ b/packages/extension-koni/public/main.css @@ -576,8 +576,23 @@ div#popup-container { max-width: calc(390px - 48px); } +.ant-logo .-sub-logo { + right: 2.5%; + bottom: 0.5%; +} + +.-sub-logo .ant-image { + box-shadow: -2px 0px 4px 0px rgba(0, 0, 0, .45); + border-radius: 100%; + overflow: hidden; + position: absolute; + right: -2.5%; + bottom: 0; +} + .-sub-logo .ant-image-img { - box-shadow: -2px 0px 4px 0px rgba(0, 0, 0, .45) + display: block; + transform: scale(1.08); } /* slick */