diff --git a/src/pages/Dashboard/ConsensusUptime/ConsensusUptimeCard.tsx b/src/pages/Dashboard/ConsensusUptime/ConsensusUptimeCard.tsx index 186f63e6..33423f60 100644 --- a/src/pages/Dashboard/ConsensusUptime/ConsensusUptimeCard.tsx +++ b/src/pages/Dashboard/ConsensusUptime/ConsensusUptimeCard.tsx @@ -47,9 +47,10 @@ const ConsensusUptimeCard = () => { variant="$2" style={{ borderRadius: '16px', + width: '48%', }} > - + Consensus Uptime @@ -70,7 +71,7 @@ const ConsensusUptimeCard = () => { display: 'flex', justifyContent: 'center', alignItems: 'center', - width: '228px', + width: '100%', height: '100%', }} > diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx index f7e8e140..8d728ed9 100644 --- a/src/pages/Dashboard/Dashboard.tsx +++ b/src/pages/Dashboard/Dashboard.tsx @@ -1,7 +1,7 @@ import { XStack, YStack } from 'tamagui' import LeftSidebar from './LeftSidebar' -import RightSidebar from './RightSidebar' +import RightSidebar from './RightSideBar/RightSidebar' import BasicInfoCards from './BasicInfoCards/BasicInfoCards' import AddCardsContainer from '../../components/General/AddCards/AddCardsContainer' import BalanceChartCard from './BalanceChartCard/BalanceChartCard' @@ -23,8 +23,8 @@ const Dashboard = () => { - - + + @@ -32,15 +32,15 @@ const Dashboard = () => { - - + + - + diff --git a/src/pages/Dashboard/DeviceUptime/DeviceUptime.tsx b/src/pages/Dashboard/DeviceUptime/DeviceUptime.tsx index 62cd62fc..e74ab069 100644 --- a/src/pages/Dashboard/DeviceUptime/DeviceUptime.tsx +++ b/src/pages/Dashboard/DeviceUptime/DeviceUptime.tsx @@ -103,7 +103,7 @@ const DeviceUptime = () => { borderRadius: '16px', }} > - + @@ -160,7 +160,7 @@ const DeviceUptime = () => { display: 'flex', justifyContent: 'center', alignItems: 'center', - width: '504px', + width: '100%', height: '100%', }} > diff --git a/src/pages/Dashboard/ExecutionUptime/ExecutionUptime.tsx b/src/pages/Dashboard/ExecutionUptime/ExecutionUptime.tsx index 8aade023..988f0b16 100644 --- a/src/pages/Dashboard/ExecutionUptime/ExecutionUptime.tsx +++ b/src/pages/Dashboard/ExecutionUptime/ExecutionUptime.tsx @@ -48,9 +48,10 @@ const ExecutionUptime = () => { variant="$2" style={{ borderRadius: '16px', + width: '48%', }} > - + Execution Uptime @@ -71,7 +72,7 @@ const ExecutionUptime = () => { display: 'flex', justifyContent: 'center', alignItems: 'center', - width: '228px', + width: '100%', height: '100%', }} > diff --git a/src/pages/Dashboard/RightSideBar/RightSidebar.tsx b/src/pages/Dashboard/RightSideBar/RightSidebar.tsx new file mode 100644 index 00000000..3457612c --- /dev/null +++ b/src/pages/Dashboard/RightSideBar/RightSidebar.tsx @@ -0,0 +1,51 @@ +import { Avatar, Tabs, Text } from '@status-im/components' +import { XStack, YStack } from 'tamagui' +import ValidatorListItem from './ValidatorListItem' +// import { NodeIcon } from '@status-im/icons' + +const RightSidebar = () => { + return ( + + + + + + Etherium Mainnet + + 0xb9d...c35 + + + + + + + Active + + + Pending + + + Inactive + + + + + + + + + + + + + + + ) +} + +export default RightSidebar diff --git a/src/pages/Dashboard/RightSideBar/ValidatorListItem.tsx b/src/pages/Dashboard/RightSideBar/ValidatorListItem.tsx new file mode 100644 index 00000000..2534307d --- /dev/null +++ b/src/pages/Dashboard/RightSideBar/ValidatorListItem.tsx @@ -0,0 +1,44 @@ +import { XStack, YStack } from 'tamagui' +import { Avatar, Checkbox, Text } from '@status-im/components' +import { VerifiedIcon, ContactIcon } from '@status-im/icons' + +const ValidatorListItem = () => { + return ( + + + + + + Validator 1 + + + Validator 1 + + + + + ) +} + +export default ValidatorListItem diff --git a/src/pages/Dashboard/RightSidebar.tsx b/src/pages/Dashboard/RightSidebar.tsx deleted file mode 100644 index c1b5b0ee..00000000 --- a/src/pages/Dashboard/RightSidebar.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { SidebarMembers } from '@status-im/components' -import { YStack } from 'tamagui' - -const RightSidebar = () => { - return ( - - - - ) -} - -export default RightSidebar