From 425f4152b687e98bf3bbeae7bfcd5a55df94d028 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Sat, 18 Jul 2020 13:09:57 +0700
Subject: [PATCH] Handle confirm transactions not present in the bisq database.

---
 .../bisq-transaction/bisq-transaction.component.html   |  2 +-
 .../bisq-transaction/bisq-transaction.component.ts     | 10 ++++++++++
 frontend/src/app/components/block/block.component.html |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
index 9715fc26c..f9def7206 100644
--- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
+++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
@@ -136,7 +136,7 @@
 
     <div class="text-center">
       Error loading transaction
-      <br>
+      <br><br>
       <i>{{ error.status }}: {{ error.statusText }}</i>
     </div>
   </ng-template>
diff --git a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts
index a875e1065..f758aa2f4 100644
--- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts
+++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts
@@ -50,6 +50,16 @@ export class BisqTransactionComponent implements OnInit, OnDestroy {
               if (bisqTxError.status === 404) {
                 return this.electrsApiService.getTransaction$(this.txId)
                   .pipe(
+                    map((tx) => {
+                      if (tx.status.confirmed) {
+                        this.error = {
+                          status: 200,
+                          statusText: 'Transaction is confirmed but not available in the Bisq database, please try reloading this page.'
+                        };
+                        return null;
+                      }
+                      return tx;
+                    }),
                     catchError((txError: HttpErrorResponse) => {
                       console.log(txError);
                       this.error = txError;
diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html
index e1e088b2c..5cb60e00d 100644
--- a/frontend/src/app/components/block/block.component.html
+++ b/frontend/src/app/components/block/block.component.html
@@ -157,7 +157,7 @@
   <ng-template [ngIf]="error">
     <div class="text-center">
       Error loading block data.
-      <br>
+      <br><br>
       <i>{{ error.error }}</i>
     </div>
   </ng-template>