From d0b3b240e6c0312c4fe7b906e8b9750181c325e2 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Tue, 29 Sep 2020 18:27:44 +0700
Subject: [PATCH] Bugfix for js error on transaction page. Increase ping-pong
 timeout.

---
 .../src/app/components/transaction/transaction.component.html   | 2 +-
 frontend/src/app/services/websocket.service.ts                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 3f8310a75..723d7e952 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -47,7 +47,7 @@
                     </div>
                   </td>
                 </tr>
-                <tr *ngIf="tx.status.block_height <= latestBlock.height - 8">
+                <tr *ngIf="latestBlock && tx.status.block_height <= latestBlock.height - 8">
                   <td class="td-width">Included in block</td>
                   <td>
                     <a [routerLink]="['/block/' | relativeUrl, tx.status.block_hash]" [state]="{ data: { blockHeight: tx.status.block_height } }">{{ tx.status.block_height }}</a>
diff --git a/frontend/src/app/services/websocket.service.ts b/frontend/src/app/services/websocket.service.ts
index 8bc94e8c2..ca4c6cc89 100644
--- a/frontend/src/app/services/websocket.service.ts
+++ b/frontend/src/app/services/websocket.service.ts
@@ -11,7 +11,7 @@ const WEB_SOCKET_URL = WEB_SOCKET_PROTOCOL + '//' + document.location.hostname +
 
 const OFFLINE_RETRY_AFTER_MS = 10000;
 const OFFLINE_PING_CHECK_AFTER_MS = 30000;
-const EXPECT_PING_RESPONSE_AFTER_MS = 1000;
+const EXPECT_PING_RESPONSE_AFTER_MS = 4000;
 
 @Injectable({
   providedIn: 'root'