1 files changed, 19 insertions, 10 deletions

diff --git a/client/src/app/menu/avatar-notification.component.html b/client/src/app/menu/avatar-notification.component.html
index 4ef3f0e89..a5ef43d42 100644
--- a/client/src/app/menu/avatar-notification.component.html
+++ b/client/src/app/menu/avatar-notification.component.html
@@ -1,6 +1,6 @@
 <div
   [ngbPopover]="popContent" autoClose="outside" placement="bottom-left" container="body" popoverClass="popover-notifications"
-  i18n-title title="View your notifications" class="notification-avatar" #popover="ngbPopover"
+  i18n-title title="View your notifications" class="notification-avatar" #popover="ngbPopover" (hidden)="onPopoverHidden()"
 >
   <div *ngIf="unreadNotifications > 0" class="unread-notifications">{{ unreadNotifications }}</div>
 
@@ -8,16 +8,25 @@
 </div>
 
 <ng-template #popContent>
-  <div class="notifications-header">
-    <div i18n>Notifications</div>
+  <div class="content" [ngClass]="{ loaded: loaded }">
+    <div class="notifications-header">
+      <div i18n>Notifications</div>
 
-    <a
-      i18n-title title="Update your notification preferences" class="glyphicon glyphicon-cog"
-      routerLink="/my-account/settings" fragment="notifications"
-    ></a>
-  </div>
+      <a
+        i18n-title title="Update your notification preferences" class="glyphicon glyphicon-cog"
+        routerLink="/my-account/settings" fragment="notifications"
+      ></a>
+    </div>
+
+    <div *ngIf="!loaded" class="loader">
+      <my-loader [loading]="!loaded"></my-loader>
+    </div>
 
-  <my-user-notifications [ignoreLoadingBar]="true" [infiniteScroll]="false" itemsPerPage="10"></my-user-notifications>
+    <my-user-notifications
+      [ignoreLoadingBar]="true" [infiniteScroll]="false" itemsPerPage="10"
+      (notificationsLoaded)="onNotificationLoaded()"
+    ></my-user-notifications>
 
-  <a class="all-notifications" routerLink="/my-account/notifications" i18n>See all your notifications</a>
+    <a *ngIf="loaded" class="all-notifications" routerLink="/my-account/notifications" i18n>See all your notifications</a>
+  </div>
 </ng-template>