src/app/modules/groups/sidebar-markers/sidebar-markers.component.ts

@@ -48,6 +48,8 @@ export class GroupsSidebarMarkersComponent implements OnInit, OnDestroy {
       await this.load(true);
       this.listenForMarkers();
       this.listenForMembershipUpdates();
+    } else {
+      this.inProgress = true; // Server side should start in loading spinner state
     }
   }
 

src/app/modules/wallet/tokens/contributions/contributions.component.ts

@@ -2,14 +2,16 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  Inject,
+  PLATFORM_ID,
 } from '@angular/core';
 import { Router } from '@angular/router';
+import { isPlatformServer } from '@angular/common';
 
 import { Client } from '../../../../services/api/client';
 import { Session } from '../../../../services/session';
 
 @Component({
-  moduleId: module.id,
   selector: 'm-wallet-token--contributions',
   templateUrl: 'contributions.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -25,7 +27,8 @@ export class WalletTokenContributionsComponent {
     protected client: Client,
     protected cd: ChangeDetectorRef,
     public session: Session,
-    protected router: Router
+    protected router: Router,
+    @Inject(PLATFORM_ID) protected platformId: Object
   ) {}
 
   ngOnInit() {
@@ -45,6 +48,10 @@ export class WalletTokenContributionsComponent {
       return;
     }
 
+    if (isPlatformServer(this.platformId)) {
+      return;
+    }
+
     if (refresh) {
       this.contributions = [];
     }