Merge branch 'master' into ui-2

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "1.8.3",
+  "version": "1.8.5",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

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;
   }

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}`;
     }