fix: breaking edit expense page (#3053)

fylein · Jun 5, 2024 · 6f9540f · 6f9540f
1 parent 3862c7d
commit 6f9540f
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts
@@ -2538,18 +2538,12 @@ export class AddEditExpensePage implements OnInit {
       };
     };
 
-    this.filteredCategories$ = this.etxn$.pipe(
-      switchMap((etxn) => {
-        if (etxn.tx.project_id) {
-          return this.activeCategories$.pipe(
-            map((allActiveCategories) => this.projectsService.getbyId(etxn.tx.project_id, allActiveCategories))
-          );
-        } else if (projectControl?.value?.project_id) {
-          return this.activeCategories$.pipe(
-            map((allActiveCategories) =>
-              this.projectsService.getbyId(projectControl.value.project_id, allActiveCategories)
-            )
-          );
+    const projectId$ = this.etxn$.pipe(map((etxn) => etxn.tx.project_id || projectControl?.value?.project_id));
+
+    this.filteredCategories$ = combineLatest([projectId$, this.activeCategories$]).pipe(
+      switchMap(([projectId, allActiveCategories]) => {
+        if (projectId) {
+          return this.projectsService.getbyId(projectId, allActiveCategories);
         } else {
           return of(null);
         }