speding password input on restore key is added

Author: dmernies-iohk

examples/wallet/app/actions/account.js

@@ -37,10 +37,13 @@ import routes from '../constants/routes.json';
 export type SetKeysAction = { type: 'SET_KEYS' } & AccountKeys;
 export const SET_KEYS = 'SET_KEYS';
 
-export function setAccount(privateKey: string): Thunk<SetKeysAction> {
+export function setAccount(
+  privateKey: string,
+  spendingPassword: ?string
+): Thunk<SetKeysAction> {
   return function setAccountThunk(dispatch) {
-    return getAccountFromPrivateKey(privateKey).then(
-      curry(initializeKeysAndRedirect)(dispatch)
+    return getAccountFromPrivateKey(privateKey).then(keys =>
+      curry(initializeKeysAndRedirect)(dispatch, keys, spendingPassword)
     );
   };
 }
@@ -84,16 +87,15 @@ export function setAccountFromPrivateKey(
 const initializeKeysAndRedirect = (
   dispatch: Dispatch,
   keys: AccountKeys,
-  saveAccount?: boolean = true
+  spendingPassword: ?string = ''
 ) => {
   dispatch({
     type: SET_KEYS,
     ...keys
   });
-  if (saveAccount) {
-    saveSpendingPassword('manteca');
-    saveAccountInfoInDEN('manteca', keys);
-  }
+
+  saveSpendingPassword(spendingPassword);
+  saveAccountInfoInDEN(spendingPassword, keys);
 
   return Promise.all([
     dispatch(updateAccountTransactions()),
@@ -109,13 +111,14 @@ const initializeKeysAndRedirect = (
 
 export function setAccountFromMnemonic(
   mnemonicPhrase: string,
-  mnemonicPassword?: string
+  mnemonicPassword: string,
+  spendingPassword: ?string
 ): Thunk<SetKeysAction> {
   if (isValidMnemonic(mnemonicPhrase)) {
     const seed = createSeedFromMnemonic(mnemonicPhrase, mnemonicPassword);
     return function setAccountThunk(dispatch) {
-      return getAccountFromSeed(seed).then(
-        curry(initializeKeysAndRedirect)(dispatch)
+      return getAccountFromSeed(seed).then(keys =>
+        curry(initializeKeysAndRedirect)(dispatch, keys, spendingPassword)
       );
     };
   }

examples/wallet/app/components/RestoreWalletFromMnemonic.js

@@ -25,7 +25,7 @@ export default ({ setAccountFromMnemonic }: Props) => {
       checkValidPassword(password, confirmPassword)
     ) {
       return Promise.all([
-        setAccountFromMnemonic(newMnemonicPhrase, newMnemonicPassword)
+        setAccountFromMnemonic(newMnemonicPhrase, newMnemonicPassword, password)
       ]);
     }
     setIsMnemonicValid(false);

examples/wallet/app/components/RestoreWalletFromPrivateKey.js

@@ -18,7 +18,7 @@ export default ({ setAccount }: Props) => {
   ) {
     event.preventDefault();
     if (checkValidPassword(password, confirmPassword)) {
-      setAccount(newPrivateKey);
+      setAccount(newPrivateKey, password);
     }
   };
 
@@ -98,7 +98,7 @@ export default ({ setAccount }: Props) => {
             className="text-danger"
             hidden={arePasswordAndConfirmationEqual}
           >
-            <code>password and confirmation must be the same.</code>
+            <code>Password and confirmation must be the same.</code>
           </Form.Label>
         </Form.Group>
         <Row className="justify-content-center">

examples/wallet/app/utils/storage.js

@@ -10,7 +10,7 @@ import {
 const WALLET_SPEDING_PASSWORD_KEY = 'wallet.spending.pwd';
 const WALLET_ENCRYPTED_KEYS = 'wallet.encrypted.account.info';
 
-export function saveSpendingPassword(spendingPassword: string): void {
+export function saveSpendingPassword(spendingPassword: ?string = ''): void {
   const spendingHash = computeBlake2bHexWithSecret(spendingPassword);
   localStorage.setItem(WALLET_SPEDING_PASSWORD_KEY, spendingHash);
 }