diff --git a/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.spec.ts b/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.spec.ts
index 517b4ca4d..a7bfc95dd 100644
--- a/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.spec.ts
+++ b/src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.spec.ts
@@ -5,7 +5,7 @@ import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
import { Router } from '@angular/router';
import { of, throwError, Subject } from 'rxjs';
import { MessageService } from 'primeng/api';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
import { QboExportSettingsComponent } from './qbo-export-settings.component';
import { HelperService } from 'src/app/core/services/common/helper.service';
import { MappingService } from 'src/app/core/services/common/mapping.service';
@@ -42,6 +42,7 @@ import { consumerPollProducersForChange } from '@angular/core/primitives/signals
import { brandingFeatureConfig } from 'src/app/branding/branding-config';
import { FeatureConfiguration } from 'src/app/core/models/branding/feature-configuration.model';
import { QboEmployeeSettingsService } from 'src/app/core/services/qbo/qbo-configuration/qbo-employee-settings.service';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
describe('QboExportSettingsComponent', () => {
let component: QboExportSettingsComponent;
@@ -78,12 +79,9 @@ describe('QboExportSettingsComponent', () => {
const router = jasmine.createSpyObj('Router', ['navigate']);
await TestBed.configureTestingModule({
- declarations: [ QboExportSettingsComponent ],
- imports: [
- ReactiveFormsModule,
- HttpClientTestingModule // Add this import
- ],
- providers: [
+ declarations: [QboExportSettingsComponent],
+ imports: [ReactiveFormsModule],
+ providers: [
FormBuilder,
{ provide: QboExportSettingsService, useValue: exportSettingsService },
{ provide: HelperService, useValue: helperService },
@@ -96,14 +94,16 @@ describe('QboExportSettingsComponent', () => {
{ provide: Router, useValue: router },
{ provide: 'brandingFeatureConfig', useValue: mockBrandingConfig },
{
- provide: QboEmployeeSettingsService,
- useValue: jasmine.createSpyObj('QboEmployeeSettingsService', [
- 'getEmployeeSettings',
- 'getDistinctQBODestinationAttributes'
- ])
- }
- ]
- }).compileComponents();
+ provide: QboEmployeeSettingsService,
+ useValue: jasmine.createSpyObj('QboEmployeeSettingsService', [
+ 'getEmployeeSettings',
+ 'getDistinctQBODestinationAttributes'
+ ])
+ },
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting()
+ ]
+}).compileComponents();
exportSettingsServiceSpy = TestBed.inject(QboExportSettingsService) as jasmine.SpyObj
;
helperServiceSpy = TestBed.inject(HelperService) as jasmine.SpyObj;
diff --git a/src/app/integrations/qbo/qbo.component.spec.ts b/src/app/integrations/qbo/qbo.component.spec.ts
index 24f32eb11..9c8d70ac1 100644
--- a/src/app/integrations/qbo/qbo.component.spec.ts
+++ b/src/app/integrations/qbo/qbo.component.spec.ts
@@ -11,7 +11,8 @@ import { QboHelperService } from 'src/app/core/services/qbo/qbo-core/qbo-helper.
import { QBOOnboardingState, AppUrl } from 'src/app/core/models/enum/enum.model';
import { mockUser, mockWorkspace, testOnboardingState } from './qbo.fixture';
import { SharedModule } from 'src/app/shared/shared.module';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
describe('QboComponent', () => {
let component: QboComponent;
@@ -47,18 +48,20 @@ describe('QboComponent', () => {
};
await TestBed.configureTestingModule({
- declarations: [QboComponent],
- imports: [SharedModule, HttpClientTestingModule],
- providers: [
+ declarations: [QboComponent],
+ imports: [SharedModule],
+ providers: [
{ provide: HelperService, useValue: helperSpy },
{ provide: QboHelperService, useValue: qboHelperSpy },
{ provide: StorageService, useValue: storageSpy },
{ provide: IntegrationsUserService, useValue: userSpy },
{ provide: WorkspaceService, useValue: workspaceSpy },
{ provide: WindowService, useValue: windowServiceMock },
- provideRouter([])
- ]
- }).compileComponents();
+ provideRouter([]),
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting()
+ ]
+}).compileComponents();
helperServiceSpy = TestBed.inject(HelperService) as jasmine.SpyObj;
qboHelperServiceSpy = TestBed.inject(QboHelperService) as jasmine.SpyObj;
diff --git a/src/app/integrations/sage300/sage300-shared/sage300-advanced-settings/sage300-advanced-settings.component.html b/src/app/integrations/sage300/sage300-shared/sage300-advanced-settings/sage300-advanced-settings.component.html
index 9d4bf681b..2a39216cf 100644
--- a/src/app/integrations/sage300/sage300-shared/sage300-advanced-settings/sage300-advanced-settings.component.html
+++ b/src/app/integrations/sage300/sage300-shared/sage300-advanced-settings/sage300-advanced-settings.component.html
@@ -25,7 +25,7 @@
@@ -36,7 +36,7 @@
[isFieldMandatory]="false"
[mandatoryErrorListName]="'automatic export method'"
[label]="'Set up export frequency'"
- [subLabel]="'Set a frequency based on how often you want your expenses in Fyle to be exported to Sage 300 CRE'"
+ [subLabel]="'Set a frequency based on how often you want your expenses in ' + brandingConfig.brandName + ' to be exported to Sage 300 CRE'"
[options]="hours"
[placeholder]="'Set Schedule'"
[formControllerName]="'scheduleAutoExportFrequency'">
@@ -47,7 +47,7 @@
+ [subLabel]="'In this section, you can customize the data that you\'d like to export from ' + brandingConfig.brandName + ' to Sage 300 CRE. You can choose what data points need to be exported and what shouldn\'t be.'">
@@ -72,8 +72,8 @@
Preview of the Description
diff --git a/src/app/integrations/travelperk/travelperk.component.spec.ts b/src/app/integrations/travelperk/travelperk.component.spec.ts
index 88cdb970c..e4050c695 100644
--- a/src/app/integrations/travelperk/travelperk.component.spec.ts
+++ b/src/app/integrations/travelperk/travelperk.component.spec.ts
@@ -1,5 +1,5 @@
-import { HttpClientModule } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { TravelperkService } from 'src/app/core/services/travelperk/travelperk.service';
import { of, throwError } from 'rxjs';
@@ -44,17 +44,17 @@ xdescribe('TravelperkComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [ TravelperkComponent ],
- imports: [
- HttpClientModule, HttpClientTestingModule
- ],
- providers: [
- {provide: TravelperkService, useValue: service1},
- {provide: OrgService, useValue: service2 },
- {provide: EventsService, useValue: service3},
- MessageService
- ]
- })
+ declarations: [TravelperkComponent],
+ imports: [],
+ providers: [
+ { provide: TravelperkService, useValue: service1 },
+ { provide: OrgService, useValue: service2 },
+ { provide: EventsService, useValue: service3 },
+ MessageService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting()
+ ]
+})
.compileComponents();
fixture = TestBed.createComponent(TravelperkComponent);
diff --git a/src/app/integrations/xero/xero-main/xero-dashboard/xero-dashboard.component.html b/src/app/integrations/xero/xero-main/xero-dashboard/xero-dashboard.component.html
index cd9121323..19a78cd0a 100644
--- a/src/app/integrations/xero/xero-main/xero-dashboard/xero-dashboard.component.html
+++ b/src/app/integrations/xero/xero-main/xero-dashboard/xero-dashboard.component.html
@@ -22,8 +22,8 @@
+ [headerText]="brandingContent.dashboardExportZeroStateHeaderText"
+ [subHeaderText]="brandingContent.dashboardExportZeroStateSubHeaderText">
+ [mainText]="brandingContent.completeExportLogZeroStateHeaderText"
+ [subText]="brandingContent.completeExportLogZeroStateSubHeaderText">
+ [mainText]="brandingContent.completeExportLogCountZeroStateHeaderText"
+ [subText]="brandingContent.completeExportLogCountZeroStateSubHeaderText">