Merge pull request #84 from ethereumproject/elaine/pw

Fix some password issues
realcodywburns · Sep 14, 2017 · c89ba97 · c89ba97
2 parents 3822624 + f6477e0
commit c89ba97
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/components/wallet/open.js b/src/components/wallet/open.js
@@ -40,20 +40,21 @@ class WalletForm extends React.Component {
     if (this.state.showTextKey)
         this.props.openWallet(this.state.privKey, this.state.password)
           .then((result) => {
-            if (typeof result === 'object')
+            if (!result instanceof Error) {
               this.setState({ showBalance: true });
-            else
+              this.resetState();
+            } else
               this.setState({ error: result });
           });
     else if (this.state.showRequirePass && this.state.showFileKey)
         this.props.openWalletFile(this.state.file, this.state.password)
           .then((result) => {
-            if (typeof result === 'object')
+            if (!result instanceof Error) {
               this.setState({ showBalance: true });
-            else
-              this.setState({ error: result });
+              this.resetState();
+            } else
+              this.setState({ error: result.toString() });
           });
-    this.resetState();
   }
 
   closeWallet = () => {
@@ -145,8 +146,9 @@ class WalletForm extends React.Component {
                 controlId="password"
               >
                 <FormControl
-                  componentClass="textarea"
+                  componentClass="input"
                   placeholder="Password"
+                  type="password"
                   bsSize="small"
                   onChange={this.handlePassword}
                 />

diff --git a/src/store/walletActions.js b/src/store/walletActions.js
@@ -33,7 +33,12 @@ export function openWallet(key, password = null) {
 
 export function openWalletFile(file, password = null) {
     return (dispatch) => {
-        const wallet = Wallet.getWalletFromPrivKeyFile(file, password);
+        let wallet;
+        try { // TODO: Better error handling here
+            wallet = Wallet.getWalletFromPrivKeyFile(file, password);
+        } catch (e) {
+            return new Error(e);
+        }
         const address = wallet.getAddressString();
         dispatch({
             type: 'WALLET/OPEN',