+
-
+
-
- {routesSchema.map((r, i) => (
-
-
+ {routesSchema.map(({ Icon, route, label }, i) => (
+
-
-
-
-
- }
- >
-
-
-
-
- )
-}
-enum EnumCopyState {
- copying,
- copySuccess,
-}
-
-export const AddressCard = () => {
- const { clientDetails } = useContext(ClientContext)
-
- const [copyState, setCopyState] = useState
- {getBalance.isLoading ? (
-
- {getBalance.error}
-
- ) : (
-
- {getBalance.balance?.printable_balance}
-
- )}
-
-
-
-
- {
- setCopyState(EnumCopyState.copying)
- await handleCopy({
- text: clientDetails?.client_address || '',
- cb: (isCopied) => {
- if (isCopied) {
- setCopyState(EnumCopyState.copySuccess)
- setTimeout(() => {
- setCopyState(undefined)
- }, 2500)
- }
- },
- })
- }}
- >
- {copyState === EnumCopyState.copying ? (
-
-
-
- }
- >
-
-
- {truncate(clientDetails?.client_address!, 35)}
-
-
-
-
- )
-}
diff --git a/nym-wallet/src/components/NoClientError.tsx b/nym-wallet/src/components/NoClientError.tsx
index cf65ae0904..305b91a579 100644
--- a/nym-wallet/src/components/NoClientError.tsx
+++ b/nym-wallet/src/components/NoClientError.tsx
@@ -1,6 +1,6 @@
import React from 'react'
import { Link } from 'react-router-dom'
-import { Alert, AlertTitle } from '@material-ui/lab'
+import { Alert, AlertTitle } from '@mui/material'
export const NoClientError = () => {
return (
diff --git a/nym-wallet/src/components/NodeTypeSelector.tsx b/nym-wallet/src/components/NodeTypeSelector.tsx
index e36432a637..cde20493af 100644
--- a/nym-wallet/src/components/NodeTypeSelector.tsx
+++ b/nym-wallet/src/components/NodeTypeSelector.tsx
@@ -1,11 +1,11 @@
+import React from 'react'
import {
FormControl,
FormControlLabel,
FormLabel,
Radio,
RadioGroup,
-} from '@material-ui/core'
-import React from 'react'
+} from '@mui/material'
import { EnumNodeType } from '../types/global'
export const NodeTypeSelector = ({
diff --git a/nym-wallet/src/components/NymCard.tsx b/nym-wallet/src/components/NymCard.tsx
index 162610b15b..6824cdc47a 100644
--- a/nym-wallet/src/components/NymCard.tsx
+++ b/nym-wallet/src/components/NymCard.tsx
@@ -1,5 +1,6 @@
import React from 'react'
-import { Card, CardContent, CardHeader, useTheme } from '@material-ui/core'
+import { Card, CardContent, CardHeader } from '@mui/material'
+import { styled } from '@mui/styles'
export const NymCard: React.FC<{
title: string
@@ -7,7 +8,6 @@ export const NymCard: React.FC<{
Action?: React.ReactNode
noPadding?: boolean
}> = ({ title, subheader, Action, noPadding, children }) => {
- const theme = useTheme()
return (
+
{status === EnumRequestStatus.loading && (
-
)}
{status === EnumRequestStatus.success && Success}
{status === EnumRequestStatus.error && Error}
-
+
)
}
diff --git a/nym-wallet/src/components/index.ts b/nym-wallet/src/components/index.ts
index e304e4a5f8..5e691f367b 100644
--- a/nym-wallet/src/components/index.ts
+++ b/nym-wallet/src/components/index.ts
@@ -4,7 +4,6 @@ export * from './Confirmation'
export * from './CopyToClipboard'
export * from './NymCard'
export * from './Nav'
-export * from './NavigationCards'
export * from './NodeTypeSelector'
export * from './RequestStatus'
export * from './NoClientError'
diff --git a/nym-wallet/src/context/main.tsx b/nym-wallet/src/context/main.tsx
index da14162777..3546335c93 100644
--- a/nym-wallet/src/context/main.tsx
+++ b/nym-wallet/src/context/main.tsx
@@ -1,14 +1,18 @@
import React, { createContext, useEffect, useState } from 'react'
import { useHistory } from 'react-router-dom'
import { TClientDetails, TSignInWithMnemonic } from '../types'
-import { TUseGetBalance, useGetBalance } from '../hooks/useGetBalance'
+import { TUseuserBalance, useGetBalance } from '../hooks/useGetBalance'
export const ADMIN_ADDRESS = 'punk1h3w4nj7kny5dfyjw2le4vm74z03v9vd4dstpu0'
+export const urls = {
+ blockExplorer: 'https://testnet-milhon-blocks.nymtech.net',
+}
type TClientContext = {
clientDetails?: TClientDetails
- getBalance: TUseGetBalance
+ userBalance: TUseuserBalance
showAdmin: boolean
+ mode: 'light' | 'dark'
handleShowAdmin: () => void
logIn: (clientDetails: TSignInWithMnemonic) => void
logOut: () => void
@@ -23,18 +27,27 @@ export const ClientContextProvider = ({
}) => {
const [clientDetails, setClientDetails] = useState
+
+
-
+
-
+
+
)
}
diff --git a/nym-wallet/src/layouts/ContentLayout.tsx b/nym-wallet/src/layouts/ContentLayout.tsx
index 627cea10a7..6029946222 100644
--- a/nym-wallet/src/layouts/ContentLayout.tsx
+++ b/nym-wallet/src/layouts/ContentLayout.tsx
@@ -1,19 +1,16 @@
import React from 'react'
-import { Grid, Theme, useTheme } from '@material-ui/core'
+import { Box, Grid } from '@mui/material'
export const Layout = ({ children }: { children: React.ReactElement }) => {
- const theme: Theme = useTheme()
-
return (
-
-
+ 
+
-
-
+
+
-
-
-
-
+
-
-
-
-
+
@@ -146,7 +143,7 @@ export const BondForm = ({
{`A fee of ${
watchNodeType === EnumNodeType.mixnode
? fees.mixnode.amount
- : fees.gateway.amount
+ : fees?.gateway?.amount
} PUNK will apply to this transaction`}
@@ -352,15 +349,15 @@ export const BondForm = ({
)}
-
-
+ `1px solid ${theme.palette.grey[200]}`,
+ bgcolor: (theme) => theme.palette.grey[50],
+ padding: 2,
}}
>
-
+
`1px solid ${theme.palette.grey[200]}`,
+ bgcolor: (theme) => theme.palette.grey[50],
+ padding: 2,
}}
>
-
+
+
@@ -126,15 +126,15 @@ export const DelegateForm = ({
/>
-
-
+ `1px solid ${theme.palette.grey[200]}`,
+ background: (theme) => theme.palette.grey[50],
+ padding: 2,
}}
>
-
+
`1px solid ${theme.palette.grey[200]}`,
+ background: (theme) => theme.palette.grey[50],
+ p: 2,
}}
>
-
+
-
-
-
+
+
+
+ theme.palette.grey[600] }}>
Recipient
-
-
- {data.to_address}
-
-
-
+
+
-
+
+
+
+ {data.to_address}
+
+
+
+
+
+ theme.palette.grey[600] }}>
Amount
-
-
- {data.amount.amount + ' punks'}
-
- {
}}
>
<>
-
+
An error occured during the request {message}
-
+
)
}
diff --git a/nym-wallet/src/routes/send/SendForm.tsx b/nym-wallet/src/routes/send/SendForm.tsx
index de4461bac3..50eeb63dde 100644
--- a/nym-wallet/src/routes/send/SendForm.tsx
+++ b/nym-wallet/src/routes/send/SendForm.tsx
@@ -1,5 +1,5 @@
import React from 'react'
-import { Grid, InputAdornment, TextField } from '@material-ui/core'
+import { Grid, InputAdornment, TextField } from '@mui/material'
import { useFormContext } from 'react-hook-form'
export const SendForm = () => {
diff --git a/nym-wallet/src/routes/send/SendReview.tsx b/nym-wallet/src/routes/send/SendReview.tsx
index b51edc1626..382d412e3b 100644
--- a/nym-wallet/src/routes/send/SendReview.tsx
+++ b/nym-wallet/src/routes/send/SendReview.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from 'react'
+import React, { useEffect, useState } from 'react'
import {
Card,
CircularProgress,
@@ -6,10 +6,8 @@ import {
Grid,
Theme,
Typography,
-} from '@material-ui/core'
-import { useTheme } from '@material-ui/styles'
+} from '@mui/material'
import { useFormContext } from 'react-hook-form'
-import { ClientContext } from '../../context/main'
import { getGasFee } from '../../requests'
export const SendReview = () => {
@@ -19,8 +17,6 @@ export const SendReview = () => {
const values = getValues()
- const theme: Theme = useTheme()
-
useEffect(() => {
const getFee = async () => {
const fee = await getGasFee('Send')
@@ -33,10 +29,10 @@ export const SendReview = () => {
return (
- Transaction failed
-
+
-
+
{steps.map((s, i) => (
@@ -112,13 +109,13 @@ export const SendWizard = () => {
))}
-
+
+
{activeStep === 0 ? (
@@ -132,21 +129,21 @@ export const SendWizard = () => {
error={requestError}
/>
)}
-
-
+ `1px solid ${theme.palette.grey[200]}`,
+ background: (theme) => theme.palette.grey[50],
+ p: 2,
}}
>
{activeStep === 1 && (
-
-
- )
-}
-
-const SignInContent = ({
- showCreateAccount,
-}: {
- showCreateAccount: () => void
-}) => {
- const [mnemonic, setMnemonic] = useState
- 
-
-
- {showCreateAccount ? (
- setShowCreateAccount(false)}
- />
- ) : (
- setShowCreateAccount(true)} />
- )}
-
-
- Wallet setup complete
-
-
-
-
+
+ Don't have an account?
+ {' '}
+
+ Create one now
+
+
+
+
@@ -113,15 +110,15 @@ export const UndelegateForm = ({
/>
-
-
+ `1px solid ${theme.palette.grey[200]}`,
+ background: (theme) => theme.palette.grey[50],
+ p: 2,
}}
>
-
+