From fe7410c0fad205d526a39e173b35b1bbb8eabbf1 Mon Sep 17 00:00:00 2001
From: Aaron Greenspan <afg419@gmail.com>
Date: Wed, 20 Jan 2021 18:13:47 -0700
Subject: [PATCH] ui: displayEmver on updates

---
 .../update-os-banner/update-os-banner.component.ts         | 3 ++-
 ui/src/app/modals/os-welcome/os-welcome.page.html          | 7 +------
 ui/src/app/services/os-update.service.ts                   | 2 +-
 ui/src/app/services/startup-alerts.notifier.ts             | 3 ++-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ui/src/app/components/update-os-banner/update-os-banner.component.ts b/ui/src/app/components/update-os-banner/update-os-banner.component.ts
index 7cca2d1b2..8671118eb 100644
--- a/ui/src/app/components/update-os-banner/update-os-banner.component.ts
+++ b/ui/src/app/components/update-os-banner/update-os-banner.component.ts
@@ -3,6 +3,7 @@ import { OsUpdateService } from 'src/app/services/os-update.service'
 import { Observable } from 'rxjs'
 import { AlertController } from '@ionic/angular'
 import { LoaderService } from 'src/app/services/loader.service'
+import { displayEmver } from 'src/app/pipes/emver.pipe'
 
 @Component({
   selector: 'update-os-banner',
@@ -24,7 +25,7 @@ export class UpdateOsBannerComponent {
   async confirmUpdate (versionLatest: string) {
     const alert = await this.alertCtrl.create({
       header: `Update EmbassyOS`,
-      message: `Update EmbassyOS to version ${versionLatest}?`,
+      message: `Update EmbassyOS to version ${displayEmver(versionLatest)}?`,
       buttons: [
         {
           text: 'Cancel',
diff --git a/ui/src/app/modals/os-welcome/os-welcome.page.html b/ui/src/app/modals/os-welcome/os-welcome.page.html
index 2a3087fb1..9c4a49860 100644
--- a/ui/src/app/modals/os-welcome/os-welcome.page.html
+++ b/ui/src/app/modals/os-welcome/os-welcome.page.html
@@ -1,10 +1,5 @@
 <ion-header>
   <ion-toolbar>
-    <ion-buttons slot="start">
-      <ion-button (click)="dismiss()">
-        <ion-icon slot="icon-only" name="close"></ion-icon>
-      </ion-button>
-    </ion-buttons>
     <ion-title >
       <ion-label style="font-size: 20px;" class="ion-text-wrap">Welcome to {{ version }}!</ion-label>
     </ion-title>
@@ -22,7 +17,7 @@
       </p>
       <p>
         0.2.8 also introduces automatic checks for OS updates. With this enabled, each time you visit your embassy you will be notified if a new OS version is available. This setting can be edited in your Embassy Config page.
-        <ion-item style="--border-radius: var(--icon-border-radius); margin-top: 15px">
+        <ion-item lines="none" style="--border-radius: var(--icon-border-radius); margin-top: 15px">
           <ion-label>Auto Check for Updates</ion-label>
           <ion-toggle slot="end" [(ngModel)]="autoCheckUpdates"></ion-toggle>
         </ion-item>
diff --git a/ui/src/app/services/os-update.service.ts b/ui/src/app/services/os-update.service.ts
index a450e0293..ca179adc1 100644
--- a/ui/src/app/services/os-update.service.ts
+++ b/ui/src/app/services/os-update.service.ts
@@ -38,7 +38,7 @@ export class OsUpdateService {
       this.serverModel.watch().versionInstalled.pipe(take(1)),
       this.apiService.getVersionLatest(),
     ]).pipe(
-      map(([vi, vl]) => this.updateIsAvailable(vi, vl.versionLatest) ? vl : undefined),
+      map(([vi, vl]) => this.updateIsAvailable(vi, vl.versionLatest) ? vl.versionLatest : undefined),
       catchError(e => {
         console.error(`OsUpdateService Error: ${e}`)
         return of(undefined)
diff --git a/ui/src/app/services/startup-alerts.notifier.ts b/ui/src/app/services/startup-alerts.notifier.ts
index 470d02dc0..cdc6a444a 100644
--- a/ui/src/app/services/startup-alerts.notifier.ts
+++ b/ui/src/app/services/startup-alerts.notifier.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'
 import { AlertController, ModalController, NavController } from '@ionic/angular'
 import { OSWelcomePage } from '../modals/os-welcome/os-welcome.page'
 import { S9Server } from '../models/server-model'
+import { displayEmver } from '../pipes/emver.pipe'
 import { ApiService } from './api/api.service'
 import { ConfigService } from './config.service'
 import { Emver } from './emver.service'
@@ -129,7 +130,7 @@ export class StartupAlertsNotifier {
       const alert = await this.alertCtrl.create({
         backdropDismiss: true,
         header: 'New EmbassyOS Version!',
-        message: `Update EmbassyOS to version ${versionLatest}?`,
+        message: `Update EmbassyOS to version ${displayEmver(versionLatest)}?`,
         buttons: [
           {
             text: 'Not now',