Corrections by code review

Author: dmernies-iohk

examples/wallet/app/actions/account.js

@@ -39,8 +39,6 @@ import routes from '../constants/routes.json';
 
 export type SetKeysAction = { type: 'SET_KEYS' } & AccountKeys;
 export const SET_KEYS = 'SET_KEYS';
-export const SET_VALID_UNLOCK_WALLET_PASSWORD =
-  'SET_VALID_UNLOCK_WALLET_PASSWORD';
 
 export function setAccount(
   privateKey: string,
@@ -67,26 +65,6 @@ export function setKeysWithUnlockWalletPassword(
   };
 }
 
-export function setAccountFromPrivateKey(
-  privateKey: string
-): Thunk<SetKeysAction> {
-  return function setAccountFromPrivateKeyThunk(dispatch) {
-    return getAccountFromPrivateKey(privateKey).then(loadedPrivateKey => {
-      dispatch({
-        type: SET_KEYS,
-        ...loadedPrivateKey
-      });
-      return Promise.all([
-        dispatch(updateAccountTransactions()),
-        dispatch(updateNodeSettings()),
-        dispatch(updateAccountState())
-      ])
-        .catch(console.error)
-        .then(() => dispatch(push(routes.WALLET)));
-    });
-  };
-}
-
 /**
  * @dev This function is used to obtain the list of transactions, the balance
  * and the delegation of a given account after obtaining the public, private

examples/wallet/app/components/CreateUnlockWalletPassword.js

@@ -1,9 +1,14 @@
 // @flow
 import React, { useState } from 'react';
 import Form from 'react-bootstrap/Form';
+import PropTypes from 'prop-types';
 
-// eslint-disable-next-line react/prop-types
-export default ({ setValidUnlockWalletPassword }) => {
+CreateUnlockWalletPassword.propTypes = {
+  setValidCreateUnlockWalletPassword: PropTypes.func
+};
+export default function CreateUnlockWalletPassword({
+  setValidCreateUnlockWalletPassword
+}) {
   const checkValidUnlockWalletPassword = function checkValidUnlockWalletPassword(
     pass
   ) {
@@ -33,7 +38,10 @@ export default ({ setValidUnlockWalletPassword }) => {
       isValidUnlockPassword = false;
     }
 
-    setValidUnlockWalletPassword(unlockWalletPassword, isValidUnlockPassword);
+    setValidCreateUnlockWalletPassword(
+      unlockWalletPassword,
+      isValidUnlockPassword
+    );
     return isValidUnlockPassword;
   };
 
@@ -77,15 +85,13 @@ export default ({ setValidUnlockWalletPassword }) => {
           className="mt-3"
         />
         <Form.Text>
-          <span>
-            This key allows you to unlock your wallet every time you start it
-            and to keep your account data in a more secure way.
-          </span>
+          This key allows you to unlock your wallet every time you start it and
+          to keep your account data in a more secure way.
         </Form.Text>
         <Form.Control.Feedback type="invalid">
           password and confirmation must be the same.
         </Form.Control.Feedback>
       </Form.Group>
     </Form.Group>
   );
-};
+}

examples/wallet/app/components/RestoreWalletFromMnemonic.js

@@ -9,16 +9,10 @@ import { isValidMnemonic } from '../utils/mnemonic';
 import CreateUnlockWalletPassword from '../containers/CreateUnlockWalletPassword';
 
 type Props = {
-  setAccountFromMnemonic: SetAccountFromMnemonic,
-  unlockWalletPassword: string,
-  isValidUnlockPassword: boolean
+  setAccountFromMnemonic: SetAccountFromMnemonic
 };
 
-export default ({
-  setAccountFromMnemonic,
-  unlockWalletPassword,
-  isValidUnlockPassword
-}: Props) => {
+export default ({ setAccountFromMnemonic }: Props) => {
   const checkIsValidMnemonicPhrase = function checkIsValidMnemonicPhrase() {
     setIsMnemonicValid(isValidMnemonic(newMnemonicPhrase));
   };
@@ -38,6 +32,17 @@ export default ({
     setIsMnemonicValid(false);
   };
 
+  const setValidCreateUnlockWalletPassword = function setValidCreateUnlockWalletPassword(
+    unlockPwd: string,
+    isValid: boolean
+  ): void {
+    setUnlockWalletPassword(unlockPwd);
+    setIsValidUnlockPassword(isValid);
+  };
+
+  const [unlockWalletPassword, setUnlockWalletPassword] = useState('');
+  const [isValidUnlockPassword, setIsValidUnlockPassword] = useState(false);
+
   const [isMnemonicValid, setIsMnemonicValid] = useState(true);
 
   const [newMnemonicPhrase, setNewMnemonicPhrase] = useState('');
@@ -66,10 +71,8 @@ export default ({
           <Form.Text>
             Example:
             <br />
-            <span>
-              decade panther require cruise robust mail gadget advice tonight
-              post inner snack
-            </span>
+            decade panther require cruise robust mail gadget advice tonight post
+            inner snack
           </Form.Text>
           <Form.Control
             type="password"
@@ -80,12 +83,14 @@ export default ({
             className="mt-3"
           />
           <Form.Text>
-            <span>
-              This secret password is part of the BIP39 standard to generate
-              safer wallet seeds.
-            </span>
+            This secret password is part of the BIP39 standard to generate safer
+            wallet seeds.
           </Form.Text>
-          <CreateUnlockWalletPassword />
+          <CreateUnlockWalletPassword
+            setValidCreateUnlockWalletPassword={
+              setValidCreateUnlockWalletPassword
+            }
+          />
         </Form.Group>
         <Row className="justify-content-between">
           <Button variant="secondary" type="button">

examples/wallet/app/components/RestoreWalletFromPrivateKey.js

@@ -9,18 +9,12 @@ import CreateUnlockWalletPassword from '../containers/CreateUnlockWalletPassword
 import { getAccountFromPrivateKey } from '../utils/wasmWrapper';
 
 type Props = {
-  setAccount: SetAccount,
-  unlockWalletPassword: string,
-  isValidUnlockPassword: boolean
+  setAccount: SetAccount
 };
 
 // FIXME: this has no error handling, neither while parsing the address
 // nor when fetching the balance.
-export default ({
-  setAccount,
-  unlockWalletPassword,
-  isValidUnlockPassword
-}: Props) => {
+export default ({ setAccount }: Props) => {
   const handleSubmit = function handleSubmit(event) {
     event.preventDefault();
     if (isValidUnlockPassword) {
@@ -40,6 +34,17 @@ export default ({
       });
   };
 
+  const setValidCreateUnlockWalletPassword = function setValidCreateUnlockWalletPassword(
+    unlockPwd: string,
+    isValid: boolean
+  ): void {
+    setUnlockWalletPassword(unlockPwd);
+    setIsValidUnlockPassword(isValid);
+  };
+
+  const [unlockWalletPassword, setUnlockWalletPassword] = useState('');
+  const [isValidUnlockPassword, setIsValidUnlockPassword] = useState(false);
+
   const [newPrivateKey, setNewPrivateKey] = useState('');
   const [privateKeyErrorMessage, setPrivateKeyErrorMessage] = useState('');
 
@@ -63,11 +68,13 @@ export default ({
           <Form.Text>
             It&apos;s a string like:
             <br />
-            <span>
-              ed25519e_sk15psr45hyqnpwcl8xd4lv0m32prenhh8kcltgte2305h5jgynndxect9274j0am0qmmd0snjuadnm6xkgssnkn2njvkg8et8qg0vevsgnwvmpl
-            </span>
+            ed25519e_sk15psr45hyqnpwcl8xd4lv0m32prenhh8kcltgte2305h5jgynndxect9274j0am0qmmd0snjuadnm6xkgssnkn2njvkg8et8qg0vevsgnwvmpl
           </Form.Text>
-          <CreateUnlockWalletPassword />
+          <CreateUnlockWalletPassword
+            setValidCreateUnlockWalletPassword={
+              setValidCreateUnlockWalletPassword
+            }
+          />
         </Form.Group>
         <Row className="justify-content-center">
           <Button variant="primary" type="submit">

examples/wallet/app/containers/CreateUnlockWalletPassword.js

@@ -1,23 +1,5 @@
 // @flow
 import { connect } from 'react-redux';
 import CreateUnlockWalletPassword from '../components/CreateUnlockWalletPassword';
-import { SET_VALID_UNLOCK_WALLET_PASSWORD } from '../actions/account';
 
-function mapDispatchToProps(dispatch) {
-  return {
-    setValidUnlockWalletPassword: (
-      unlockWalletPassword: string,
-      isValidUnlockPassword: boolean
-    ) =>
-      dispatch({
-        type: SET_VALID_UNLOCK_WALLET_PASSWORD,
-        unlockWalletPassword,
-        isValidUnlockPassword
-      })
-  };
-}
-
-export default connect(
-  undefined,
-  mapDispatchToProps
-)(CreateUnlockWalletPassword);
+export default connect(undefined, undefined)(CreateUnlockWalletPassword);

examples/wallet/app/reducers/account.js

@@ -1,7 +1,6 @@
 // @flow
 import sortBy from 'lodash/sortBy';
 import {
-  SET_VALID_UNLOCK_WALLET_PASSWORD,
   SET_KEYS,
   SET_ACCOUNT_STATE,
   SEND_TRANSACTION,
@@ -32,11 +31,6 @@ export default function account(
     return { transactions: [] };
   }
   switch (action.type) {
-    case SET_VALID_UNLOCK_WALLET_PASSWORD:
-      return Object.assign({}, state, {
-        unlockWalletPassword: action.unlockWalletPassword,
-        isValidUnlockPassword: action.isValidUnlockPassword
-      });
     case SET_KEYS:
       return {
         ...state,

examples/wallet/app/utils/storage.js

@@ -15,7 +15,7 @@ export function saveEncryptedAccountInfo(
   keys: AccountKeys
 ): void {
   const plainTextAccountInfo = JSON.stringify(keys);
-  if (!unlockWalletPassword || unlockWalletPassword === '') {
+  if (!unlockWalletPassword) {
     throw new Error('Invalid unlock password');
   }
   const encryptedTextAccountInfo = aesEncrypt(

examples/wallet/package.json

@@ -262,8 +262,10 @@
     "@forevolve/bootstrap-dark": "1.0.0-alpha.863",
     "@fortawesome/fontawesome-free": "5.12.0",
     "@hot-loader/react-dom": "16.11.0",
+    "aes-js": "3.1.2",
     "axios": "0.19.0",
     "bip39": "3.0.2",
+    "blakejs": "1.1.0",
     "bootstrap": "4.4.1",
     "classnames": "2.2.6",
     "clickable-box": "1.1.0",

examples/wallet/yarn.lock

@@ -1812,6 +1812,11 @@ address@^1.0.1:
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
   integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
 
+aes-js@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.1.2.tgz#db9aabde85d5caabbfc0d4f2a4446960f627146a"
+  integrity sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==
+
 aggregate-error@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
@@ -3253,6 +3258,11 @@ bl@^1.0.0:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
 
+blakejs@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.0.tgz#69df92ef953aa88ca51a32df6ab1c54a155fc7a5"
+  integrity sha1-ad+S75U6qIylGjLfarHFShVfx6U=
+
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"