From dc923ea6fb7b8f8d9ab50af9b166b1a96335f270 Mon Sep 17 00:00:00 2001
From: Matt Hill <matthewonthemoon@gmail.com>
Date: Wed, 21 Jul 2021 10:31:08 -0600
Subject: [PATCH] fix rendering bug in marketplace

---
 .../marketplace-list/marketplace-list.page.html             | 6 +++---
 .../marketplace-show/marketplace-show.page.ts               | 2 --
 ui/src/app/pages/marketplace-routes/marketplace.service.ts  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html b/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
index fd2298753..bc1352bd5 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
+++ b/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
@@ -11,7 +11,7 @@
 </ion-header>
 
 <ion-content class="ion-padding-top">
-  <text-spinner *ngIf="pageLoading; else pageLoaded" [text]="'loading marketplace'"></text-spinner>
+  <text-spinner *ngIf="pageLoading; else pageLoaded" text="Loading Marketplace"></text-spinner>
 
   <ng-template #pageLoaded>
     <ion-card *ngIf="eos" class="eos-card" (click)="updateEos()">
@@ -39,7 +39,7 @@
     </div>
 
     <div *ngIf="pkgsLoading; else loaded" style="margin-top: 64px;" class="ion-text-center">
-      <ion-spinner name="lines" color="warning"></ion-spinner>
+      <text-spinner [text]="'Loading ' + (category | titlecase)"></text-spinner>
     </div>
 
     <ng-template #loaded>
@@ -53,7 +53,7 @@
               <ion-label>
                 <h2 style="font-family: 'Montserrat';">{{ pkg.manifest.title }}</h2>
                 <p>{{ pkg.manifest.description.short }}</p>
-                <ng-container *ngIf="localPkgs[pkg.id] as localPkg">
+                <ng-container *ngIf="localPkgs[pkg.manifest.id] as localPkg">
                   <p *ngIf="localPkg.state === PackageState.Installed">
                     <ion-text *ngIf="(pkg.manifest.version | compareEmver : localPkg.manifest.version) === 0" color="success">Installed</ion-text>
                     <ion-text *ngIf="(pkg.manifest.version | compareEmver : localPkg.manifest.version) === 1" color="warning">Update Available</ion-text>
diff --git a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
index ab0951db2..efe0be868 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
+++ b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.ts
@@ -131,8 +131,6 @@ export class MarketplaceShowPage {
       }),
     )
     if (cancelled) return
-    await pauseFor(250)
-    this.navCtrl.back()
   }
 
   async update (action: 'update' | 'downgrade') {
diff --git a/ui/src/app/pages/marketplace-routes/marketplace.service.ts b/ui/src/app/pages/marketplace-routes/marketplace.service.ts
index 90b23fbb7..067ef4c7d 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace.service.ts
+++ b/ui/src/app/pages/marketplace-routes/marketplace.service.ts
@@ -9,7 +9,7 @@ import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 })
 export class MarketplaceService {
   pkgs: { [id: string]: MarketplacePkg } = { }
-  updates: MarketplacePkg[] = null
+  updates: MarketplacePkg[] = []
   releaseNotes: { [id: string]: {
     [version: string]: string
   } } = { }