Merge branch 'master' into ui-2

2017-07-24 17:48:25 +02:00
parent c894f7ac1f 78fab4e471
commit de76b8a465
13 changed files with 693 additions and 41 deletions
--- a/js/src/Signer/components/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
+++ b/js/src/Signer/components/TransactionPendingFormConfirm/transactionPendingFormConfirm.js
@@ -400,6 +400,10 @@ export default class TransactionPendingFormConfirm extends Component {
  onScan = (signature) => {
    const { chainId, rlp, tx, data, decrypt } = this.state.qr;

+    if (!signature) {
+      return;
+    }
+
    if (signature && signature.substr(0, 2) !== '0x') {
      signature = `0x${signature}`;
    }