From 2bcc8e0d306fecb2169ad5d99451019f11c8ec6a Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Tue, 14 Mar 2023 11:24:54 -0600
Subject: [PATCH] only when version higher and show after login (#2217)

* only when version higher and show after login

* unused import
---
 .../ui/src/app/app/menu/menu.component.ts         |  6 +++---
 .../ui/src/app/pages/updates/updates.page.ts      | 15 +++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/frontend/projects/ui/src/app/app/menu/menu.component.ts b/frontend/projects/ui/src/app/app/menu/menu.component.ts
index b2487ae7e..abe5d89b7 100644
--- a/frontend/projects/ui/src/app/app/menu/menu.component.ts
+++ b/frontend/projects/ui/src/app/app/menu/menu.component.ts
@@ -9,12 +9,12 @@ import { PatchDB } from 'patch-db-client'
 import {
   combineLatest,
   filter,
+  first,
   map,
   Observable,
   pairwise,
   startWith,
   switchMap,
-  withLatestFrom,
 } from 'rxjs'
 import { AbstractMarketplaceService } from '@start9labs/marketplace'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
@@ -69,8 +69,8 @@ export class MenuComponent {
 
   private readonly local$ = this.connectionService.connected$.pipe(
     filter(Boolean),
-    withLatestFrom(this.patch.watch$('package-data')),
-    switchMap(([_, outer]) =>
+    switchMap(() => this.patch.watch$('package-data').pipe(first())),
+    switchMap(outer =>
       this.patch.watch$('package-data').pipe(
         pairwise(),
         filter(([prev, curr]) =>
diff --git a/frontend/projects/ui/src/app/pages/updates/updates.page.ts b/frontend/projects/ui/src/app/pages/updates/updates.page.ts
index 8491926e9..39cbb6749 100644
--- a/frontend/projects/ui/src/app/pages/updates/updates.page.ts
+++ b/frontend/projects/ui/src/app/pages/updates/updates.page.ts
@@ -4,7 +4,6 @@ import { PatchDB } from 'patch-db-client'
 import {
   DataModel,
   PackageDataEntry,
-  PackageState,
 } from 'src/app/services/patch-db/data-model'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import {
@@ -179,16 +178,12 @@ export class FilterUpdatesPipe implements PipeTransform {
     pkgs: MarketplacePkg[],
     local: Record<string, PackageDataEntry | undefined>,
   ): MarketplacePkg[] {
-    return pkgs.filter(({ manifest }) => {
-      const localPkg = local[manifest.id]
-
-      return (
-        localPkg?.state === PackageState.Updating ||
+    return pkgs.filter(
+      ({ manifest }) =>
         this.emver.compare(
           manifest.version,
-          localPkg?.installed?.manifest.version || '',
-        ) === 1
-      )
-    })
+          local[manifest.id]?.installed?.manifest.version || '',
+        ) === 1,
+    )
   }
 }