From 2c877bdb117ac9902f4e4a916948a5430c2bdc69 Mon Sep 17 00:00:00 2001
From: Dhaarani <55541808+DhaaraniCIT@users.noreply.github.com>
Date: Tue, 17 Dec 2024 12:50:54 +0530
Subject: [PATCH 1/3] qbd direct prod fix (#1129)

---
 .../qbd-direct-onboarding-connector.component.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 cf092cf74..ad59346ef 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
@@ -55,7 +55,7 @@ export class QbdDirectOnboardingConnectorComponent implements OnInit {
 
   xmlFileContent: string;
 
-  isCompanyPathInvalid: boolean;
+  isCompanyPathInvalid: boolean = true;
 
   password: string;
 

From a412a0c08894961e3a948fa41f1c7ea3f763b81c Mon Sep 17 00:00:00 2001
From: Ashwin Thanaraj <37061471+ashwin1111@users.noreply.github.com>
Date: Tue, 17 Dec 2024 13:45:06 +0530
Subject: [PATCH 2/3] feat: Expose iif and beta QBD (#1131)

---
 .../landing/landing.component.html            | 91 +++++++++----------
 .../integrations/landing/landing.component.ts |  2 +-
 2 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/src/app/integrations/landing/landing.component.html b/src/app/integrations/landing/landing.component.html
index 948101dec..8a3454eda 100644
--- a/src/app/integrations/landing/landing.component.html
+++ b/src/app/integrations/landing/landing.component.html
@@ -32,66 +32,61 @@
                 Integrate your Expense Management account with the following accounting software.
             </p>
 
-            <div class="tw-flex">
+            <div class="tw-flex tw-flex-wrap tw-gap-5">
                 <div *ngIf="exposeApps.NETSUITE">
-                    <div class="landing--accounting-app tw-mr-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.NETSUITE)">
-                        <img src="assets/logos/netsuite-logo.png" width="120px" height="60px" />
-                        <span class="landing--accounting-app-name">
+                    <div class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.NETSUITE)">
+                        <img src="assets/logos/netsuite-logo.png" class="tw-mt-[-16px]" width="120px" height="60px" />
+                        <span class="landing--accounting-app-name !tw-pt-18-px">
                             NetSuite
                         </span>
                     </div>
-                    <!-- IIF -->
-                    <div *ngIf="!(exposeApps.QBD_DIRECT && org.allow_qbd_direct_integration) && exposeApps.QBD" class="landing--accounting-app tw-mr-20-px tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.QBD)">
-                        <img src="assets/logos/quickbooks-logo.png" class="tw-mt-[-20px]" width="120px" height="60px" />
-                        <span class="landing--accounting-app-name">
-                            QuickBooks Desktop
-                        </span>
-                    </div>
-                    <!-- Direct -->
-                    <div *ngIf="exposeApps.QBD_DIRECT && org.allow_qbd_direct_integration" class="landing--accounting-app tw-mr-20-px tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.QBD_DIRECT)">
-                        <img src="assets/logos/quickbooks-logo.png" class="tw-mt-[-20px]" width="120px" height="60px" />
-                        <span class="landing--accounting-app-name tw-gap-2 tw-px-4 tw-flex tw-items-center">
-                            QuickBooks Desktop
-                            <app-badge [theme]="ThemeOption.DARK" text="Beta"></app-badge>
-                        </span>
-                    </div>
                 </div>
-                <div>
-                    <div *ngIf="exposeApps.INTACCT" class="landing--accounting-app tw-mr-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.SAGE_INTACCT)">
-                        <img src="assets/logos/intacct-logo.png" width="120px" height="60px" />
-                        <span class="landing--accounting-app-name">
-                            Sage Intacct
-                        </span>
-                    </div>
-                    <div *ngIf="exposeApps.SAGE300" class="landing--accounting-app tw-mr-20-px tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.SAGE300)">
-                        <img src="assets/logos/sage300-logo.svg" width="110px" height="60px" />
-                        <span class="landing--accounting-app-name tw-gap-2">
-                            Sage 300 CRE
-                            <app-badge *ngIf="!orgsToHideSage300BetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK" text="Beta"></app-badge>
-                        </span>
-                    </div>
+                <div *ngIf="exposeApps.INTACCT" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.SAGE_INTACCT)">
+                    <img src="assets/logos/intacct-logo.png" class="tw-mt-[-16px]"  width="120px" height="60px" />
+                    <span class="landing--accounting-app-name !tw-pt-8-px">
+                        Sage Intacct
+                    </span>
                 </div>
-                <div>
-                    <div *ngIf="exposeApps.QBO" class="landing--accounting-app tw-mr-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.QBO)">
-                        <img class="tw-mt-10-px" src="assets/logos/quickbooks-logo.png" width="120px"  />
-                        <span class="landing--accounting-app-name !tw-pt-30-px">
-                            QuickBooks Online
-                        </span>
-                    </div>
-                    <div *ngIf="exposeApps.BUSINESS_CENTRAL && org.allow_dynamics" class="landing--accounting-app tw-mr-20-px tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.BUSINESS_CENTRAL)">
-                        <img src="assets/logos/BusinessCentral-logo.svg" class="tw-mt-[-20px]" width="50px" height="60px" />
-                        <span class="landing--accounting-app-name tw-gap-2 tw-px-4 tw-flex tw-items-center">
-                            Dynamics 365 Business Central
-                            <app-badge *ngIf="!orgsToHideBusinessCentralBetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK" text="Beta"></app-badge>
-                        </span>
-                    </div>
+                <div *ngIf="exposeApps.QBO" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.QBO)">
+                    <img class="tw-mt-10-px" src="assets/logos/quickbooks-logo.png" width="120px"  />
+                    <span class="landing--accounting-app-name">
+                        QuickBooks Online
+                    </span>
                 </div>
