Merge branch 'master' into ui-2

js/src/ParityBar/accountStore.js

@@ -24,10 +24,8 @@ export default class AccountStore {
   constructor (api) {
     this._api = api;
 
-    this.loadDefaultAccount()
+    this.subscribeDefaultAccount()
       .then(() => this.loadAccounts());
-
-    this.subscribeDefaultAccount();
   }
 
   @action setAccounts = (accounts) => {
@@ -60,12 +58,6 @@ export default class AccountStore {
       });
   }
 
-  loadDefaultAccount () {
-    return this._api.parity
-      .defaultAccount()
-      .then((address) => this.setDefaultAccount(address));
-  }
-
   loadAccounts () {
     this.setLoading(true);
 

js/src/Requests/requests.js

@@ -61,6 +61,11 @@ class Requests extends Component {
 
   renderRequest (request, extras = {}) {
     const { show, transaction } = request;
+
+    if (!transaction) {
+      return null;
+    }
+
     const state = this.getTransactionState(request);
     const displayedTransaction = { ...transaction };
 
@@ -164,9 +169,9 @@ class Requests extends Component {
       return (
         <FormattedMessage
           id='requests.status.transactionMined'
-          defaultMessage='Transaction mined at block #{blockNumber} ({blockHeight} blocks ago)'
+          defaultMessage='Transaction mined at block #{blockNumber} ({blockHeight} confirmations)'
           values={ {
-            blockHeight: +request.blockHeight,
+            blockHeight: (+request.blockHeight || 0).toString(),
             blockNumber: +transactionReceipt.blockNumber
           } }
         />