diff --git a/packages/extension-koni-ui/src/Popup/Confirmations/parts/ConfirmationHeader.tsx b/packages/extension-koni-ui/src/Popup/Confirmations/parts/ConfirmationHeader.tsx index 7a564bb664f..01e51757c54 100644 --- a/packages/extension-koni-ui/src/Popup/Confirmations/parts/ConfirmationHeader.tsx +++ b/packages/extension-koni-ui/src/Popup/Confirmations/parts/ConfirmationHeader.tsx @@ -6,6 +6,7 @@ import { Icon, SwSubHeader } from '@subwallet/react-ui'; import CN from 'classnames'; import { CaretRight } from 'phosphor-react'; import React from 'react'; +import { useTranslation } from 'react-i18next'; import styled from 'styled-components'; interface Props extends ThemeProps { @@ -17,6 +18,8 @@ interface Props extends ThemeProps { } function Component ({ className, index, numberOfConfirmations, onClickNext, onClickPrev, title }: Props) { + const { t } = useTranslation(); + return ( 0} - title={title} + title={ +
+
{t(title || '')}
+
Beta version
+
+ } /> ); } -const ConfirmationHeader = styled(Component)(({ theme }: ThemeProps) => { - return {}; +const ConfirmationHeader = styled(Component)(({ theme: { token } }: ThemeProps) => { + return { + '.__beta-version': { + color: token.colorTextTertiary, + fontSize: token.fontSizeSM, + lineHeight: token.lineHeightSM, + fontWeight: token.bodyFontWeight, + display: 'flex', + justifyContent: 'center', + alignItems: 'center' + }, + + '.__title-wrapper': { + fontSize: token.fontSizeXL, + lineHeight: token.lineHeightHeading4, + fontWeight: token.fontWeightStrong + + } + }; }); export default ConfirmationHeader; diff --git a/packages/extension-koni-ui/src/Popup/Confirmations/parts/Sign/Evm.tsx b/packages/extension-koni-ui/src/Popup/Confirmations/parts/Sign/Evm.tsx index cfbcb1dfc19..5884a09f83a 100644 --- a/packages/extension-koni-ui/src/Popup/Confirmations/parts/Sign/Evm.tsx +++ b/packages/extension-koni-ui/src/Popup/Confirmations/parts/Sign/Evm.tsx @@ -240,6 +240,7 @@ const Component: React.FC = (props: Props) => { return (
+ } >
{data && } @@ -104,6 +110,31 @@ export const HistoryDetailModal = styled(Component)(({ theme: { token } } marginBottom: 0 }, + '.__beta-version': { + color: token.colorTextTertiary, + fontSize: token.fontSizeSM, + lineHeight: token.lineHeightSM, + fontWeight: token.bodyFontWeight, + display: 'flex', + justifyContent: 'center', + alignItems: 'center' + }, + + '.__title-wrapper': { + fontSize: token.fontSizeXL, + lineHeight: token.lineHeightHeading4, + fontWeight: token.fontWeightStrong + + }, + + '.ant-sw-modal-header': { + borderBottomColor: token.colorBgSecondary + }, + + '.explorer-button': { + fontWeight: token.fontWeightStrong + }, + '.ant-sw-modal-footer': { border: 0 } diff --git a/packages/extension-koni-ui/src/Popup/Home/History/Detail/parts/Header.tsx b/packages/extension-koni-ui/src/Popup/Home/History/Detail/parts/Header.tsx index 615d33d372e..b50d8e787af 100644 --- a/packages/extension-koni-ui/src/Popup/Home/History/Detail/parts/Header.tsx +++ b/packages/extension-koni-ui/src/Popup/Home/History/Detail/parts/Header.tsx @@ -71,14 +71,17 @@ const Component: React.FC = (props: Props) => { /> ) : ( - + <> + + + + ) } diff --git a/packages/extension-koni-ui/src/Popup/Home/History/Detail/parts/Layout.tsx b/packages/extension-koni-ui/src/Popup/Home/History/Detail/parts/Layout.tsx index 13b134b8f36..70c6cae615f 100644 --- a/packages/extension-koni-ui/src/Popup/Home/History/Detail/parts/Layout.tsx +++ b/packages/extension-koni-ui/src/Popup/Home/History/Detail/parts/Layout.tsx @@ -29,7 +29,10 @@ const Component: React.FC = (props: Props) => { const isValidExtrinsicHash = data.extrinsicHash && data.extrinsicHash !== '' && !data.extrinsicHash.startsWith('internal.'); return ( - + = (props: Props) => { statusName={t(HistoryStatusMap[data.status].name)} valueColorSchema={HistoryStatusMap[data.status].schema} /> - {isValidExtrinsicHash && {toShort(data.extrinsicHash, 8, 9)}} + {isValidExtrinsicHash && {toShort(data.extrinsicHash, 8, 9)}} { !!data.time && ( {formatHistoryDate(data.time, language, 'detail')} diff --git a/packages/extension-koni-ui/src/Popup/TransactionDone.tsx b/packages/extension-koni-ui/src/Popup/TransactionDone.tsx index 3968c06c30b..e6289355345 100644 --- a/packages/extension-koni-ui/src/Popup/TransactionDone.tsx +++ b/packages/extension-koni-ui/src/Popup/TransactionDone.tsx @@ -104,6 +104,10 @@ const TransactionDone = styled(Component)(({ theme: { token } }: Props) = textAlign: 'center' }, + '.ant-btn-content-wrapper': { + fontWeight: token.fontWeightStrong + }, + '.and-more': { fontSize: token.fontSizeHeading5, lineHeight: token.lineHeightHeading5, diff --git a/packages/extension-koni-ui/src/components/MetaInfo/MetaInfo.tsx b/packages/extension-koni-ui/src/components/MetaInfo/MetaInfo.tsx index 1f23e9ce016..debbb8f2f22 100644 --- a/packages/extension-koni-ui/src/components/MetaInfo/MetaInfo.tsx +++ b/packages/extension-koni-ui/src/components/MetaInfo/MetaInfo.tsx @@ -41,7 +41,7 @@ const Component: React.FC = ({ children, className = '', const _MetaInfo = styled(Component)(({ theme: { token } }: Props) => { return ({ '& + .meta-info-block': { - marginTop: token.marginSM + marginTop: token.margin }, '.ant-number .ant-typography': { diff --git a/packages/extension-koni-ui/src/components/MetaInfo/parts/AccountItem.tsx b/packages/extension-koni-ui/src/components/MetaInfo/parts/AccountItem.tsx index 3700aad4f92..e1d7ea6e4e9 100644 --- a/packages/extension-koni-ui/src/components/MetaInfo/parts/AccountItem.tsx +++ b/packages/extension-koni-ui/src/components/MetaInfo/parts/AccountItem.tsx @@ -47,24 +47,11 @@ const Component: React.FC = (props: AccountInfoItem) => { return reformatAddress(accountAddress, addPrefix); }, [account, accountAddress, addressPrefix, chainInfoMap]); - const name = useMemo(() => { - const name = accountName || account?.name; - - return ( - <> -
-
{name} 
- ({toShort(address)}) -
- - ); - }, [account?.name, accountName, address]); - const isAll = useMemo(() => isAccountAll(address), [address]); return (
- {!!label &&
+ {!!label &&
{label}
@@ -86,13 +73,16 @@ const Component: React.FC = (props: AccountInfoItem) => { ) : ( <> - -
- {name || toShort(address)} +
+
+ + {accountName || account?.name} +
+ {toShort(address, 9, 9)}
) @@ -112,6 +102,35 @@ const AccountItem = styled(Component)(({ theme: { token } }: Ac overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' + }, + '.__account-transfer-name': { + display: 'flex', + gap: 8, + justifyContent: 'flex-end' + }, + '.-is-not-name': { + display: 'flex', + alignItems: 'center' + + }, + '.-is-account-name.__label-col': { + display: 'flow' + }, + '.__account-transfer-wrapper': { + overflow: 'hidden', + maxWidth: 204 + }, + '.__name': { + whiteSpace: 'nowrap', + overflow: 'hidden', + textOverflow: 'ellipsis', + color: token.colorTextLight2, + fontSize: token.fontSize, + fontWeight: token.fontWeightStrong + }, + '.__short-address': { + display: 'flex', + justifyContent: 'flex-end' } }; }); diff --git a/packages/extension-koni-ui/src/components/MetaInfo/parts/TransferItem.tsx b/packages/extension-koni-ui/src/components/MetaInfo/parts/TransferItem.tsx index 244dff1a64c..14a301e49ea 100644 --- a/packages/extension-koni-ui/src/components/MetaInfo/parts/TransferItem.tsx +++ b/packages/extension-koni-ui/src/components/MetaInfo/parts/TransferItem.tsx @@ -109,15 +109,15 @@ const Component: React.FC = (props: TransferInfoItem) => { } return ( -
+
-
{senderLabel || t('Sender')}
+
{senderLabel || t('From')}
{genAccountBlock(senderAddress, senderProxyId, senderName)} {!!originChain && genChainBlock(originChain)}
-
{recipientLabel || t('Recipient')}
+
{recipientLabel || t('To')}
{genAccountBlock(recipientAddress, recipientProxyId, recipientName)} {!!destinationChain && genChainBlock(destinationChain)}