-                <div *ngIf="exposeApps.XERO" class="landing--accounting-app" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.XERO)">
+                <div *ngIf="exposeApps.XERO" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.XERO)">
                     <img src="assets/logos/xero-logo.png" class="tw-mt-[-20px]" width="65px" height="60px" />
                     <span class="landing--accounting-app-name">
                         Xero
                     </span>
                 </div>
+                <div *ngIf="exposeApps.QBD" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.QBD)">
+                    <img src="assets/logos/quickbooks-logo.png" width="120px" height="60px" />
+                    <span class="landing--accounting-app-name">
+                        QuickBooks Desktop (IIF)
+                    </span>
+                </div>
+                <!-- Direct -->
+                <div *ngIf="exposeApps.QBD_DIRECT && org.allow_qbd_direct_integration" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.QBD_DIRECT)">
+                    <img src="assets/logos/quickbooks-logo.png" width="120px" height="60px" />
+                    <span class="landing--accounting-app-name tw-gap-2 tw-px-4 tw-flex tw-items-center">
+                        QuickBooks Desktop (Web Connector)
+                        <app-badge [theme]="ThemeOption.DARK" text="Beta"></app-badge>
+                    </span>
+                </div>
+                <div *ngIf="exposeApps.SAGE300" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.SAGE300)">
+                    <img src="assets/logos/sage300-logo.svg" width="110px" height="60px" />
+                    <span class="landing--accounting-app-name tw-gap-2">
+                        Sage 300 CRE
+                        <app-badge *ngIf="!orgsToHideSage300BetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK" text="Beta"></app-badge>
+                    </span>
+                </div>
+                <div *ngIf="exposeApps.BUSINESS_CENTRAL && org.allow_dynamics" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.BUSINESS_CENTRAL)">
+                    <img src="assets/logos/BusinessCentral-logo.svg" class="tw-mt-[-20px]" width="50px" height="60px" />
+                    <span class="landing--accounting-app-name tw-gap-2 tw-px-4 tw-flex tw-items-center">
+                        Dynamics 365 Business Central
+                        <app-badge *ngIf="!orgsToHideBusinessCentralBetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK" text="Beta"></app-badge>
+                    </span>
+                </div>
             </div>
         </div>
 
