diff --git a/.changelog/2327.trivial.md b/.changelog/2327.trivial.md new file mode 100644 index 0000000000..e323a67487 --- /dev/null +++ b/.changelog/2327.trivial.md @@ -0,0 +1 @@ +Reimplement mono fonts. diff --git a/src/app/components/Account/AccountLink.tsx b/src/app/components/Account/AccountLink.tsx index d2d0a0acc4..6ce68bc6d7 100644 --- a/src/app/components/Account/AccountLink.tsx +++ b/src/app/components/Account/AccountLink.tsx @@ -103,13 +103,15 @@ const AdaptivelyTrimmedAccountLink: FC< /> )} - + + + ) @@ -128,12 +130,12 @@ const TrimmedAccountLink: FC< {showAccountName ? ( - + {' '} {trimLongString(accountName, 12, 0)} ) : ( - trimLongString(address, 6, 6) + {trimLongString(address, 6, 6)} )} @@ -155,15 +157,15 @@ const DesktopAccountLink: FC< {showAccountName ? ( -
+
- ({address}) + ({address})
) : ( - address + {address} )} diff --git a/src/app/components/AdaptiveTrimmer/AdaptiveDynamicTrimmer.tsx b/src/app/components/AdaptiveTrimmer/AdaptiveDynamicTrimmer.tsx index 7b56327119..a49027b433 100644 --- a/src/app/components/AdaptiveTrimmer/AdaptiveDynamicTrimmer.tsx +++ b/src/app/components/AdaptiveTrimmer/AdaptiveDynamicTrimmer.tsx @@ -89,7 +89,7 @@ export const AdaptiveDynamicTrimmer: FC = ({ ) return ( - + - - - {trimLongString(hash)} - + + {trimLongString(hash)} ) @@ -39,7 +37,7 @@ export const BlockHashLink: FC<{ if (!isTablet) { // Desktop view return ( - + {hash} ) @@ -48,8 +46,8 @@ export const BlockHashLink: FC<{ // Mobile view return ( - - + + diff --git a/src/app/components/Link/index.tsx b/src/app/components/Link/index.tsx index 479c603fb9..24d9cce0aa 100644 --- a/src/app/components/Link/index.tsx +++ b/src/app/components/Link/index.tsx @@ -1,4 +1,4 @@ -import { FC, PropsWithChildren } from 'react' +import { FC } from 'react' import { Link as RouterLink } from 'react-router-dom' import { useScreenSize } from '../../hooks/useScreensize' import { Link as UilLink } from '@oasisprotocol/ui-library/src/components/link' @@ -86,10 +86,6 @@ type CustomTrimEndLinkLabelProps = { trimMode?: TrimMode } -const LinkLabel: FC = ({ children }) => ( - {children} -) - const CustomTrimEndLinkLabel: FC = ({ name, to, labelOnly, trimMode }) => { const label = trimMode === 'adaptive' ? ( @@ -98,7 +94,7 @@ const CustomTrimEndLinkLabel: FC = ({ name, to, lab ) return labelOnly ? ( - {label} + {label} ) : ( {label} @@ -119,17 +115,17 @@ const TabletLink: FC = ({ address, name, to, labelOnly, trimMod return } - const label = + const trimmedAddr = trimMode === 'adaptive' ? ( ) : ( trimLongString(address) ) return labelOnly ? ( - {label} + {trimmedAddr} ) : ( - - {label} + + {trimmedAddr} ) } @@ -146,20 +142,20 @@ const DesktopLink: FC = ({ address, name, to, alwaysTrim, trim {name ? ( ) : labelOnly ? ( - {trimLongString(address)} + {trimLongString(address)} ) : ( - + {trimLongString(address)} )} ) } - const label = name ? : address + const label = name ? : {address} return ( {labelOnly ? ( - {label} + {label} ) : ( {label} diff --git a/src/app/components/LongDataDisplay/index.tsx b/src/app/components/LongDataDisplay/index.tsx index 020e1ba0ff..6cb67ad562 100644 --- a/src/app/components/LongDataDisplay/index.tsx +++ b/src/app/components/LongDataDisplay/index.tsx @@ -36,11 +36,7 @@ export const LongDataDisplay: FC<{ data: string; fontWeight?: number; collapsedL
{eventName}
{t('runtimeEvent.fields.topics')}: - + {event.body.topics /* @ts-expect-error -- Event body is missing types */ .map((base64Topic, index) => { diff --git a/src/app/components/TableCellNode/index.tsx b/src/app/components/TableCellNode/index.tsx index b27c788292..d65bd43425 100644 --- a/src/app/components/TableCellNode/index.tsx +++ b/src/app/components/TableCellNode/index.tsx @@ -23,5 +23,5 @@ export const TableCellNode: FC = ({ id, scope }) => { return } - return {isTablet ? trimLongString(id) : id} + return {isTablet ? trimLongString(id) : id} } diff --git a/src/app/components/Transactions/TransactionLink.tsx b/src/app/components/Transactions/TransactionLink.tsx index 34a9bee706..04d52b71d2 100644 --- a/src/app/components/Transactions/TransactionLink.tsx +++ b/src/app/components/Transactions/TransactionLink.tsx @@ -15,7 +15,7 @@ const WithTypographyAndLink: FC<{ children: ReactNode; mobile?: boolean; to: str mobile, to, }) => ( - + {children} ) diff --git a/src/app/pages/ConsensusBlockDetailPage/index.tsx b/src/app/pages/ConsensusBlockDetailPage/index.tsx index 59a86fcd43..af7ef03c7a 100644 --- a/src/app/pages/ConsensusBlockDetailPage/index.tsx +++ b/src/app/pages/ConsensusBlockDetailPage/index.tsx @@ -114,11 +114,11 @@ export const ConsensusBlockDetailView: FC<{
{t('common.stateRoot')}
{isTablet ? ( - + ) : ( - {block.state_root} + {block.state_root} )}
diff --git a/src/app/pages/RoflAppDetailsPage/Enclaves.tsx b/src/app/pages/RoflAppDetailsPage/Enclaves.tsx index b11dca9df7..8ee49f8b25 100644 --- a/src/app/pages/RoflAppDetailsPage/Enclaves.tsx +++ b/src/app/pages/RoflAppDetailsPage/Enclaves.tsx @@ -20,7 +20,7 @@ export const Enclaves: FC = ({ policy }) => { {policy.enclaves.map((enclave: string) => ( - {enclave} + {enclave} diff --git a/src/app/pages/RoflAppDetailsPage/index.tsx b/src/app/pages/RoflAppDetailsPage/index.tsx index 2cb19f6c2b..3b0ebf47a8 100644 --- a/src/app/pages/RoflAppDetailsPage/index.tsx +++ b/src/app/pages/RoflAppDetailsPage/index.tsx @@ -127,7 +127,7 @@ export const RoflAppDetailsView: FC<{ - {app.id} + {app.id} @@ -168,7 +168,7 @@ export const RoflAppDetailsView: FC<{
} > - {app.sek} + {app.sek}
- + {instance.rak}
@@ -83,7 +83,7 @@ export const RoflAppInstanceDetailsView: FC<{
- + {instance.rek}
@@ -96,7 +96,7 @@ export const RoflAppInstanceDetailsView: FC<{
{t('rofl.endorsingNodeId')}
- + {instance.endorsing_node_id}
diff --git a/src/app/pages/RuntimeTransactionDetailPage/index.tsx b/src/app/pages/RuntimeTransactionDetailPage/index.tsx index 4cd7c29d93..8a9a0dceb3 100644 --- a/src/app/pages/RuntimeTransactionDetailPage/index.tsx +++ b/src/app/pages/RuntimeTransactionDetailPage/index.tsx @@ -430,7 +430,7 @@ export const RuntimeTransactionDetailView: FC<{ <>
{t('transactions.encryption.publicKey')}
- {envelope.public_key} + {envelope.public_key}
)} @@ -439,7 +439,7 @@ export const RuntimeTransactionDetailView: FC<{ <>
{t('transactions.encryption.dataNonce')}
- {envelope.data_nonce} + {envelope.data_nonce}
)} @@ -457,7 +457,7 @@ export const RuntimeTransactionDetailView: FC<{ <>
{t('transactions.encryption.resultNonce')}
- {envelope.result_nonce} + {envelope.result_nonce}
)} diff --git a/src/app/pages/ValidatorDetailsPage/index.tsx b/src/app/pages/ValidatorDetailsPage/index.tsx index 852fe64c37..967dbbffc6 100644 --- a/src/app/pages/ValidatorDetailsPage/index.tsx +++ b/src/app/pages/ValidatorDetailsPage/index.tsx @@ -262,9 +262,9 @@ export const ValidatorDetailsView: FC<{ )}
{t('validator.entityId')}
-
{validator.entity_id}
+
{validator.entity_id}
{t('common.nodeId')}
-
{validator.node_id}
+
{validator.node_id}
{validator.node_id && ( <>
{t('common.nodeAddress')}
diff --git a/src/styles/tailwind.css b/src/styles/tailwind.css index 43c7f19f2c..46505725ea 100644 --- a/src/styles/tailwind.css +++ b/src/styles/tailwind.css @@ -1,6 +1,7 @@ @import '@oasisprotocol/ui-library/src/styles/global.css'; @theme { + --font-mono: 'Roboto Mono Variable', monospace; --color-theme-surface: var(--color-theme-surface); --color-theme-accent: var(--color-theme-accent); --color-theme-accent-light: var(--color-theme-accent-light);