From d59aaed1a5f2bafddc4c0714f90a0521ce75eb21 Mon Sep 17 00:00:00 2001
From: DhaaraniCIT <dhaaranieaswari@gmail.com>
Date: Wed, 11 Dec 2024 12:28:04 +0530
Subject: [PATCH] configuration fixes

---
 .../qbd-direct-import-settings.model.ts                       | 2 +-
 .../qbd-direct-export-settings.component.html                 | 1 +
 .../configuration-import-field.component.html                 | 2 +-
 .../configuration-select-field.component.html                 | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-import-settings.model.ts b/src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-import-settings.model.ts
index 552beeb5a..83f995c6c 100644
--- a/src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-import-settings.model.ts
+++ b/src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-import-settings.model.ts
@@ -36,7 +36,7 @@ export class QbdDirectImportSettingModel extends ImportSettingsModel {
         chartOfAccountTypes: new FormControl(importSettings?.import_settings?.chart_of_accounts ? importSettings.import_settings.chart_of_accounts.map(item => item.replace(/([a-z])([A-Z])/g, '$1 $2')) : ['Expense']),
         importVendorsAsMerchants: new FormControl(importSettings?.import_settings?.import_vendor_as_merchant ?? false),
         searchOption: new FormControl(''),
-        importCodeFields: new FormControl( importSettings?.import_settings?.import_code_fields ? importSettings.import_settings.import_code_fields : null),
+        importCodeFields: new FormControl( importSettings?.import_settings?.import_code_fields ? importSettings.import_settings.import_code_fields : []),
         importCategoryCode: new FormControl(this.getImportCodeField(importCode, 'ACCOUNT', QbdDirectImportCodeFieldCodeConfig)),
         workSpaceId: new FormControl(importSettings?.workspace_id)
       });
diff --git a/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.html b/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.html
index 0f07129cc..4084c0bbc 100644
--- a/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.html
+++ b/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.html
@@ -97,6 +97,7 @@
                             [options]="reimbursableExpenseGroupingFieldOptions" 
                             [iconPath]="'question-square-outline'"
                             [placeholder]="'Select expense grouping'" 
+                            [appName]="appName"
                             [isDisableTextRequired]="isReimbursableExportGroupDisabled()"
                             [isDisabled]="isReimbursableExportGroupDisabled()"
                             [formControllerName]="'reimbursableExportGroup'">
diff --git a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html
index 443508673..57f31359c 100644
--- a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html
+++ b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html
@@ -95,7 +95,7 @@ <h5 *ngIf="!isCloneSettingView" class="!tw-text-text-muted tw-text-14-px !tw-fon
                                 <app-svg-icon *ngIf="(expenseField.get('source_field')?.value !== 'CATEGORY') && (uiExposedAppName === AppName.XERO ? expenseField.get('destination_field')?.value !== 'CUSTOMER' : true )" [svgSource]="'cross-medium'" [c1SvgSource]="'grv-cross-filled-medium'" (click)="removeFilter(expenseField)" [height]="'18px'" [width]="'18px'" [styleClasses]="'tw-mt-4-px'"></app-svg-icon>
                             </ng-template>
                       </p-dropdown>
-                      <p *ngIf="(expenseField.get('source_field')?.value && !expenseField.valid && !hasDuplicateOption(expenseField, i, 'source_field')) || (!expenseField.get('source_field')?.value && expenseField.value.import_to_fyle)" class="tw-text-alert-toast tw-text-12-px tw-pt-4-px">
+                      <p *ngIf="(expenseField.get('source_field')?.value && !expenseField.valid && !hasDuplicateOption(expenseField, i, 'source_field'))" class="tw-text-alert-toast tw-text-12-px tw-pt-4-px">
                         {{brandingConfig.brandName}} Fields should be unique
                       </p>
                     </div>
diff --git a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html b/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html
index 7cc32b39d..91bbe25e6 100644
--- a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html
+++ b/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html
@@ -97,8 +97,8 @@ <h5 *ngIf="formControllerName === 'cccExportType' && brandingConfig.brandId ===
                         <span *ngIf="brandingConfig.brandId === 'co'"> in {{uiExposedAppName}}</span>
                     </div>
                     <div *ngIf="!showExportPreview && isDisabled && isDisableTextRequired" class="sub-text tw-text-pretty">
-                        <span>Auto-selected based on your export module</span>
-                        <span *ngIf="(formControllerName === 'reimbursableExportGroup' || formControllerName === 'creditCardExportGroup') && appName === AppName.QBD_DIRECT && form.controls.creditCardExportType.value !== 'CREDIT_CARD_PURCHASE'"> Auto-selected when your default credit account is set to an Accounts Payable account</span>
+                        <span *ngIf="!((formControllerName === 'reimbursableExportGroup' || formControllerName === 'creditCardExportGroup') && appName === AppName.QBD_DIRECT && form.controls.creditCardExportType.value !== 'CREDIT_CARD_PURCHASE' && form.controls.reimbursableExportType.value !== 'BILL')">Auto-selected based on your export module</span>
+                        <span *ngIf="(formControllerName === 'reimbursableExportGroup' || formControllerName === 'creditCardExportGroup') && appName === AppName.QBD_DIRECT && form.controls.creditCardExportType.value !== 'CREDIT_CARD_PURCHASE' && form.controls.reimbursableExportType.value !== 'BILL'"> Auto-selected when your default credit account is set to an Accounts Payable account</span>
                     </div>
                     <div *ngIf="brandingConfig.brandId !== 'co' && form.controls[formControllerName].value==='spent_at' && isOnboarding && form.get('cccExportType')?.value && form.get('cccExportGroup')?.value === 'REPORT'" class="sub-text">
                         <span>Using the Spend Date may lead to multiple single line<br>item entries.</span>