From 17ce10b149d04190832ddc24da818dbbb79222c6 Mon Sep 17 00:00:00 2001
From: Ashwin Thanaraj <37061471+ashwin1111@users.noreply.github.com>
Date: Tue, 10 Dec 2024 18:12:49 +0530
Subject: [PATCH] fix conflicts

---
 .../app-landing-page-header.component.html                   | 5 +++--
 .../app-landing-page-header.component.ts                     | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html
index 6e9204ddc..0d3f63d16 100644
--- a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html
+++ b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html
@@ -40,9 +40,10 @@
                 <button *ngIf="isIntegrationConnected && (appName === AppName.BAMBOO_HR || appName === AppName.TRAVELPERK)" pButton type="button" class="p-button danger-outline" (click)="disconnect()">
                     {{ isConnectionInProgress ? 'Disconnecting' : 'Disconnect' }}
                 </button>
-                <button *ngIf="!isIntegrationConnected && (appName === AppName.QBD || appName === AppName.NETSUITE || appName === AppName.INTACCT || appName === AppName.SAGE300 || appName === AppName.BUSINESS_CENTRAL)" pButton type="button" class="p-button-raised" (click)="connect()">
+                <button *ngIf="!isIntegrationConnected && (appName === AppName.QBD || appName === AppName.NETSUITE || appName === AppName.INTACCT || appName === AppName.SAGE300 || appName === AppName.BUSINESS_CENTRAL || appName.includes('QuickBooks Desktop - Direct Integration'))" pButton type="button" class="p-button-raised" (click)="connect()">
                     {{buttonText}}
-                    <app-svg-icon *ngIf="appName === AppName.QBD && brandingFeatureConfig.isIconsInsideButtonAllowed" [svgSource]="'arrow-tail-right-medium'" [width]="'18px'" [height]="'18px'" [styleClasses]="'tw-pl-10-px tw-pt-2-px !tw-text-12-px'"></app-svg-icon>
+                    <app-svg-icon *ngIf="(appName === AppName.QBD || appName.includes('QuickBooks Desktop - Direct Integration')) && brandingFeatureConfig.isIconsInsideButtonAllowed" [svgSource]="'arrow-tail-right-medium'" [width]="'18px'" [height]="'18px'" [styleClasses]="'tw-pl-10-px tw-pt-2-px !tw-text-12-px'"></app-svg-icon>
+                    <app-loader class="tw-ml-10-px" *ngIf="isConnectionInProgress" [styleClass]="'spinner-16-white tw-top-2-px'"></app-loader>
                 </button>
                 <iframe *ngIf="iframeSourceUrl && (appName === AppName.TRAVELPERK)" scrolling="no" [src]="iframeSourceUrl" class="tw-mt-40-px tw-w-270-px tw-h-84-px"></iframe>
                 <div *ngIf="showQBOButton" class="tw-cursor-pointer">
diff --git a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.ts b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.ts
index 3a9a91ecd..b0ce11b1d 100644
--- a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.ts
+++ b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.ts
@@ -90,8 +90,7 @@ export class AppLandingPageHeaderComponent implements OnInit {
   }
 
   connect(): void {
-
-    if (this.appName === AppName.TRAVELPERK || this.appName === AppName.BUSINESS_CENTRAL || this.appName === AppName.BAMBOO_HR || this.appName === AppName.XERO) {
+    if (this.appName === AppName.TRAVELPERK || this.appName === AppName.BUSINESS_CENTRAL || this.appName === AppName.BAMBOO_HR || this.appName === AppName.XERO || this.appName.includes('QuickBooks Desktop - Direct Integration')) {
       this.initiateOAuth();
       return;
     } else if (this.postConnectionRoute === 'qbd/onboarding/export_settings') {