Skip to content

Commit 2f53d75

Browse files
authored
fix: Add corporate card task display condition similar to web app (#4008)
1 parent 5843c36 commit 2f53d75

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/app/core/services/tasks.service.ts

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,13 +563,25 @@ export class TasksService {
563563
getAddCorporateCardTask(): Observable<DashboardTask[]> {
564564
return forkJoin([this.orgSettingsService.get(), this.corporateCreditCardExpenseService.getCorporateCards()]).pipe(
565565
map(([orgSettings, cards]) => {
566-
const isRtfEnabled =
567-
(orgSettings.visa_enrollment_settings.allowed && orgSettings.visa_enrollment_settings.enabled) ||
568-
(orgSettings.mastercard_enrollment_settings.allowed && orgSettings.mastercard_enrollment_settings.enabled);
566+
const isVisaRtfEnabled =
567+
orgSettings.visa_enrollment_settings.allowed && orgSettings.visa_enrollment_settings.enabled;
568+
const isMastercardRtfEnabled =
569+
orgSettings.mastercard_enrollment_settings.allowed && orgSettings.mastercard_enrollment_settings.enabled;
570+
const isAmexFeedEnabled =
571+
orgSettings.amex_feed_enrollment_settings.allowed && orgSettings.amex_feed_enrollment_settings.enabled;
572+
const isRtfEnabled = isVisaRtfEnabled || isMastercardRtfEnabled || isAmexFeedEnabled;
573+
const isBankDataAggregationEnabled =
574+
orgSettings.bank_data_aggregation_settings?.allowed && orgSettings.bank_data_aggregation_settings?.enabled;
569575
const isCCCEnabled =
570576
orgSettings.corporate_credit_card_settings.allowed && orgSettings.corporate_credit_card_settings.enabled;
571577
const rtfCards = cards.filter((card) => card.is_visa_enrolled || card.is_mastercard_enrolled);
572-
if (isRtfEnabled && isCCCEnabled && rtfCards.length === 0) {
578+
579+
if (
580+
isCCCEnabled &&
581+
isRtfEnabled &&
582+
rtfCards.length === 0 &&
583+
(isVisaRtfEnabled || isMastercardRtfEnabled || isBankDataAggregationEnabled)
584+
) {
573585
return this.mapAddCorporateCardTask();
574586
} else {
575587
return [] as DashboardTask[];

0 commit comments

Comments
 (0)