diff --git a/src/app/integrations/landing/landing.component.ts b/src/app/integrations/landing/landing.component.ts
index c87142229..13ce762e4 100644
--- a/src/app/integrations/landing/landing.component.ts
+++ b/src/app/integrations/landing/landing.component.ts
@@ -72,7 +72,7 @@ export class LandingComponent implements OnInit {
 
   readonly brandingConfig = brandingConfig;
 
-  readonly isINCluster = this.storageService.get('cluster-domain').includes('in1');
+  readonly isINCluster = this.storageService.get('cluster-domain')?.includes('in1');
 
   readonly exposeApps = !this.isINCluster ? exposeAppConfig[brandingConfig.brandId][brandingConfig.envId] : exposeAppConfig[brandingConfig.brandId]['production-1-in'];
 

From 7e8db09eafa11ae8ca61d84bf8b8ed11e6a030af Mon Sep 17 00:00:00 2001
From: Dhaarani <55541808+DhaaraniCIT@users.noreply.github.com>
Date: Tue, 17 Dec 2024 13:52:48 +0530
Subject: [PATCH 3/3] QBD direct connection screen prod fix (#1130)

---
 .../qbd-direct-onboarding-connector.component.ts            | 2 +-
 .../qbd-direct-download-file.component.html                 | 6 +++---
 .../app-landing-page-header.component.html                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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 ad59346ef..6fff55ecb 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
@@ -55,7 +55,7 @@ export class QbdDirectOnboardingConnectorComponent implements OnInit {
 
   xmlFileContent: string;
 
-  isCompanyPathInvalid: boolean = true;
+  isCompanyPathInvalid: boolean = false;
 
   password: string;
 
diff --git a/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-download-file/qbd-direct-download-file.component.html b/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-download-file/qbd-direct-download-file.component.html
index ad2db1bd3..16b60730d 100644
--- a/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-download-file/qbd-direct-download-file.component.html
+++ b/src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-download-file/qbd-direct-download-file.component.html
@@ -27,10 +27,10 @@ <h4 class="tw-text-16-px tw-pb-4-px tw-font-500 tw-text-text-tertiary">Enter com
                         required
                         #downloadFilePathField="ngModel"
                         [ngClass]="{
-                            'error-box': (downloadFilePathField.invalid && downloadFilePathField.touched) || !isCompanyPathInvalid
+                            'error-box': (downloadFilePathField.invalid && downloadFilePathField.touched) || isCompanyPathInvalid
                           }">
-                        <div *ngIf="(downloadFilePathField.invalid && downloadFilePathField.touched) || !isCompanyPathInvalid" class="tw-text-alert-toast tw-pt-2-px">
-                            <small *ngIf="downloadFilePathField.errors?.required || !isCompanyPathInvalid" class="tw-flex">
+                        <div *ngIf="(downloadFilePathField.invalid && downloadFilePathField.touched) || isCompanyPathInvalid" class="tw-text-alert-toast tw-pt-2-px">
+                            <small *ngIf="downloadFilePathField.errors?.required || isCompanyPathInvalid" class="tw-flex">
                                 <app-svg-icon [svgSource]="'info-circle-fill'" [isTextColorAllowed]="true" [width]="'16px'" [height]="'16px'" [styleClasses]="'tw-text-form-error-help-text-color'"></app-svg-icon>
                                 Enter a valid company file path.</small>
                           </div>
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 50812409c..393647460 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
@@ -42,7 +42,7 @@
                 </button>
                 <button *ngIf="!isIntegrationConnected && (appName === AppName.QBD || appName === AppName.NETSUITE || appName === AppName.INTACCT || appName === AppName.SAGE300 || appName === AppName.BUSINESS_CENTRAL || appName.includes('QuickBooks Desktop '))" pButton type="button" class="p-button-raised" (click)="connect()">
                     {{buttonText}}
-                    <app-svg-icon *ngIf="(appName === AppName.QBD || appName.includes('QuickBooks Desktop ')) && 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 ')) && brandingFeatureConfig.isIconsInsideButtonAllowed && !isConnectionInProgress" [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>