Merge remote-tracking branch 'origin/need-list-abstraction' into need-list-abstraction

# Conflicts:
#	ufund-ui/src/app/components/cupboard/cupboard.component.html
#	ufund-ui/src/app/components/cupboard/cupboard.component.ts
#	ufund-ui/src/app/components/funding-basket/funding-basket.component.html
#	ufund-ui/src/app/components/need-list/need-list.component.ts

2 files changed, 5 insertions, 4 deletions

diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.html b/ufund-ui/src/app/components/cupboard/cupboard.component.html
index 5d6c93a..bdc8a0e 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -26,9 +26,9 @@
         </div>
         <!--<button (click)="close()">Close</button>-->
     </div>
-    <h2 *ngIf="searchResults.length < needs.length && searchResults.length != 0"> Search Results({{needs.length - searchResults.length}} needs filtered): </h2>
-    <h2 *ngIf="searchResults.length == needs.length"> All Needs </h2>
-    <h2 *ngIf="searchResults.length == 0"> No Results Found </h2>
+    <h2 *ngIf="(searchResults | async)?.length < needs.length && (searchResults | async)?.length != 0"> Search Results({{needs.length - (searchResults | async)?.length}} needs filtered): </h2>
+    <h2 *ngIf="(searchResults | async)?.length == needs.length"> All Needs </h2>
+    <h2 *ngIf="(searchResults | async)?.length == 0"> No Results Found </h2>
 
     <app-need-list [needs]="searchResults" #needList></app-need-list>
 </div>
diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
index 847baee..0b3b9f3 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
@@ -2,7 +2,7 @@ import {Component, Input, OnInit, ViewChild} from '@angular/core';
 import {UsersService} from '../../services/users.service';
 import {Router} from '@angular/router';
 import {CupboardService} from '../../services/cupboard.service';
-import {catchError, firstValueFrom, Observable} from 'rxjs';
+import {catchError, firstValueFrom, Observable, of} from 'rxjs';
 import {AuthService} from '../../services/auth.service';
 import {ToastsService, ToastType} from '../../services/toasts.service';
 
@@ -91,4 +91,5 @@ export class FundingBasketComponent implements OnInit {
     }
 
 
+    protected readonly of = of;
 }