Merge branch 'master' into ui-2

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