From dc775b7ee524e53e4deb3cbf0ae3b1c44077549b Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Sun, 1 Mar 2020 16:33:18 +0700
Subject: [PATCH] Infinite scroll fixes.

---
 .../app/components/latest-blocks/latest-blocks.component.html  | 2 +-
 .../app/components/latest-blocks/latest-blocks.component.ts    | 3 +++
 .../transactions-list/transactions-list.component.html         | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/latest-blocks/latest-blocks.component.html b/frontend/src/app/components/latest-blocks/latest-blocks.component.html
index f1df6f48b..b23ed84d3 100644
--- a/frontend/src/app/components/latest-blocks/latest-blocks.component.html
+++ b/frontend/src/app/components/latest-blocks/latest-blocks.component.html
@@ -1,4 +1,4 @@
-<table class="table table-borderless" [fromRoot]="true" [infiniteScrollContainer]="'body'" infiniteScroll [infiniteScrollDistance]="1.5" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50" (scrolled)="loadMore()">
+<table class="table table-borderless" [alwaysCallback]="true" [fromRoot]="true" [infiniteScrollContainer]="'body'" infiniteScroll [infiniteScrollDistance]="1.5" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50" (scrolled)="loadMore()">
   <thead>
     <th style="width: 210px;">Height</th>
     <th class="d-none d-md-block" style="width: 210px;">Timestamp</th>
diff --git a/frontend/src/app/components/latest-blocks/latest-blocks.component.ts b/frontend/src/app/components/latest-blocks/latest-blocks.component.ts
index 6c6fa71e5..671e7f33f 100644
--- a/frontend/src/app/components/latest-blocks/latest-blocks.component.ts
+++ b/frontend/src/app/components/latest-blocks/latest-blocks.component.ts
@@ -62,6 +62,9 @@ export class LatestBlocksComponent implements OnInit, OnDestroy {
   }
 
   loadMore() {
+    if (this.isLoading) {
+      return;
+    }
     this.isLoading = true;
     this.electrsApiService.listBlocks$(this.blocks[this.blocks.length - 1].height - 1)
       .subscribe((blocks) => {
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html
index 2df03e1e1..a7a0f0201 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.html
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.html
@@ -8,7 +8,7 @@
       </ng-template>
     </div>
   </div>
-  <div class="header-bg box" infiniteScroll [fromRoot]="true" [infiniteScrollContainer]="'body'" [infiniteScrollDistance]="2" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50" (scrolled)="onScroll()">
+  <div class="header-bg box" infiniteScroll [alwaysCallback]="true" [fromRoot]="true" [infiniteScrollContainer]="'body'" [infiniteScrollDistance]="2" [infiniteScrollUpDistance]="1.5" [infiniteScrollThrottle]="50" (scrolled)="onScroll()">
     <div class="row">
       <div class="col">
         <table class="table table-borderless smaller-text table-xs" style="margin: 0;">