Fix signing (#4363)

openethereum · Feb 3, 2017 · 7579e91 · 7579e91
1 parent 98a93f7
commit 7579e91
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/js/src/redux/providers/signerMiddleware.js b/js/src/redux/providers/signerMiddleware.js
@@ -52,7 +52,7 @@ export default class SignerMiddleware {
   }
 
   onConfirmStart = (store, action) => {
-    const { gas, gasPrice, id, password, payload, wallet } = action.payload;
+    const { gas = 0, gasPrice = 0, id, password, payload, wallet } = action.payload;
 
     const handlePromise = (promise) => {
       promise

diff --git a/js/src/views/Signer/components/SignRequest/signRequest.js b/js/src/views/Signer/components/SignRequest/signRequest.js
@@ -126,8 +126,9 @@ export default class SignRequest extends Component {
     );
   }
 
-  onConfirm = password => {
+  onConfirm = (data) => {
     const { id } = this.props;
+    const { password } = data;
 
     this.props.onConfirm({ id, password });
   }

diff --git a/...nts/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js b/...nts/TransactionPendingForm/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
@@ -251,7 +251,8 @@ function mapStateToProps (_, initProps) {
 
   return (state) => {
     const { accounts } = state.personal;
-    const account = accounts[address] || {};
+    let gotAddress = Object.keys(accounts).find(a => a.toLowerCase() === address.toLowerCase());
+    const account = gotAddress ? accounts[gotAddress] : {};
 
     return { account };
   };