From a541af26b85306df161bfe6ca01b9ecd6f2c1461 Mon Sep 17 00:00:00 2001
From: Nilesh Belurkar <nilesh.b@osmosys.asia>
Date: Fri, 21 May 2021 20:54:13 +0530
Subject: [PATCH] Fixed issue 5817

---
 angular.json                                             | 5 ++++-
 .../layout/infinite-list/infinite-list.component.html    | 2 +-
 .../layout/infinite-list/infinite-list.component.ts      | 9 ++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/angular.json b/angular.json
index 450459a54b..da36eff706 100644
--- a/angular.json
+++ b/angular.json
@@ -189,5 +189,8 @@
     "@schematics/angular:directive": {
       "prefix": "ngx"
     }
+  },
+  "cli": {
+    "analytics": "bc1499f9-0bc1-4ae6-ab35-867275a6a90f"
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/pages/layout/infinite-list/infinite-list.component.html b/src/app/pages/layout/infinite-list/infinite-list.component.html
index 340275d4ea..53ed39ad80 100644
--- a/src/app/pages/layout/infinite-list/infinite-list.component.html
+++ b/src/app/pages/layout/infinite-list/infinite-list.component.html
@@ -16,7 +16,7 @@
     </nb-card>
   </div>
 
-  <div class="col-md-12 col-lg-6 col-xxxl-6">
+  <div *ngIf="secondCard.news.length" class="col-md-12 col-lg-6 col-xxxl-6">
     <nb-card>
       <nb-card-header>Window Scroll</nb-card-header>
       <nb-list
diff --git a/src/app/pages/layout/infinite-list/infinite-list.component.ts b/src/app/pages/layout/infinite-list/infinite-list.component.ts
index 34ad3a48c0..62f02ecbbb 100644
--- a/src/app/pages/layout/infinite-list/infinite-list.component.ts
+++ b/src/app/pages/layout/infinite-list/infinite-list.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { NewsService } from '../news.service';
 
 @Component({
@@ -6,7 +6,7 @@ import { NewsService } from '../news.service';
   templateUrl: 'infinite-list.component.html',
   styleUrls: ['infinite-list.component.scss'],
 })
-export class InfiniteListComponent {
+export class InfiniteListComponent implements OnInit{
 
 
   firstCard = {
@@ -24,7 +24,10 @@ export class InfiniteListComponent {
   pageSize = 10;
 
   constructor(private newsService: NewsService) {}
-
+  ngOnInit() {
+    this.loadNext(this.firstCard);
+    this.loadNext(this.secondCard);
+  }
   loadNext(cardData) {
     if (cardData.loading) { return; }