diff --git a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts index 109b27b3b..2a29efacc 100644 --- a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts +++ b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts @@ -152,7 +152,7 @@ export class QbdDirectDashboardComponent implements OnInit { this.importCodeFields = responses[5].import_settings?.import_code_fields; - this.chartOfAccounts = responses[5].import_settings.import_account_as_category ? responses[5].import_settings.chart_of_accounts : QbdDirectImportSettingModel.getChartOfAccountTypesList(); + this.chartOfAccounts = responses[5].import_settings.import_account_as_category ? responses[5].import_settings.chart_of_accounts.map((item: string) => item.replace(/\s+/g, '')) : QbdDirectImportSettingModel.getChartOfAccountTypesList().map((item: string) => item.replace(/\s+/g, '')); const queuedTasks: QbdDirectTaskLog[] = responses[2].results.filter((task: QbdDirectTaskLog) => this.exportLogProcessingStates.includes(task.status)); this.failedExpenseGroupCount = responses[2].results.filter((task: QbdDirectTaskLog) => task.status === TaskLogState.ERROR || task.status === TaskLogState.FATAL).length; diff --git a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts index abfd042d8..fd773f7c1 100644 --- a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts +++ b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts @@ -107,7 +107,7 @@ export class QbdDirectBaseMappingComponent implements OnInit { this.cccExpenseObject = responses[0].credit_card_expense_export_type; this.employeeFieldMapping = (responses[0].employee_field_mapping as unknown as FyleField); this.nameInJE = responses[0].name_in_journal_entry; - this.chartOfAccounts = responses[1].import_settings.import_account_as_category ? responses[1].import_settings.chart_of_accounts : QbdDirectImportSettingModel.getChartOfAccountTypesList(); + this.chartOfAccounts = responses[1].import_settings.import_account_as_category ? responses[1].import_settings.chart_of_accounts.map((item: string) => item.replace(/\s+/g, '')) : QbdDirectImportSettingModel.getChartOfAccountTypesList().map((item: string) => item.replace(/\s+/g, '')); this.destinationField = this.getDestinationField(responses[0], responses[2].results); diff --git a/src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts b/src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts index a1bb46e03..935cee489 100644 --- a/src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts +++ b/src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts @@ -54,7 +54,7 @@ export class QbdDirectOnboardingConnectorComponent implements OnInit { xmlFileContent: string; - isCompanyPathInvalid: boolean = true; + isCompanyPathInvalid: boolean; password: string; @@ -87,12 +87,12 @@ export class QbdDirectOnboardingConnectorComponent implements OnInit { this.isDownloadfileLoading = true; this.isCompanyPathInvalid = false; this.qbdDirectConnectorService.postQbdDirectConntion({file_location: filePath}).subscribe((connectionResponse: QbdConnectorGet) => { - this.password = connectionResponse.password; - this.xmlFileContent = connectionResponse.qwc; - this.triggerManualDownload(); - this.showDownloadLink = true; + this.password = connectionResponse.password; + this.xmlFileContent = connectionResponse.qwc; + this.showDownloadLink = true; + this.isDownloadfileLoading = false; + this.triggerManualDownload(); }); - this.isDownloadfileLoading = false; } else { this.isCompanyPathInvalid = true; } diff --git a/src/app/shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts b/src/app/shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts index dcecf69c2..c6335e40a 100644 --- a/src/app/shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts +++ b/src/app/shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts @@ -126,7 +126,7 @@ export class DashboardErrorSectionComponent implements OnInit { } if (this.destinationField === AccountingField.ACCOUNT && this.appName === AppName.QBD_DIRECT) { - this.detailAccountType = this.chartOfAccounts; + this.detailAccountType = this.chartOfAccounts.map((item: string) => item.replace(/\s+/g, '')); } else { this.detailAccountType = undefined; }