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/packages/dapp-accounts/CreateAccount/store.js
+++ b/js/packages/dapp-accounts/CreateAccount/store.js
@@ -191,7 +191,7 @@ export default class Store {
    }

    // FIXME: Current native signer encoding is not 100% for EIP-55, lowercase for now
-    this.qrAddress = this._api.util
+    this.qrAddress = qrAddress && this._api.util
        ? this._api.util.toChecksumAddress(qrAddress.toLowerCase())
        : qrAddress;
  }