From bd1d88e9e847108edc6efa8f3da86f20eb6cea48 Mon Sep 17 00:00:00 2001 From: fmtabbara Date: Wed, 7 Dec 2022 10:40:43 +0000 Subject: [PATCH 1/4] fix display mnemonic bug --- nym-wallet/src/components/textfields.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nym-wallet/src/components/textfields.tsx b/nym-wallet/src/components/textfields.tsx index 085ede1ab3..1b0224c134 100644 --- a/nym-wallet/src/components/textfields.tsx +++ b/nym-wallet/src/components/textfields.tsx @@ -10,17 +10,17 @@ export const MnemonicInput: React.FC<{ error?: string; onUpdateMnemonic: (mnemonic: string) => void; }> = ({ mnemonic, error, onUpdateMnemonic }) => { - const [showPassword, setShowPassword] = useState(false); + const [showMnemonic, setShowMnemonic] = useState(false); return ( onUpdateMnemonic(e.target.value)} - multiline autoFocus fullWidth + multiline={showMnemonic} inputProps={{ style: { height: '160px', @@ -34,7 +34,7 @@ export const MnemonicInput: React.FC<{ }} /> setShowPassword((show) => !show)} />} + control={ setShowMnemonic((show) => !show)} />} label="Reveal my mnemonic" /> {error && } From c534c4b91db260b002a7a77cc0c18b55dc622063 Mon Sep 17 00:00:00 2001 From: fmtabbara Date: Fri, 9 Dec 2022 10:28:49 +0000 Subject: [PATCH 2/4] remove fixed height for mnemonic input --- nym-wallet/src/components/textfields.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nym-wallet/src/components/textfields.tsx b/nym-wallet/src/components/textfields.tsx index 1b0224c134..afcbcfedb7 100644 --- a/nym-wallet/src/components/textfields.tsx +++ b/nym-wallet/src/components/textfields.tsx @@ -21,11 +21,6 @@ export const MnemonicInput: React.FC<{ autoFocus fullWidth multiline={showMnemonic} - inputProps={{ - style: { - height: '160px', - }, - }} InputLabelProps={{ shrink: true }} sx={{ 'input::-webkit-textfield-decoration-container': { From 2ec56164537e5b6747702d579389f961ddf6071a Mon Sep 17 00:00:00 2001 From: fmtabbara Date: Fri, 9 Dec 2022 13:07:59 +0000 Subject: [PATCH 3/4] text update --- .../bonding/node-settings/settings-pages/NodeUnbondPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx b/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx index f576afccd9..535b68f6e5 100644 --- a/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx +++ b/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx @@ -26,7 +26,7 @@ export const NodeUnbondPage = ({ bondedNode, onConfirm, onError }: Props) => { {isMixnode(bondedNode) && ( theme.palette.nym.text.muted }}> - If you unbond you will loose all delegations! + If you unbond you will lose all delegations! )} From 7a52124d53c85c9484f557303e79c9329f112ff4 Mon Sep 17 00:00:00 2001 From: fmtabbara Date: Fri, 9 Dec 2022 13:29:06 +0000 Subject: [PATCH 4/4] content updates --- .../settings-pages/NodeUnbondPage.tsx | 51 ++++++++----------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx b/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx index 535b68f6e5..a1fb0ea3fe 100644 --- a/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx +++ b/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { Box, Button, Typography, Grid, TextField } from '@mui/material'; +import { Box, Button, Typography, Grid, TextField, Stack } from '@mui/material'; import { TBondedMixnode, TBondedGateway } from 'src/context/bonding'; import { Error } from 'src/components/Error'; import { UnbondModal } from 'src/components/Bonding/modals/UnbondModal'; @@ -15,38 +15,31 @@ export const NodeUnbondPage = ({ bondedNode, onConfirm, onError }: Props) => { const [isConfirmed, setIsConfirmed] = useState(false); //TODO: Check what happens with a gateway return ( - - - - + + + + Unbond - - {isMixnode(bondedNode) && ( - - theme.palette.nym.text.muted }}> - If you unbond you will lose all delegations! - - - )} + + {isMixnode(bondedNode) && ( + + theme.palette.nym.text.muted }}> + Remember you should only unbond if you want to remove your node from the network for good. + + + )} + - - - - - + + - - + To unbond, type{' '} t.palette.nym.highlight }}> @@ -54,16 +47,14 @@ export const NodeUnbondPage = ({ bondedNode, onConfirm, onError }: Props) => { {' '} in the field below and click continue - - + setConfirmField(e.target.value)} InputLabelProps={{ shrink: true }} /> - - + - + {isConfirmed && (