Compare commits

...

8 Commits

Author SHA1 Message Date
Gala efdb8adab8 improve typing 2022-08-09 15:05:22 +02:00
Gala e8632c3762 Merge branch 'develop' into 306-wallet-balance-ui 2022-08-09 14:59:51 +02:00
Gala fb0b928598 Merge branch '306-wallet-balance-ui' of github.com:nymtech/nym into 306-wallet-balance-ui 2022-08-05 13:30:44 +02:00
Gala e0e9d03b7f Merge branch 'develop' into 306-wallet-balance-ui 2022-08-05 13:29:32 +02:00
Gala 78ace473c7 balance page ui 2022-07-19 12:12:01 +02:00
Gala e877dfe224 buton hover bg and text 2022-07-19 12:12:01 +02:00
Gala 30c488484c balance page ui 2022-07-19 11:55:35 +02:00
Gala 8cd155b2ac buton hover bg and text 2022-07-18 17:53:28 +02:00
5 changed files with 26 additions and 6 deletions
@@ -6,7 +6,15 @@ import { AccountAvatar } from './AccountAvatar';
export const AccountOverview = ({ account, onClick }: { account: AccountEntry; onClick: () => void }) => ( export const AccountOverview = ({ account, onClick }: { account: AccountEntry; onClick: () => void }) => (
<Button <Button
startIcon={<AccountAvatar name={account.id} />} startIcon={<AccountAvatar name={account.id} />}
sx={{ color: 'text.primary' }} sx={{
color: 'text.primary',
'&:hover': (t) =>
t.palette.mode === 'dark'
? {
backgroundColor: 'rgba(255, 255, 255, 0.08)',
}
: {},
}}
onClick={onClick} onClick={onClick}
disableRipple disableRipple
> >
+10 -1
View File
@@ -40,7 +40,16 @@ export const NetworkSelector = () => {
<Button <Button
variant="text" variant="text"
color="primary" color="primary"
sx={{ color: 'text.primary' }} sx={{
color: 'text.primary',
fontSize: 14,
'&:hover': (t) =>
t.palette.mode === 'dark'
? {
backgroundColor: 'rgba(255, 255, 255, 0.08)',
}
: {},
}}
onClick={handleClick} onClick={handleClick}
disableElevation disableElevation
endIcon={<ArrowDropDown sx={{ color: (theme) => `1px solid ${theme.palette.text.primary}` }} />} endIcon={<ArrowDropDown sx={{ color: (theme) => `1px solid ${theme.palette.text.primary}` }} />}
+4 -2
View File
@@ -1,4 +1,5 @@
import React from 'react'; import React from 'react';
import { SxProps } from '@mui/material';
import { Box, Card, CardContent, CardHeader } from '@mui/material'; import { Box, Card, CardContent, CardHeader } from '@mui/material';
import { styled, Theme } from '@mui/material/styles'; import { styled, Theme } from '@mui/material/styles';
import { Title } from './Title'; import { Title } from './Title';
@@ -12,16 +13,17 @@ const CardContentNoPadding = styled(CardContent)(() => ({
export const NymCard: React.FC<{ export const NymCard: React.FC<{
title: string | React.ReactElement; title: string | React.ReactElement;
titleSx?: SxProps;
subheader?: string; subheader?: string;
Action?: React.ReactNode; Action?: React.ReactNode;
Icon?: React.ReactNode; Icon?: React.ReactNode;
noPadding?: boolean; noPadding?: boolean;
borderless?: boolean; borderless?: boolean;
dataTestid?: string; dataTestid?: string;
}> = ({ title, subheader, Action, Icon, noPadding, borderless, children, dataTestid }) => ( }> = ({ title, titleSx, subheader, Action, Icon, noPadding, borderless, children, dataTestid }) => (
<Card variant="outlined" sx={{ overflow: 'auto', ...(borderless && { border: 'none', dropShadow: 'none' }) }}> <Card variant="outlined" sx={{ overflow: 'auto', ...(borderless && { border: 'none', dropShadow: 'none' }) }}>
<CardHeader <CardHeader
sx={{ p: 3, color: (theme: Theme) => theme.palette.text.primary }} sx={{ p: 3, color: (theme: Theme) => theme.palette.text.primary, ...titleSx }}
title={<Title title={title} Icon={Icon} />} title={<Title title={title} Icon={Icon} />}
subheader={subheader} subheader={subheader}
data-testid={dataTestid || title} data-testid={dataTestid || title}
+2 -2
View File
@@ -39,12 +39,12 @@ export const ApplicationLayout: React.FC = ({ children }) => {
<Nav /> <Nav />
</Box> </Box>
{appVersion && ( {appVersion && (
<Box color="#888" ml={5} mt={8}> <Box color="#888" ml={5} mt={8} fontSize={14}>
Version {appVersion} Version {appVersion}
</Box> </Box>
)} )}
</Box> </Box>
<Container maxWidth="xl"> <Container maxWidth="xl" sx={{ px: { sm: 5 } }}>
<AppBar /> <AppBar />
<Box overflow="auto" sx={{ height: () => `calc(100% - ${theme.spacing(10)})` }}> <Box overflow="auto" sx={{ height: () => `calc(100% - ${theme.spacing(10)})` }}>
{children} {children}
+1
View File
@@ -14,6 +14,7 @@ export const BalanceCard = () => {
return ( return (
<NymCard <NymCard
title="Balance" title="Balance"
titleSx={{ fontSize: 20 }}
data-testid="check-balance" data-testid="check-balance"
borderless borderless
Action={<ClientAddress withCopy showEntireAddress />} Action={<ClientAddress withCopy showEntireAddress />}