From d53a6c1297b2d1b8c1ff901612a4682350cf7fd0 Mon Sep 17 00:00:00 2001 From: belopash Date: Tue, 2 Jul 2024 15:40:13 +0500 Subject: [PATCH] Revert "fix: apply 'tabular-nums' style only on some columns" This reverts commit 48ebd3d22245663828a0906f3504c8f7725f97ce. --- src/components/Table/DashboardTable.tsx | 4 ---- src/pages/DashboardPage/Workers.tsx | 10 ++++------ src/pages/DelegationsPage/DelegationsPage.tsx | 10 ++++------ src/pages/WorkersPage/WorkersPage.tsx | 14 ++++---------- 4 files changed, 12 insertions(+), 26 deletions(-) diff --git a/src/components/Table/DashboardTable.tsx b/src/components/Table/DashboardTable.tsx index 5cfac55..8b58d83 100644 --- a/src/components/Table/DashboardTable.tsx +++ b/src/components/Table/DashboardTable.tsx @@ -13,10 +13,6 @@ export const DashboardTableBase = styled(Table)(({ theme }) => ({ minHeight: theme.spacing(8), }, - '& td.numeric': { - fontVariantNumeric: 'tabular-nums', - }, - '& td:last-child, & th:last-child': { paddingRight: theme.spacing(0), }, diff --git a/src/pages/DashboardPage/Workers.tsx b/src/pages/DashboardPage/Workers.tsx index 74fdbdd..dc550bb 100644 --- a/src/pages/DashboardPage/Workers.tsx +++ b/src/pages/DashboardPage/Workers.tsx @@ -169,15 +169,13 @@ export function Workers() { - {percentFormatter(worker.uptime90Days)} - - {worker.apr != null ? percentFormatter(worker.apr) : '-'} - - + {percentFormatter(worker.uptime90Days)} + {worker.apr != null ? percentFormatter(worker.apr) : '-'} + {worker.stakerApr != null ? percentFormatter(worker.stakerApr) : '-'} {/*{formatSqd(worker.totalDelegations.capacity, 0)}*/} - + {dateFormat(worker.createdAt)} diff --git a/src/pages/DelegationsPage/DelegationsPage.tsx b/src/pages/DelegationsPage/DelegationsPage.tsx index 87f6592..9b2daa2 100644 --- a/src/pages/DelegationsPage/DelegationsPage.tsx +++ b/src/pages/DelegationsPage/DelegationsPage.tsx @@ -95,16 +95,14 @@ export function MyDelegations() { - + {worker.stakerApr != null ? percentFormatter(worker.stakerApr) : '-'} - + - - {tokenFormatter(fromSqd(worker.myDelegation), SQD_TOKEN)} - - + {tokenFormatter(fromSqd(worker.myDelegation), SQD_TOKEN)} + {tokenFormatter(fromSqd(worker.myTotalDelegationReward), SQD_TOKEN)} diff --git a/src/pages/WorkersPage/WorkersPage.tsx b/src/pages/WorkersPage/WorkersPage.tsx index 9d9fe59..ca642db 100644 --- a/src/pages/WorkersPage/WorkersPage.tsx +++ b/src/pages/WorkersPage/WorkersPage.tsx @@ -87,16 +87,10 @@ export function MyWorkers() { - - {percentFormatter(worker.uptime24Hours)} - - - {percentFormatter(worker.uptime90Days)} - - - {worker.apr != null ? percentFormatter(worker.apr) : '-'} - - + {percentFormatter(worker.uptime24Hours)} + {percentFormatter(worker.uptime90Days)} + {worker.apr != null ? percentFormatter(worker.apr) : '-'} + {tokenFormatter( fromSqd(worker.claimableReward).plus(fromSqd(worker.claimedReward)), SQD_TOKEN,