diff --git a/nym-wallet/src/components/Nav.tsx b/nym-wallet/src/components/Nav.tsx index 5b2ee5377a..d2c2ec85a9 100644 --- a/nym-wallet/src/components/Nav.tsx +++ b/nym-wallet/src/components/Nav.tsx @@ -79,24 +79,41 @@ export const Nav = () => { {routesSchema.map((r, i) => ( - {r.Icon} - + + {r.Icon} + + ))} {clientDetails?.client_address === ADMIN_ADDRESS && ( - + - + )} - + - + diff --git a/nym-wallet/src/context/main.tsx b/nym-wallet/src/context/main.tsx index a2d1e18645..6ada386422 100644 --- a/nym-wallet/src/context/main.tsx +++ b/nym-wallet/src/context/main.tsx @@ -24,7 +24,7 @@ export const ClientContextProvider = ({ }) => { const [clientDetails, setClientDetails] = useState() const [showAdmin, setShowAdmin] = useState(false) - const [mode, setMode] = useState<'light' | 'dark'>('dark') + const [mode, setMode] = useState<'light' | 'dark'>('light') const history = useHistory() const getBalance = useGetBalance() diff --git a/nym-wallet/src/routes/sign-in/create-account.tsx b/nym-wallet/src/routes/sign-in/create-account.tsx index 0be09db914..e2028108b3 100644 --- a/nym-wallet/src/routes/sign-in/create-account.tsx +++ b/nym-wallet/src/routes/sign-in/create-account.tsx @@ -46,17 +46,30 @@ export const CreateAccountContent: React.FC<{ showSignIn: () => void }> = ({ return ( - Congratulations - Account setup complete! + + Congratulations + + + Account setup complete! + - + Please store your mnemonic in a safe place. You'll need it to access your account! - - - + + + {accountDetails?.mnemonic} @@ -64,8 +77,10 @@ export const CreateAccountContent: React.FC<{ showSignIn: () => void }> = ({ - Account address: - + + Account address: + + {accountDetails?.client_address} diff --git a/nym-wallet/src/routes/sign-in/index.tsx b/nym-wallet/src/routes/sign-in/index.tsx index b9b19b25cd..2605ae9ed1 100644 --- a/nym-wallet/src/routes/sign-in/index.tsx +++ b/nym-wallet/src/routes/sign-in/index.tsx @@ -13,6 +13,7 @@ export const SignIn = () => { display: 'flex', justifyContent: 'center', alignItems: 'center', + bgcolor: (theme) => theme.palette.nym.background.dark, }} > void }> = ({ showCreateAccount, @@ -41,10 +42,12 @@ export const SignInContent: React.FC<{ showCreateAccount: () => void }> = ({ return ( - Enter Mnemonic and sign in + + Enter Mnemonic and sign in + - ) => setMnemonic(e.target.value) @@ -60,7 +63,6 @@ export const SignInContent: React.FC<{ showCreateAccount: () => void }> = ({ autoComplete="mnemonic" autoFocus disabled={isLoading} - sx={{ color: 'red' }} /> @@ -79,14 +81,21 @@ export const SignInContent: React.FC<{ showCreateAccount: () => void }> = ({ {inputError && ( - + {inputError} )}
- Don't have an account?{' '} + + Don't have an account? + {' '} Create one now @@ -94,3 +103,25 @@ export const SignInContent: React.FC<{ showCreateAccount: () => void }> = ({ ) } + +const StyledInput = styled((props) => )( + ({ theme }) => ({ + '& input': { + color: theme.palette.nym.text.light, + }, + '& label': { + color: theme.palette.nym.text.light, + }, + '& label.Mui-focused': { + color: theme.palette.primary.main, + }, + '& .MuiOutlinedInput-root': { + '& fieldset': { + borderColor: theme.palette.common.white, + }, + '&:hover fieldset': { + borderColor: theme.palette.primary.main, + }, + }, + }), +) diff --git a/nym-wallet/src/theme/mui-theme.d.ts b/nym-wallet/src/theme/mui-theme.d.ts index 27f030e826..b945ab3fe4 100644 --- a/nym-wallet/src/theme/mui-theme.d.ts +++ b/nym-wallet/src/theme/mui-theme.d.ts @@ -34,9 +34,9 @@ declare module '@mui/material/styles' { */ interface NymPalette { highlight: string + background: { light: string; dark: string } text: { - nav: string - footer: string + light: string } } diff --git a/nym-wallet/src/theme/theme.tsx b/nym-wallet/src/theme/theme.tsx index c0a4ae2284..5e33dc2d83 100644 --- a/nym-wallet/src/theme/theme.tsx +++ b/nym-wallet/src/theme/theme.tsx @@ -21,10 +21,9 @@ import { const nymPalette: NymPalette = { /** emphasises important elements */ highlight: '#FB6E4E', + background: { light: '#FAFAFA', dark: '#121726' }, text: { - nav: '#F2F2F2', - /** footer text colour */ - footer: '#666B77', + light: '#F2F2F2', }, } @@ -65,7 +64,7 @@ const lightMode: NymPaletteVariant = { } /** - * Nym palette specific to the Network Explorer + * Nym palette specific to the Nym Wallet * * IMPORTANT: do not export this constant, always use the MUI `useTheme` hook to get the correct * colours for dark/light mode.