Minor

fylein · Dec 18, 2024 · ffe935e · ffe935e
1 parent df6dc31
commit ffe935e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/app/core/services/tasks.service.spec.ts b/src/app/core/services/tasks.service.spec.ts
@@ -422,6 +422,7 @@ describe('TasksService', () => {
 
   describe('getAddCorporateCardTask(): ', () => {
     it('should return add corporate card task when no cards are enrolled', (done) => {
+      orgSettingsService.get.and.returnValue(of(orgSettingsRes));
       corporateCreditCardExpenseService.getCorporateCards.and.returnValue(of([statementUploadedCard]));
       const addCcSpy = spyOn(tasksService, 'mapAddCorporateCardTask');
 

diff --git a/src/app/core/services/tasks.service.ts b/src/app/core/services/tasks.service.ts
@@ -532,10 +532,15 @@ export class TasksService {
   }
 
   getAddCorporateCardTask(): Observable<DashboardTask[]> {
-    return this.corporateCreditCardExpenseService.getCorporateCards().pipe(
-      map((cards) => {
+    return forkJoin([this.orgSettingsService.get(), this.corporateCreditCardExpenseService.getCorporateCards()]).pipe(
+      map(([orgSettings, cards]) => {
+        const isRtfEnabled =
+          (orgSettings.visa_enrollment_settings.allowed && orgSettings.visa_enrollment_settings.enabled) ||
+          (orgSettings.mastercard_enrollment_settings.allowed && orgSettings.mastercard_enrollment_settings.enabled);
+        const isCCCEnabled =
+          orgSettings.corporate_credit_card_settings.allowed && orgSettings.corporate_credit_card_settings.enabled;
         const rtfCards = cards.filter((card) => card.is_visa_enrolled || card.is_mastercard_enrolled);
-        if (rtfCards.length === 0) {
+        if (isRtfEnabled && isCCCEnabled && rtfCards.length === 0) {
           return this.mapAddCorporateCardTask();
         } else {
           return [] as DashboardTask[];