fix(settings): only show elements once initialized

RangerRick · Sep 18, 2020 · 8550426 · 8550426
1 parent 4ec7cb1
commit 8550426
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/app/settings/settings.page.html b/src/app/settings/settings.page.html
@@ -28,15 +28,15 @@ <h3>Disable Sleep</h3>
       </ion-list-header>
       <ion-item>
         <ion-label class="ion-text-wrap">Disable sleep while games are active?</ion-label>
-        <ion-toggle (ionChange)="setDisableSleep()" [(ngModel)]="current.disableSleep" slot="end"></ion-toggle>
+        <ion-toggle *ngIf="current" (ionChange)="setDisableSleep()" [(ngModel)]="current.disableSleep" slot="end"></ion-toggle>
       </ion-item>
     </span>
     <ion-list-header lines="full">
       <h3>Reduce Motion</h3>
     </ion-list-header>
     <ion-item>
       <ion-label class="ion-text-wrap">Reduce motion in effects?</ion-label>
-      <ion-toggle (ionChange)="setReduceMotion()" [(ngModel)]="current.reduceMotion" slot="end"></ion-toggle>
+      <ion-toggle *ngIf="current" (ionChange)="setReduceMotion()" [(ngModel)]="current.reduceMotion" slot="end"></ion-toggle>
     </ion-item>
     <ion-list-header lines="full">
       <h3>Teams</h3>
@@ -50,7 +50,7 @@ <h4>Choose Your Team:</h4>
       </ion-label>
     </ion-item>
     <ion-item>
-      <ion-select class="ion-text-wrap" (ionChange)="setFavoriteTeam($event.detail)" interface="action-sheet" [interfaceOptions]="teamOptions" okText="Choose" cancelText="Cancel" [value]="current.favoriteTeam" [(ngModel)]="current.favoriteTeam">
+      <ion-select *ngIf="current && teams" class="ion-text-wrap" (ionChange)="setFavoriteTeam($event.detail)" interface="action-sheet" [interfaceOptions]="teamOptions" okText="Choose" cancelText="Cancel" [value]="current.favoriteTeam" [(ngModel)]="current.favoriteTeam">
         <ion-select-option *ngFor="let team of teams; trackBy: id" [value]="team.id">{{team.fullName}}</ion-select-option>
       </ion-select>
     </ion-item>

diff --git a/src/app/settings/settings.page.ts b/src/app/settings/settings.page.ts
@@ -19,15 +19,15 @@ import Util from 'src/lib/util';
   styleUrls: ['./settings.page.scss'],
 })
 export class SettingsPage implements OnInit {
-  public current = {} as Settings;
+  public current: Settings;
   public betaEnabled = false;
   public devicePlatform = 'web';
 
   public teamOptions: any = {
     header: 'Choose Your Team',
   };
 
-  public teams = [] as Team[];
+  public teams: Team[];
 
   id = Util.trackById;