bring back startup alerts

ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts

@@ -1,10 +1,10 @@
 import { Component, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { AlertController, IonContent, ModalController, NavController } from '@ionic/angular'
 import { LoaderService } from 'src/app/services/loader.service'
 import { HttpErrorResponse } from '@angular/common/http'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { Action, Manifest, PackageDataEntry, PackageMainStatus } from 'src/app/services/patch-db/data-model'
 import { wizardModal } from 'src/app/components/install-wizard/install-wizard.component'
 import { WizardBaker } from 'src/app/components/install-wizard/prebaked-wizards'
@@ -32,7 +32,7 @@ export class AppActionsPage {
     private readonly loaderService: LoaderService,
     private readonly wizardBaker: WizardBaker,
     private readonly navCtrl: NavController,
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
   ) { }
 
   ngOnInit () {

ui/src/app/pages/apps-routes/app-config/app-config.page.ts

@@ -1,7 +1,7 @@
 import { Component, ViewChild } from '@angular/core'
 import { NavController, AlertController, ModalController, IonContent } from '@ionic/angular'
 import { ActivatedRoute } from '@angular/router'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { isEmptyObject, Recommendation } from 'src/app/util/misc.util'
 import { LoaderService } from 'src/app/services/loader.service'
 import { TrackingModalController } from 'src/app/services/tracking-modal-controller.service'
@@ -12,7 +12,7 @@ import { WizardBaker } from 'src/app/components/install-wizard/prebaked-wizards'
 import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import { ConfigCursor } from 'src/app/pkg-config/config-cursor'
 import { PackageDataEntry, PackageState } from 'src/app/services/patch-db/data-model'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 
 @Component({
   selector: 'app-config',
@@ -55,7 +55,7 @@ export class AppConfigPage {
     private readonly alertCtrl: AlertController,
     private readonly modalController: ModalController,
     private readonly trackingModalCtrl: TrackingModalController,
-    private readonly patch: PatchDbModel,
+    private readonly patch: PatchDbService,
   ) { }
 
   async ngOnInit () {

ui/src/app/pages/apps-routes/app-instructions/app-instructions.page.ts

@@ -1,8 +1,8 @@
 import { Component, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { IonContent } from '@ionic/angular'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
-import { ApiService } from 'src/app/services/api/api.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 
 @Component({
@@ -20,7 +20,7 @@ export class AppInstructionsPage {
     private readonly route: ActivatedRoute,
     private readonly errToast: ErrorToastService,
     private readonly apiService: ApiService,
-    private readonly patch: PatchDbModel,
+    private readonly patch: PatchDbService,
   ) { }
 
   async ngOnInit () {

ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.ts

@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'
 import { IonContent, ToastController } from '@ionic/angular'
 import { Subscription } from 'rxjs'
 import { InstalledPackageDataEntry, PackageDataEntry } from 'src/app/services/patch-db/data-model'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { ConfigService } from 'src/app/services/config.service'
 import { copyToClipboard } from 'src/app/util/web.util'
 
@@ -22,7 +22,7 @@ export class AppInterfacesPage {
     private readonly route: ActivatedRoute,
     private readonly toastCtrl: ToastController,
     private readonly config: ConfigService,
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
   ) { }
 
   ngOnInit () {

ui/src/app/pages/apps-routes/app-list/app-list.page.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core'
 import { ConfigService } from 'src/app/services/config.service'
 import { ConnectionService } from 'src/app/services/connection.service'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 import { combineLatest, Subscription } from 'rxjs'
 import { PkgStatusRendering, renderPkgStatus } from 'src/app/services/pkg-status-rendering.service'
@@ -25,7 +25,7 @@ export class AppListPage {
   constructor (
     private readonly config: ConfigService,
     public readonly connectionService: ConnectionService,
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
   ) { }
 
   ngOnInit () {

ui/src/app/pages/apps-routes/app-logs/app-logs.page.ts

@@ -1,6 +1,6 @@
 import { Component, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { IonContent } from '@ionic/angular'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 

ui/src/app/pages/apps-routes/app-manifest/app-manifest.page.ts

@@ -2,7 +2,7 @@ import { Component, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { Subscription } from 'rxjs'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { getManifest } from 'src/app/services/config.service'
 import * as JsonPointer from 'json-pointer'
 import { IonContent } from '@ionic/angular'
@@ -23,7 +23,7 @@ export class AppManifestPage {
 
   constructor (
     private readonly route: ActivatedRoute,
-    private readonly patch: PatchDbModel,
+    private readonly patch: PatchDbService,
   ) { }
 
   ngOnInit () {

ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.ts

@@ -1,11 +1,11 @@
 import { Component, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { IonContent } from '@ionic/angular'
-import { Metric } from 'src/app/services/api/api-types'
-import { ApiService } from 'src/app/services/api/api.service'
+import { Metric } from 'src/app/services/api/api.types'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { pauseFor } from 'src/app/util/misc.util'
 
 @Component({
@@ -25,7 +25,7 @@ export class AppMetricsPage {
   constructor (
     private readonly route: ActivatedRoute,
     private readonly errToast: ErrorToastService,
-    private readonly patch: PatchDbModel,
+    private readonly patch: PatchDbService,
     private readonly apiService: ApiService,
   ) { }
 

ui/src/app/pages/apps-routes/app-properties/app-properties.page.ts

@@ -1,12 +1,12 @@
 import { Component, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { Subscription } from 'rxjs'
 import { copyToClipboard } from 'src/app/util/web.util'
 import { AlertController, IonContent, NavController, PopoverController, ToastController } from '@ionic/angular'
 import { PackageProperties } from 'src/app/util/properties.util'
 import { QRComponent } from 'src/app/components/qr/qr.component'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { PackageMainStatus } from 'src/app/services/patch-db/data-model'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 import * as JsonPointer from 'json-pointer'
@@ -36,7 +36,7 @@ export class AppPropertiesPage {
     private readonly toastCtrl: ToastController,
     private readonly popoverCtrl: PopoverController,
     private readonly navCtrl: NavController,
-    private readonly patch: PatchDbModel,
+    private readonly patch: PatchDbService,
   ) { }
 
   async ngOnInit () {

ui/src/app/pages/apps-routes/app-restore/app-restore.page.ts

@@ -1,10 +1,10 @@
 import { Component, ViewChild } from '@angular/core'
 import { IonContent, LoadingController, ModalController } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { BackupConfirmationComponent } from 'src/app/modals/backup-confirmation/backup-confirmation.component'
-import { DiskInfo } from 'src/app/services/api/api-types'
+import { DiskInfo } from 'src/app/services/api/api.types'
 import { ActivatedRoute } from '@angular/router'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { Subscription } from 'rxjs'
 
 @Component({
@@ -28,7 +28,7 @@ export class AppRestorePage {
     private readonly modalCtrl: ModalController,
     private readonly apiService: ApiService,
     private readonly loadingCtrl: LoadingController,
-    private readonly patch: PatchDbModel,
+    private readonly patch: PatchDbService,
   ) { }
 
   ngOnInit () {

ui/src/app/pages/apps-routes/app-show/app-show.page.ts

@@ -1,6 +1,6 @@
 import { Component, ViewChild } from '@angular/core'
 import { AlertController, NavController, ModalController, IonContent } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { ActivatedRoute, NavigationExtras } from '@angular/router'
 import { chill, isEmptyObject, Recommendation } from 'src/app/util/misc.util'
 import { LoaderService } from 'src/app/services/loader.service'
@@ -8,7 +8,7 @@ import { combineLatest, Observable, of, Subscription } from 'rxjs'
 import { wizardModal } from 'src/app/components/install-wizard/install-wizard.component'
 import { WizardBaker } from 'src/app/components/install-wizard/prebaked-wizards'
 import { ConfigService } from 'src/app/services/config.service'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { DependencyErrorConfigUnsatisfied, DependencyErrorNotInstalled, DependencyErrorType, PackageDataEntry, PackageState } from 'src/app/services/patch-db/data-model'
 import { FEStatus, PkgStatusRendering, renderPkgStatus } from 'src/app/services/pkg-status-rendering.service'
 import { ConnectionService } from 'src/app/services/connection.service'
@@ -43,7 +43,7 @@ export class AppShowPage {
     private readonly apiService: ApiService,
     private readonly wizardBaker: WizardBaker,
     private readonly config: ConfigService,
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
     public readonly connectionService: ConnectionService,
   ) { }
 

ui/src/app/pages/maintenance/maintenance.page.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 import { ServerStatus } from 'src/app/services/patch-db/data-model'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 
 @Component({
   selector: 'Maintenance',
@@ -11,7 +11,7 @@ export class MaintenancePage {
   ServerStatus = ServerStatus
 
   constructor (
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
   ) { }
 }
 

ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.ts

@@ -1,14 +1,14 @@
 import { Component, ViewChild } from '@angular/core'
-import { MarketplaceData, MarketplaceEOS, MarketplacePkg } from 'src/app/services/api/api-types'
+import { MarketplaceData, MarketplaceEOS, MarketplacePkg } from 'src/app/services/api/api.types'
 import { wizardModal } from 'src/app/components/install-wizard/install-wizard.component'
 import { IonContent, ModalController } from '@ionic/angular'
 import { WizardBaker } from 'src/app/components/install-wizard/prebaked-wizards'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { PackageState } from 'src/app/services/patch-db/data-model'
 import { Subscription } from 'rxjs'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 import { MarketplaceService } from '../marketplace.service'
-import { MarketplaceApiService } from 'src/app/services/api/marketplace-api.service'
+import { MarketplaceApiService } from 'src/app/services/api/marketplace/marketplace-api.service'
 
 @Component({
   selector: 'marketplace-list',
@@ -41,7 +41,7 @@ export class MarketplaceListPage {
     private readonly modalCtrl: ModalController,
     private readonly errToast: ErrorToastService,
     private readonly wizardBaker: WizardBaker,
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
   ) { }
 
   async ngOnInit () {
@@ -91,6 +91,7 @@ export class MarketplaceListPage {
       this.modalCtrl,
       this.wizardBaker.updateOS({
         version: this.eos.version,
+        headline: this.eos.headline,
         releaseNotes: this.eos['release-notes'],
       }),
     )

ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts

@@ -6,7 +6,7 @@ import { WizardBaker } from 'src/app/components/install-wizard/prebaked-wizards'
 import { Emver } from 'src/app/services/emver.service'
 import { displayEmver } from 'src/app/pipes/emver.pipe'
 import { pauseFor, Recommendation } from 'src/app/util/misc.util'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 import { PackageDataEntry, PackageState } from 'src/app/services/patch-db/data-model'
 import { MarketplaceService } from '../marketplace.service'
@@ -37,7 +37,7 @@ export class MarketplaceShowPage {
     private readonly wizardBaker: WizardBaker,
     private readonly navCtrl: NavController,
     private readonly emver: Emver,
-    private readonly patch: PatchDbModel,
+    private readonly patch: PatchDbService,
     private readonly marketplaceService: MarketplaceService,
   ) { }
 

ui/src/app/pages/marketplace-routes/marketplace.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core'
-import { MarketplacePkg } from 'src/app/services/api/api-types'
-import { MarketplaceApiService } from 'src/app/services/api/marketplace-api.service'
+import { MarketplacePkg } from 'src/app/services/api/api.types'
+import { MarketplaceApiService } from 'src/app/services/api/marketplace/marketplace-api.service'
 
 @Injectable({
   providedIn: 'root',

ui/src/app/pages/notifications/notifications.page.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { LoaderService } from 'src/app/services/loader.service'
-import { ServerNotification, ServerNotifications } from 'src/app/services/api/api-types'
+import { ServerNotification, ServerNotifications } from 'src/app/services/api/api.types'
 import { AlertController } from '@ionic/angular'
 import { ActivatedRoute } from '@angular/router'
 import { ErrorToastService } from 'src/app/services/error-toast.service'

ui/src/app/pages/server-routes/developer-routes/dev-options/dev-options.page.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 import { ServerConfigService } from 'src/app/services/server-config.service'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 
 @Component({
   selector: 'dev-options',
@@ -11,7 +11,7 @@ export class DevOptionsPage {
 
   constructor (
     private readonly serverConfigService: ServerConfigService,
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
   ) { }
 
   async presentModalValueEdit (key: string, current?: any): Promise<void> {

ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/dev-ssh-keys.page.ts

@@ -4,7 +4,7 @@ import { AlertController } from '@ionic/angular'
 import { LoaderService } from 'src/app/services/loader.service'
 import { SSHService } from './ssh.service'
 import { Subscription } from 'rxjs'
-import { SSHKeys } from 'src/app/services/api/api-types'
+import { SSHKeys } from 'src/app/services/api/api.types'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 
 @Component({

ui/src/app/pages/server-routes/developer-routes/dev-ssh-keys/ssh.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { BehaviorSubject } from 'rxjs'
-import { SSHKeys } from 'src/app/services/api/api-types'
-import { ApiService } from 'src/app/services/api/api.service'
+import { SSHKeys } from 'src/app/services/api/api.types'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 
 @Injectable({
   providedIn: 'root',

ui/src/app/pages/server-routes/lan/lan.page.ts

@@ -3,8 +3,8 @@ import { isPlatform, ToastController } from '@ionic/angular'
 import { copyToClipboard } from 'src/app/util/web.util'
 import { ConfigService } from 'src/app/services/config.service'
 import { LoaderService } from 'src/app/services/loader.service'
-import { ApiService } from 'src/app/services/api/api.service'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { Subscription } from 'rxjs'
 
 @Component({
@@ -27,7 +27,7 @@ export class LANPage {
     private readonly config: ConfigService,
     private readonly loader: LoaderService,
     private readonly apiService: ApiService,
-    private readonly patch: PatchDbModel,
+    private readonly patch: PatchDbService,
   ) { }
 
   ngOnInit () {

ui/src/app/pages/server-routes/privacy/privacy.page.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 import { ServerConfigService } from 'src/app/services/server-config.service'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { Subscription } from 'rxjs'
 import { ConfigService } from 'src/app/services/config.service'
 
@@ -15,7 +15,7 @@ export class PrivacyPage {
   constructor (
     private readonly serverConfigService: ServerConfigService,
     public readonly config: ConfigService,
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
   ) { }
 
   async presentModalValueEdit (key: string, current?: string): Promise<void> {

ui/src/app/pages/server-routes/server-backup/server-backup.page.ts

@@ -1,8 +1,8 @@
 import { Component } from '@angular/core'
 import { LoadingController, ModalController } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { BackupConfirmationComponent } from 'src/app/modals/backup-confirmation/backup-confirmation.component'
-import { DiskInfo } from 'src/app/services/api/api-types'
+import { DiskInfo } from 'src/app/services/api/api.types'
 
 @Component({
   selector: 'server-backup',

ui/src/app/pages/server-routes/server-logs/server-logs.page.ts

@@ -1,5 +1,5 @@
 import { Component, ViewChild } from '@angular/core'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { IonContent } from '@ionic/angular'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 

ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
-import { Metrics } from 'src/app/services/api/api-types'
-import { ApiService } from 'src/app/services/api/api.service'
+import { Metrics } from 'src/app/services/api/api.types'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 import { pauseFor } from 'src/app/util/misc.util'
 

ui/src/app/pages/server-routes/server-show/server-show.page.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core'
 import { LoadingOptions } from '@ionic/core'
 import { AlertController, NavController } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { LoaderService } from 'src/app/services/loader.service'
 import { ActivatedRoute } from '@angular/router'
 

ui/src/app/pages/server-routes/server-specs/server-specs.page.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core'
 import { ToastController } from '@ionic/angular'
 import { copyToClipboard } from 'src/app/util/web.util'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { Subscription } from 'rxjs'
 
 @Component({
@@ -14,7 +14,7 @@ export class ServerSpecsPage {
 
   constructor (
     private readonly toastCtrl: ToastController,
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
   ) { }
 
   async copy (address: string) {

ui/src/app/pages/server-routes/wifi/wifi-add/wifi-add.page.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 import { NavController } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { WifiService } from '../wifi.service'
 import { LoaderService } from 'src/app/services/loader.service'
 import { ErrorToastService } from 'src/app/services/error-toast.service'

ui/src/app/pages/server-routes/wifi/wifi.page.ts

@@ -1,11 +1,11 @@
 import { Component } from '@angular/core'
 import { ActionSheetController } from '@ionic/angular'
-import { ApiService } from 'src/app/services/api/api.service'
+import { ApiService } from 'src/app/services/api/embassy/embassy-api.service'
 import { ActionSheetButton } from '@ionic/core'
 import { WifiService } from './wifi.service'
 import { LoaderService } from 'src/app/services/loader.service'
 import { WiFiInfo } from 'src/app/services/patch-db/data-model'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { Subscription } from 'rxjs'
 import { ErrorToastService } from 'src/app/services/error-toast.service'
 
@@ -23,7 +23,7 @@ export class WifiListPage {
     private readonly errToast: ErrorToastService,
     private readonly actionCtrl: ActionSheetController,
     private readonly wifiService: WifiService,
-    public readonly patch: PatchDbModel,
+    public readonly patch: PatchDbService,
   ) { }
 
   async presentAction (ssid: string, wifi: WiFiInfo) {

ui/src/app/pages/server-routes/wifi/wifi.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'
 import { AlertController, ToastController } from '@ionic/angular'
 import { merge, Observable, timer } from 'rxjs'
 import { filter, map, take, tap } from 'rxjs/operators'
-import { PatchDbModel } from 'src/app/services/patch-db/patch-db.service'
+import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 
 @Injectable({
   providedIn: 'root',
@@ -12,7 +12,7 @@ export class WifiService {
   constructor (
     private readonly toastCtrl: ToastController,
     private readonly alertCtrl: AlertController,
-    private readonly patch: PatchDbModel,
+    private readonly patch: PatchDbService,
   ) { }
 
   confirmWifi (ssid: string): Observable<boolean> {