ui: displayEmver on updates

This commit is contained in:
Aaron Greenspan
2021-01-20 18:13:47 -07:00
committed by Aiden McClelland
parent 4fba3a1d75
commit fe7410c0fa
4 changed files with 6 additions and 9 deletions

View File

@@ -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)

View File

@@ -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',