diff --git a/ui/src/app/services/startup-alerts.notifier.ts b/ui/src/app/services/startup-alerts.notifier.ts index a239a4ea0..891b90be9 100644 --- a/ui/src/app/services/startup-alerts.notifier.ts +++ b/ui/src/app/services/startup-alerts.notifier.ts @@ -70,17 +70,20 @@ export class GlobalAlertsNotifier { } private async presentOsWelcome (vi: string): Promise { - const modal = await this.modalCtrl.create({ - backdropDismiss: false, - component: OSWelcomePage, - presentingElement: await this.modalCtrl.getTop(), - componentProps: { version: vi }, + return new Promise(async resolve => { + const modal = await this.modalCtrl.create({ + backdropDismiss: false, + component: OSWelcomePage, + presentingElement: await this.modalCtrl.getTop(), + componentProps: { version: vi }, + }) + //kick this off async + this.apiService.acknowledgeOSWelcome(this.config.version).catch(e => { + console.error(`Unable to acknowledge OS welcome`, e) + }) + await modal.present() + modal.onWillDismiss().then(() => resolve()) }) - //kick this off async - this.apiService.acknowledgeOSWelcome(this.config.version).catch(e => { - console.error(`Unable to acknowledge OS welcome`, e) - }) - await modal.present() } private async presentAlertNewApps () { diff --git a/ui/src/app/services/sync.notifier.ts b/ui/src/app/services/sync.notifier.ts index 631fd79ce..3628f8533 100644 --- a/ui/src/app/services/sync.notifier.ts +++ b/ui/src/app/services/sync.notifier.ts @@ -1,15 +1,12 @@ import { Injectable } from '@angular/core' import { ConfigService } from 'src/app/services/config.service' import { ToastController, NavController, ModalController, AlertController } from '@ionic/angular' -import { ServerModel, S9Server, ServerStatus } from '../models/server-model' +import { ServerModel, S9Server } from '../models/server-model' import { OSWelcomePage } from '../modals/os-welcome/os-welcome.page' import { ApiService } from './api/api.service' import { Emver } from './emver.service' import { LoaderService } from './loader.service' import { OsUpdateService } from './os-update.service' -import { filter, take, tap } from 'rxjs/operators' -import { exists } from '../util/misc.util' - @Injectable({ providedIn: 'root', }) @@ -32,8 +29,6 @@ export class SyncNotifier { async handleSpecial (server: Readonly): Promise { this.handleNotifications(server) - this.handleOSWelcome(server) - if (!this.displayedWelcomeMessage) this.handleUpdateCheck(server) } private async handleNotifications (server: Readonly) { @@ -71,35 +66,8 @@ export class SyncNotifier { await toast.present() this.serverModel.update(updates) } - - private async handleOSWelcome (server: Readonly) { - if (server.welcomeAck || server.versionInstalled !== this.config.version || this.displayedWelcomeMessage) return - - this.displayedWelcomeMessage = true - - const modal = await this.modalCtrl.create({ - backdropDismiss: false, - component: OSWelcomePage, - presentingElement: await this.modalCtrl.getTop(), - componentProps: { - version: server.versionInstalled, - }, - }) - - modal.onDidDismiss().then(() => { - this.apiService.acknowledgeOSWelcome(this.config.version) - this.handleUpdateCheck(server) - }) - await modal.present() - } } -// @TODO: remove -function debugSync (...desc: any[]) { - console.log(`sync: `, ...desc) -} - - // return new Promise(async resolve => { // const confirm = await this.alertController.create({ // cssClass: 'alert-demo',