Code Review improvements

Author: dmernies-iohk

examples/wallet/app/actions/account.js

@@ -62,14 +62,6 @@ export function setKeysWithUnlockWalletPassword(
   return function setKeysWithUnlockWalletPasswordThunk(dispatch) {
     const accountKeys = readEncryptedAccountInfo(unlockWalletPassword);
     if (accountKeys) {
-      const unlockWalletPasswordKeys = {
-        unlockWalletPassword
-      };
-      dispatch({
-        type: SET_UNLOCK_WALLET_PASSWORD,
-        ...unlockWalletPasswordKeys
-      });
-
       return getAccountFromPrivateKey(accountKeys.privateKey).then(keys =>
         curry(initializeKeysAndRedirect)(dispatch, keys, unlockWalletPassword)
       );
@@ -94,8 +86,8 @@ export function setAccountFromPrivateKey(
       ])
         .then(() => dispatch(push(routes.WALLET)))
         .catch(error => {
-          console.log(error);
-          dispatch(push(routes.INPUT_KEYS));
+          console.error(error);
+          dispatch(push(routes.WALLET));
         });
     });
   };

examples/wallet/app/components/RestoreWalletFromMnemonic.js

@@ -42,17 +42,18 @@ export default ({ setAccountFromMnemonic }: Props) => {
     confirmation
   ) {
     if (!pass && !confirmation) return true;
-    if (pass.length < 8) {
-      setIsValidPassword(false);
-      return false;
-    }
-    setIsValidPassword(true);
-
     if (pass !== confirmation) {
       setArePasswordAndConfirmationEqual(false);
       return false;
     }
     setArePasswordAndConfirmationEqual(true);
+
+    if (!/^[0-9a-zA-Z]{8,}$/.test(password)) {
+      setIsValidPassword(false);
+      return false;
+    }
+
+    setIsValidPassword(true);
     return true;
   };
 
@@ -82,15 +83,17 @@ export default ({ setAccountFromMnemonic }: Props) => {
             onBlur={() => checkIsValidMnemonicPhrase()}
           />
           <Form.Label className="text-danger" hidden={isMnemonicValid}>
-            <code>The phrase can have 12, 15, 18, 21 or 24 valid words.</code>
+            <em className="text-danger">
+              The phrase can have 12, 15, 18, 21 or 24 valid words.
+            </em>
           </Form.Label>
           <Form.Text>
             Example:
             <br />
-            <code>
+            <em className="text-danger">
               decade panther require cruise robust mail gadget advice tonight
               post inner snack
-            </code>
+            </em>
           </Form.Text>
           <Form.Control
             type="password"
@@ -101,8 +104,10 @@ export default ({ setAccountFromMnemonic }: Props) => {
             className="mt-3"
           />
           <Form.Text>
-            This secret password is part of the BIP39 standard to generate safer
-            wallet seeds.
+            <em className="text-danger">
+              This secret password is part of the BIP39 standard to generate
+              safer wallet seeds.
+            </em>
           </Form.Text>
           <Form.Label className="mt-5">Unlock wallet (optional):</Form.Label>
           <Form.Group>
@@ -116,7 +121,9 @@ export default ({ setAccountFromMnemonic }: Props) => {
               onChange={event => setPassword(event.target.value)}
             />
             <Form.Label className="text-danger" hidden={isValidPassword}>
-              <code>The password must have at least 8 chars.</code>
+              <em className="text-danger">
+                The password must have at least 8 chars.
+              </em>
             </Form.Label>
             <Form.Control
               type="password"
@@ -128,14 +135,18 @@ export default ({ setAccountFromMnemonic }: Props) => {
               className="mt-3"
             />
             <Form.Text>
-              This key allows you to unlock your wallet every time you start it
-              and to keep your account data in a more secure way.
+              <em className="text-danger">
+                This key allows you to unlock your wallet every time you start
+                it and to keep your account data in a more secure way.
+              </em>
             </Form.Text>
             <Form.Label
               className="text-danger"
               hidden={arePasswordAndConfirmationEqual}
             >
-              <code>password and confirmation must be the same.</code>
+              <em className="text-danger">
+                password and confirmation must be the same.
+              </em>
             </Form.Label>
           </Form.Group>
         </Form.Group>

examples/wallet/app/components/RestoreWalletFromPrivateKey.js

@@ -66,11 +66,11 @@ export default ({ setAccount }: Props) => {
           <Form.Text>
             It&apos;s a string like:
             <br />
-            <code>
+            <em className="text-danger">
               ed25519e_sk15psr45hyqnpwcl8xd4lv0m32prenhh8kcltgte2305h5jgynndxect9274j0am0qmmd0snjuadnm6xkgssnkn2njvkg8et8qg0vevsgnwvmpl
-            </code>
+            </em>
           </Form.Text>
-          <Form.Group>
+          <Form.Group className="mt-3">
             <Form.Control
               type="password"
               id="password"
@@ -80,8 +80,10 @@ export default ({ setAccount }: Props) => {
               isInvalid={!isValidPassword}
               onChange={event => setPassword(event.target.value)}
             />
-            <Form.Label className="text-danger" hidden={isValidPassword}>
-              <code>The password must have at least 8 chars.</code>
+            <Form.Label º hidden={isValidPassword}>
+              <em className="text-danger">
+                The password must have at least 8 chars.
+              </em>
             </Form.Label>
             <Form.Control
               type="password"
@@ -96,7 +98,9 @@ export default ({ setAccount }: Props) => {
               className="text-danger"
               hidden={arePasswordAndConfirmationEqual}
             >
-              <code>Password and confirmation must be the same.</code>
+              <em className="text-danger">
+                Password and confirmation must be the same.
+              </em>
             </Form.Label>
           </Form.Group>
         </Form.Group>

examples/wallet/app/reducers/account.js

@@ -1,7 +1,6 @@
 // @flow
 import sortBy from 'lodash/sortBy';
 import {
-  SET_UNLOCK_WALLET_PASSWORD,
   SET_KEYS,
   SET_ACCOUNT_STATE,
   SEND_TRANSACTION,
@@ -13,7 +12,6 @@ import type {
   SendTransactionAction,
   SetAccountStateAction,
   SetTransactionsAction,
-  SetKeysWithUnlockWalletPasswordAction,
   SendStakeDelegation
 } from '../actions/account';
 import type { Account } from './types';
@@ -23,7 +21,6 @@ export default function account(
   state: Account,
   // eslint-disable-next-line flowtype/space-after-type-colon
   action:
-    | SetKeysWithUnlockWalletPasswordAction
     | SetKeysAction
     | SetAccountStateAction
     | SendTransactionAction
@@ -34,10 +31,6 @@ export default function account(
     return { transactions: [] };
   }
   switch (action.type) {
-    case SET_UNLOCK_WALLET_PASSWORD:
-      return Object.assign({}, state, {
-        unlockWalletPassword: action.unlockWalletPassword
-      });
     case SET_KEYS:
       return Object.assign({}, state, {
         address: action.address,