From f7486f0490c529592567100e6bbad6b785ff6239 Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Fri, 13 May 2022 12:22:19 +0100
Subject: [PATCH] add field validation for mnemonic and account name

---
 .../components/Accounts/AddAccountModal.tsx   | 122 +++++++++++++-----
 nym-wallet/src/context/accounts.tsx           |   2 +-
 nym-wallet/src/requests/account.ts            |   2 +-
 3 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/nym-wallet/src/components/Accounts/AddAccountModal.tsx b/nym-wallet/src/components/Accounts/AddAccountModal.tsx
index df9b4c25ed..3f3aec7b62 100644
--- a/nym-wallet/src/components/Accounts/AddAccountModal.tsx
+++ b/nym-wallet/src/components/Accounts/AddAccountModal.tsx
@@ -14,10 +14,12 @@ import {
 } from '@mui/material';
 import { ArrowBackSharp } from '@mui/icons-material';
 import { useClipboard } from 'use-clipboard-copy';
-import { createMnemonic } from 'src/requests';
+import { createMnemonic, validateMnemonic } from 'src/requests';
 import { AccountsContext } from 'src/context';
 import { PasswordInput } from 'src/components';
 import { Mnemonic } from '../Mnemonic';
+import { Console } from 'src/utils/console';
+import { match } from 'assert';
 
 const createAccountSteps = [
   'Copy and save mnemonic for your new account',
@@ -54,41 +56,81 @@ const ImportMnemonic = ({
   value: string;
   onChange: (value: string) => void;
   onNext: () => void;
-}) => (
-  <Box sx={{ mt: 1 }}>
-    <DialogContent>
-      <Stack spacing={2} alignItems="center">
-        <TextField
-          multiline
-          rows={3}
-          value={value}
-          onChange={(e) => onChange(e.target.value)}
-          fullWidth
-          type="password"
-        />
-      </Stack>
-    </DialogContent>
-    <DialogActions sx={{ p: 3, pt: 0 }}>
-      <Button
-        disabled={value.length === 0}
-        fullWidth
-        disableElevation
-        variant="contained"
-        size="large"
-        onClick={onNext}
-      >
-        Next
-      </Button>
-    </DialogActions>
-  </Box>
-);
+}) => {
+  const [error, setError] = useState<string>();
+
+  const handleOnNext = async () => {
+    const isValid = await validateMnemonic(value);
+    if (!isValid) setError('Please enter a valid mnemonic. Mnemonic must have a word count that is a multiple of 6.');
+    else onNext();
+  };
 
-const NameAccount = ({ onNext }: { onNext: (value: string) => void }) => {
-  const [value, setValue] = useState('');
   return (
     <Box sx={{ mt: 1 }}>
       <DialogContent>
-        <TextField value={value} onChange={(e) => setValue(e.target.value)} fullWidth />
+        <Stack spacing={2} alignItems="center">
+          {error && (
+            <Typography variant="body1" sx={{ color: 'error.main', mb: 2 }}>
+              {error}
+            </Typography>
+          )}
+          <TextField
+            multiline
+            placeholder="Mnemonic to import"
+            rows={3}
+            value={value}
+            onChange={(e) => {
+              onChange(e.target.value);
+              setError(undefined);
+            }}
+            fullWidth
+            type="password"
+          />
+        </Stack>
+      </DialogContent>
+      <DialogActions sx={{ p: 3, pt: 0 }}>
+        <Button
+          disabled={value.length === 0}
+          fullWidth
+          disableElevation
+          variant="contained"
+          size="large"
+          onClick={handleOnNext}
+        >
+          Next
+        </Button>
+      </DialogActions>
+    </Box>
+  );
+};
+
+const NameAccount = ({ onNext }: { onNext: (value: string) => void }) => {
+  const [value, setValue] = useState('');
+  const [error, setError] = useState<string>();
+
+  const nameValidation = /^([a-zA-Z0-9\s]){1,20}$/;
+
+  const handleNext = (value: string) => {
+    if (!nameValidation.test(value))
+      [setError('Account name must  contain only letters and numbers and be between 1 and 20 characters')];
+    else onNext(value);
+  };
+
+  return (
+    <Box sx={{ mt: 1 }}>
+      <DialogContent>
+        <Typography variant="body1" sx={{ color: 'error.main', mb: 2 }}>
+          {error}
+        </Typography>
+        <TextField
+          placeholder="Account name"
+          value={value}
+          onChange={(e) => {
+            setValue(e.target.value);
+            setError(undefined);
+          }}
+          fullWidth
+        />
       </DialogContent>
       <DialogActions sx={{ p: 3, pt: 0 }}>
         <Button
@@ -97,7 +139,7 @@ const NameAccount = ({ onNext }: { onNext: (value: string) => void }) => {
           disableElevation
           variant="contained"
           size="large"
-          onClick={() => onNext(value)}
+          onClick={() => handleNext(value)}
         >
           Next
         </Button>
@@ -158,6 +200,10 @@ export const AddAccountModal = () => {
 
   const handleClose = () => {
     setDialogToDisplay('Accounts');
+    resetState();
+  };
+
+  const resetState = () => {
     setData({ mnemonic: '', accountName: '' });
     setStep(0);
     setError(undefined);
@@ -165,7 +211,7 @@ export const AddAccountModal = () => {
 
   useEffect(() => {
     if (dialogToDisplay === 'Add') generateMnemonic();
-    if (dialogToDisplay === 'Accounts') setStep(0);
+    if (dialogToDisplay === 'Accounts') resetState();
   }, [dialogToDisplay]);
 
   useEffect(() => {
@@ -216,7 +262,13 @@ export const AddAccountModal = () => {
               <ConfirmPassword
                 onConfirm={async (password) => {
                   if (data.accountName && data.mnemonic) {
-                    await handleAddAccount({ accountName: data.accountName, mnemonic: data.mnemonic, password });
+                    try {
+                      await handleAddAccount({ accountName: data.accountName, mnemonic: data.mnemonic, password });
+                      setStep(0);
+                      setDialogToDisplay('Accounts');
+                    } catch (e) {
+                      Console.error(e as string);
+                    }
                   }
                 }}
               />
diff --git a/nym-wallet/src/context/accounts.tsx b/nym-wallet/src/context/accounts.tsx
index 53e7127124..51794db671 100644
--- a/nym-wallet/src/context/accounts.tsx
+++ b/nym-wallet/src/context/accounts.tsx
@@ -60,9 +60,9 @@ export const AccountsProvider: React.FC = ({ children }) => {
       });
       setAccounts((accs) => [...accs, newAccount]);
       enqueueSnackbar('New account created', { variant: 'success' });
-      setDialogToDisplay('Accounts');
     } catch (e) {
       setError(`Error adding account: ${e}`);
+      throw new Error();
     } finally {
       setIsLoading(false);
     }
diff --git a/nym-wallet/src/requests/account.ts b/nym-wallet/src/requests/account.ts
index bc85fe30ad..171776aef5 100644
--- a/nym-wallet/src/requests/account.ts
+++ b/nym-wallet/src/requests/account.ts
@@ -44,7 +44,7 @@ export const addAccount = async ({
   password: string;
   accountName: string;
 }) => {
-  const res: AccountEntry = await invoke('add_account_for_password', { mnemonic, password, innerId: accountName });
+  const res: AccountEntry = await invoke('add_account_for_password', { mnemonic, password, accountId: accountName });
   return res;
 };