diff --git a/tauri-wallet/package.json b/tauri-wallet/package.json index a6864d6a52..3da57e9d6f 100644 --- a/tauri-wallet/package.json +++ b/tauri-wallet/package.json @@ -15,6 +15,7 @@ "@material-ui/lab": "^4.0.0-alpha.60", "@material-ui/styles": "^4.11.4", "@types/react-dom": "^17.0.9", + "bs58": "^4.0.1", "clsx": "^1.1.1", "react": "^17.0.2", "react-dom": "^17.0.2", @@ -27,6 +28,7 @@ "@babel/preset-react": "^7.14.5", "@tauri-apps/api": "^1.0.0-beta.6", "@tauri-apps/cli": "^1.0.0-beta.9", + "@types/bs58": "^4.0.1", "@types/react-router-dom": "^5.1.8", "babel-loader": "^8.2.2", "css-loader": "^6.2.0", diff --git a/tauri-wallet/src/components/BalanceCard.tsx b/tauri-wallet/src/components/BalanceCard.tsx index b30caf8ef4..65116de259 100644 --- a/tauri-wallet/src/components/BalanceCard.tsx +++ b/tauri-wallet/src/components/BalanceCard.tsx @@ -25,13 +25,6 @@ const useStyles = makeStyles(({ spacing }) => ({ minWidth: 300, position: 'relative', }, - media: { - marginLeft: spacing(-7), - position: 'fixed', - }, - content: { - marginLeft: theme.spacing(4), - }, })) export const BalanceCard = React.memo(function BlogCard() { @@ -39,11 +32,7 @@ export const BalanceCard = React.memo(function BlogCard() { const { client } = useContext(ClientContext) return ( - } - className={styles.media} - /> - + { display: 'flex', alignItems: 'center', justifyContent: 'center', - marginTop: theme.spacing(10), + marginTop: theme.spacing(6), }} > diff --git a/tauri-wallet/src/components/NymCard.tsx b/tauri-wallet/src/components/NymCard.tsx index 57a2aabfc5..a73d0866dd 100644 --- a/tauri-wallet/src/components/NymCard.tsx +++ b/tauri-wallet/src/components/NymCard.tsx @@ -4,10 +4,12 @@ import { Card, CardContent, CardHeader, useTheme } from '@material-ui/core' export const NymCard = ({ title, subheader, + noPadding, children, }: { title: string subheader?: string + noPadding?: boolean children: React.ReactElement }) => { const theme = useTheme() @@ -26,7 +28,7 @@ export const NymCard = ({ {children} diff --git a/tauri-wallet/src/components/Page.tsx b/tauri-wallet/src/components/Page.tsx index 592a7e7fb8..198da00e08 100644 --- a/tauri-wallet/src/components/Page.tsx +++ b/tauri-wallet/src/components/Page.tsx @@ -1,6 +1,9 @@ import React from 'react' import { BalanceCard } from './BalanceCard' import { Nav } from './Nav' +import Logo from '../images/logo.png' +import { theme } from '../theme' +import { Divider } from '@material-ui/core' export const Page = ({ children }: { children: React.ReactElement }) => { return ( @@ -24,7 +27,23 @@ export const Page = ({ children }: { children: React.ReactElement }) => { borderBottomRightRadius: 10, }} > - +
+ +
+