#328925 Only show empty events screen after events have been loaded.

app/groups/group-events/group-events.component.ts

@@ -35,13 +35,11 @@ export class GroupEventsComponent implements OnInit {
         this._page.actionBar.title = '';
         this._route.params.subscribe(params => {
             this._groupId = params['id'];
-
-            this._eventsService.getUpcoming([this._groupId])
-                .then(upcomingEvents => {
-                    this.events = upcomingEvents;
-                    return this._eventsService.getPast([this._groupId]);
-                })
-                .then(pastEvents => this.events = this.events.concat(pastEvents))
+            let upcomingPrm = this._eventsService.getUpcoming([this._groupId]);
+            let pastPrm = this._eventsService.getPast([this._groupId]);
+            
+            Promise.all([upcomingPrm, pastPrm])
+                .then(results => this.events = results[0].concat(results[1]))
                 .catch(this._onError.bind(this));
 
             this._groupsService.getById(this._groupId)

app/groups/group-members/group-members.template.html

@@ -2,10 +2,10 @@
     <ActionBarExtension>
         <NavigationButton *ngIf="isAndroid" icon="res://icon_back" (tap)="onBack()"></NavigationButton>
         <ActionItem *ngIf="!isAndroid" ios.systemIcon="1" ios.position="left" (tap)="onBack()"></ActionItem>
-        <ActionItem (tap)="onAdd()" *ngIf="canAdd"
+        <!--<ActionItem (tap)="onAdd()" *ngIf="canAdd"
             ios.systemIcon="4" android.systemIcon="ic_menu_add"
             ios.position="right">
-        </ActionItem>
+        </ActionItem>-->
     </ActionBarExtension>
 
     <StackLayout *ngIf="members" class="content">

package.json

@@ -41,4 +41,4 @@
     "typescript": "^2.0.6",
     "zone.js": "~0.6.21"
   }
-}
+}