From eb5473087b1c2c835c911ee7bc99caf9d507991e Mon Sep 17 00:00:00 2001 From: Aaron Greenspan Date: Sun, 17 Jan 2021 16:40:10 -0700 Subject: [PATCH] ui: change drives tab name --- ui/src/app/app.component.ts | 2 +- .../external-drives/external-drives.page.html | 2 +- ui/src/app/services/sync.notifier.ts | 20 ++++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index b6afe40cc..abf6b6a16 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -48,7 +48,7 @@ export class AppComponent { icon: 'notifications-outline', }, { - title: 'External Drives', + title: 'Backup drives', url: '/drives', icon: 'albums-outline', }, diff --git a/ui/src/app/pages/server-routes/external-drives/external-drives.page.html b/ui/src/app/pages/server-routes/external-drives/external-drives.page.html index 8190ed9c7..130067f79 100644 --- a/ui/src/app/pages/server-routes/external-drives/external-drives.page.html +++ b/ui/src/app/pages/server-routes/external-drives/external-drives.page.html @@ -3,7 +3,7 @@ - External Drives + Backup drives diff --git a/ui/src/app/services/sync.notifier.ts b/ui/src/app/services/sync.notifier.ts index f2ad1246a..95f72660c 100644 --- a/ui/src/app/services/sync.notifier.ts +++ b/ui/src/app/services/sync.notifier.ts @@ -63,19 +63,21 @@ export class SyncNotifier { private async handleOSWelcome (server: Readonly) { if (server.welcomeAck || server.versionInstalled !== this.config.version || this.osWelcomeOpen) return - const modal = await this.modalCtrl.create({ - backdropDismiss: false, - component: OSWelcomePage, - presentingElement: await this.modalCtrl.getTop(), - componentProps: { - version: server.versionInstalled, - }, - }) this.osWelcomeOpen = true + const [modal, _] = await Promise.all([ + this.modalCtrl.create({ + backdropDismiss: false, + component: OSWelcomePage, + presentingElement: await this.modalCtrl.getTop(), + componentProps: { + version: server.versionInstalled, + }, + }), + this.apiService.acknowledgeOSWelcome(this.config.version), + ]) modal.onWillDismiss().then(() => { this.osWelcomeOpen = false - return this.apiService.acknowledgeOSWelcome(this.config.version) }) await modal.present() }