diff --git a/nym-wallet/src/components/NymCard.tsx b/nym-wallet/src/components/NymCard.tsx index 81a2e71f45..0d481523fd 100644 --- a/nym-wallet/src/components/NymCard.tsx +++ b/nym-wallet/src/components/NymCard.tsx @@ -19,7 +19,8 @@ export const NymCard: React.FC<{ action={Action} sx={{ color: 'nym.background.dark', - padding: 2.5, + py: 2.5, + px: 4, borderBottom: (theme) => `1px solid ${theme.palette.grey[200]}`, }} /> diff --git a/nym-wallet/src/layouts/AppLayout.tsx b/nym-wallet/src/layouts/AppLayout.tsx index 8fc8e8b6ce..d65ad6fab0 100644 --- a/nym-wallet/src/layouts/AppLayout.tsx +++ b/nym-wallet/src/layouts/AppLayout.tsx @@ -20,7 +20,8 @@ export const ApplicationLayout: React.FC = ({ children }) => { sx={{ background: '#121726', overflow: 'auto', - p: [4, 5], + py: 4, + px: 5, }} > diff --git a/nym-wallet/src/routes/send/SendConfirmation.tsx b/nym-wallet/src/routes/send/SendConfirmation.tsx index 3fe488ab81..6604ed6803 100644 --- a/nym-wallet/src/routes/send/SendConfirmation.tsx +++ b/nym-wallet/src/routes/send/SendConfirmation.tsx @@ -1,17 +1,17 @@ import React, { useContext } from 'react' -import { Grid, Box, Card, CircularProgress, Link, Typography } from '@mui/material' +import { Box, CircularProgress, Link, Typography } from '@mui/material' import { SendError } from './SendError' -import { TauriTxResult } from '../../types/rust/tauritxresult' import { ClientContext, urls } from '../../context/main' import { SuccessReponse } from '../../components' import { TransactionDetails } from '../../components/TransactionDetails' +import { TransactionDetails as TTransactionDetails } from '../../types' export const SendConfirmation = ({ data, error, isLoading, }: { - data?: TauriTxResult['details'] + data?: TTransactionDetails & { tx_hash: string } error?: string isLoading: boolean }) => { @@ -35,7 +35,7 @@ export const SendConfirmation = ({ subtitle={ <> Check the transaction hash{' '} - + here diff --git a/nym-wallet/src/routes/send/SendReview.tsx b/nym-wallet/src/routes/send/SendReview.tsx index c1b436d57d..c3c6aca564 100644 --- a/nym-wallet/src/routes/send/SendReview.tsx +++ b/nym-wallet/src/routes/send/SendReview.tsx @@ -12,8 +12,10 @@ export const SendReview = ({ transferFee }: { transferFee?: string }) => { variant="outlined" sx={{ width: '100%', - p: [3, 2], - m: [3, 0], + py: 3, + px: 2, + my: 3, + mx: 0, }} > @@ -30,7 +32,7 @@ export const SendReview = ({ transferFee }: { transferFee?: string }) => { - + diff --git a/nym-wallet/src/routes/send/SendWizard.tsx b/nym-wallet/src/routes/send/SendWizard.tsx index 00263c0d91..239f723e65 100644 --- a/nym-wallet/src/routes/send/SendWizard.tsx +++ b/nym-wallet/src/routes/send/SendWizard.tsx @@ -7,7 +7,7 @@ import { SendReview } from './SendReview' import { SendConfirmation } from './SendConfirmation' import { ClientContext } from '../../context/main' import { validationSchema } from './validationSchema' -import { TauriTxResult } from '../../types' +import { TauriTxResult, TransactionDetails } from '../../types' import { getGasFee, majorToMinor, send } from '../../requests' import { checkHasEnoughFunds } from '../../utils' @@ -28,7 +28,7 @@ export const SendWizard = () => { const [isLoading, setIsLoading] = useState(false) const [requestError, setRequestError] = useState() const [transferFee, setTransferFee] = useState() - const [confirmedData, setConfirmedData] = useState() + const [confirmedData, setConfirmedData] = useState() const { userBalance } = useContext(ClientContext) @@ -80,12 +80,14 @@ export const SendWizard = () => { address: formState.to, memo: formState.memo, }) - .then((res: any) => { - const { details } = res as TauriTxResult + .then((res: TauriTxResult) => { + const { details, tx_hash } = res + setActiveStep((s) => s + 1) setConfirmedData({ ...details, amount: { denom: 'Major', amount: formState.amount }, + tx_hash, }) setIsLoading(false) userBalance.fetchBalance() @@ -119,7 +121,8 @@ export const SendWizard = () => { display: 'flex', justifyContent: 'center', alignItems: 'center', - p: [0, 3], + py: 0, + px: 3, }} > {activeStep === 0 ? ( diff --git a/nym-wallet/src/routes/undelegate/UndelegateForm.tsx b/nym-wallet/src/routes/undelegate/UndelegateForm.tsx index 1084452b7d..184993de46 100644 --- a/nym-wallet/src/routes/undelegate/UndelegateForm.tsx +++ b/nym-wallet/src/routes/undelegate/UndelegateForm.tsx @@ -71,7 +71,7 @@ export const UndelegateForm = ({ return ( - +