fix: Deprecate simplify report settings

src/app/core/mock-data/modal-controller.data.ts

@@ -352,7 +352,7 @@ export const teamReportsModalControllerParams = {
         ],
       } as FilterOptions<string>,
     ],
-    simplifyReportsSettings$: undefined,
+
     selectedFilterValues: selectedFilters4,
     activeFilterInitialName: 'State',
   },
@@ -388,7 +388,6 @@ export const addToReportModalControllerParams = {
     subheader: 'All',
     enableSearch: false,
     autoSubmissionReportName: '#Aug 1',
-    isNewReportsFlowEnabled: false,
   },
   mode: 'ios' as Mode,
   cssClass: 'fy-modal',

src/app/core/mock-data/my-reports.data.ts

@@ -206,7 +206,6 @@ export const filterPopoverParams = {
   component: FyFiltersComponent,
   componentProps: {
     filterOptions: openFiltersOptions,
-    simplifyReportsSettings$: undefined,
     nonReimbursableOrg$: undefined,
     selectedFilterValues: [{ name: 'state', value: 'PENDING' }],
     activeFilterInitialName: 'State',

src/app/core/mock-data/org-settings.data.ts

@@ -1238,14 +1238,6 @@ export const orgSettingsCCCEnabled: OrgSettings = deepFreeze({
   },
 });
 
-export const orgSettingsParamsWithSimplifiedReport: OrgSettings = deepFreeze({
-  ...orgSettingsRes,
-  simplified_report_closure_settings: {
-    allowed: true,
-    enabled: true,
-  },
-});
-
 export const orgSettingsParamsWithAdvanceWallet: OrgSettings = deepFreeze({
   ...orgSettingsRes,
   advances: {
@@ -1293,9 +1285,6 @@ export const orgSettingsWoTax: OrgSettings = deepFreeze({
   ...orgSettingsData,
   tax_settings: { ...orgSettingsData.tax_settings, enabled: false },
   advances: null,
-  simplified_report_closure_settings: {
-    enabled: true,
-  },
   corporate_credit_card_settings: {
     allowed: true,
     enabled: true,

src/app/core/mock-data/report-stats-data.data.ts

@@ -5,13 +5,7 @@ import { expectedReportStats } from './report-stats.data';
 
 export const reportStatsData1: ReportStatsData = deepFreeze({
   reportStats: expectedReportStats,
-  simplifyReportsSettings: { enabled: true },
   homeCurrency: 'INR',
   currencySymbol: '₹',
   isNonReimbursableOrg: false,
 });
-
-export const reportStatsData2: ReportStatsData = deepFreeze({
-  ...reportStatsData1,
-  simplifyReportsSettings: { enabled: undefined },
-});

src/app/core/models/org-settings.model.ts

@@ -457,7 +457,6 @@ export interface OrgSettingsResponse {
   company_expenses_beta_settings?: CommonOrgSettings;
   trip_request_settings?: CommonOrgSettings;
   xe_provider_settings?: XeProviderSettings;
-  simplified_report_closure_settings?: CommonOrgSettings;
   mobile_app_my_expenses_beta_enabled?: boolean;
   amex_feed_enrollment_settings?: AmexFeedEnrollmentSettings;
   pending_cct_expense_restriction?: CommonOrgSettings;
@@ -572,7 +571,6 @@ export interface OrgSettings {
   visa_enrollment_settings?: CommonOrgSettings;
   mastercard_enrollment_settings?: CommonOrgSettings;
   company_expenses_beta_settings?: CommonOrgSettings;
-  simplified_report_closure_settings?: CommonOrgSettings;
   mobile_app_my_expenses_beta_enabled?: boolean;
   amex_feed_enrollment_settings?: AmexFeedEnrollmentSettings;
   pending_cct_expense_restriction?: CommonOrgSettings;

src/app/core/models/report-stats-data.model.ts

@@ -2,7 +2,6 @@ import { ReportStats } from './report-stats.model';
 
 export interface ReportStatsData {
   reportStats: ReportStats;
-  simplifyReportsSettings: { enabled: boolean };
   homeCurrency: string;
   currencySymbol: string;
   isNonReimbursableOrg: boolean;

src/app/core/services/org-settings.service.ts

@@ -414,10 +414,6 @@ export class OrgSettingsService {
         allowed: incoming.company_expenses_beta_settings && incoming.company_expenses_beta_settings.allowed,
         enabled: incoming.company_expenses_beta_settings && incoming.company_expenses_beta_settings.enabled,
       },
-      simplified_report_closure_settings: {
-        allowed: incoming?.simplified_report_closure_settings?.allowed,
-        enabled: incoming?.simplified_report_closure_settings?.enabled,
-      },
       mobile_app_my_expenses_beta_enabled: incoming?.mobile_app_my_expenses_beta_enabled,
       amex_feed_enrollment_settings: {
         allowed: incoming?.amex_feed_enrollment_settings?.allowed,
@@ -584,7 +580,6 @@ export class OrgSettingsService {
       company_expenses_beta_settings: outgoing.company_expenses_beta_settings,
       visa_enrollment_settings: outgoing.visa_enrollment_settings,
       mastercard_enrollment_settings: outgoing.mastercard_enrollment_settings,
-      simplified_report_closure_settings: outgoing.simplified_report_closure_settings,
       mobile_app_my_expenses_beta_enabled: outgoing.mobile_app_my_expenses_beta_enabled,
       amex_feed_enrollment_settings: outgoing.amex_feed_enrollment_settings,
     };

src/app/core/test-data/org-settings.service.spec.data.ts

@@ -436,10 +436,6 @@ export const orgSettingsGetData: OrgSettings = deepFreeze({
     allowed: true,
     enabled: true,
   },
-  simplified_report_closure_settings: {
-    allowed: false,
-    enabled: false,
-  },
   mobile_app_my_expenses_beta_enabled: false,
   amex_feed_enrollment_settings: {
     allowed: true,
@@ -878,10 +874,6 @@ export const orgSettingsPostData: OrgSettingsResponse = deepFreeze({
     allowed: true,
     cost_center_wise_split: true,
   },
-  simplified_report_closure_settings: {
-    allowed: false,
-    enabled: false,
-  },
   mobile_app_my_expenses_beta_enabled: false,
   amex_feed_enrollment_settings: {
     allowed: true,

src/app/fyle/add-edit-expense/add-edit-expense-5.spec.ts

@@ -34,6 +34,7 @@ import {
   taxSettingsData2,
   orgSettingsParamsWithAdvanceWallet,
   orgSettingsWithProjectCategoryRestrictions,
+  orgSettingsRes,
 } from 'src/app/core/mock-data/org-settings.data';
 import {
   employeeSettingsData,
@@ -1578,7 +1579,6 @@ export function TestCases5(getTestBed) {
         });
 
         expect(component.isCorporateCreditCardEnabled).toBeTrue();
-        expect(component.isNewReportsFlowEnabled).toBeFalse();
         expect(component.isDraftExpenseEnabled).toBeTrue();
 
         expect(component.setupNetworkWatcher).toHaveBeenCalledTimes(1);
@@ -1866,7 +1866,6 @@ export function TestCases5(getTestBed) {
         });
 
         expect(component.isCorporateCreditCardEnabled).toBeTrue();
-        expect(component.isNewReportsFlowEnabled).toBeTrue();
         expect(component.isDraftExpenseEnabled).toBeTrue();
 
         expect(component.setupNetworkWatcher).toHaveBeenCalledTimes(1);

src/app/fyle/add-edit-expense/add-edit-expense.page.html

@@ -1182,7 +1182,6 @@
                       [label]="etxn.tx.report_id ? 'Report' : 'Add to report'"
                       [autoSubmissionReportName]="autoSubmissionReportName$|async"
                       [options]="reports"
-                      [isNewReportsFlowEnabled]="isNewReportsFlowEnabled"
                       formControlName="report"
                     ></app-fy-add-to-report>
                   </div>

src/app/fyle/add-edit-expense/add-edit-expense.page.ts

@@ -434,7 +434,7 @@ export class AddEditExpensePage implements OnInit {
 
   hardwareBackButtonAction: Subscription;
 
-  isNewReportsFlowEnabled = false;
+
 
   onPageExit$: Subject<void>;
 
@@ -2865,7 +2865,6 @@ export class AddEditExpensePage implements OnInit {
   }
 
   initClassObservables(): void {
-    this.isNewReportsFlowEnabled = false;
     this.onPageExit$ = new Subject();
     this.projectDependentFieldsRef?.ngOnInit();
     this.costCenterDependentFieldsRef?.ngOnInit();
@@ -3121,7 +3120,7 @@ export class AddEditExpensePage implements OnInit {
     orgSettings$.subscribe((orgSettings) => {
       this.isCorporateCreditCardEnabled = this.getCCCSettings(orgSettings);
 
-      this.isNewReportsFlowEnabled = orgSettings?.simplified_report_closure_settings?.enabled || false;
+
 
       this.isProjectEnabled = orgSettings?.projects.enabled || false;
       this.isCostCenterEnabled = orgSettings?.cost_centers.enabled || false;

src/app/fyle/add-edit-mileage/add-edit-mileage-4.spec.ts

@@ -25,10 +25,9 @@ import {
   unsortedCategories1,
   sortedCategory,
 } from 'src/app/core/mock-data/org-category.data';
-import {
-  orgSettingsCCDisabled,
-  orgSettingsParamsWithSimplifiedReport,
-  orgSettingsRes,
+  import {
+    orgSettingsCCDisabled,
+    orgSettingsRes,
   orgSettingsWoAdvance,
   orgSettingsWoMileage,
   orgSettingsParamsWithAdvanceWallet,
@@ -390,20 +389,6 @@ export function TestCases4(getTestBed) {
       expect(component.selectedCostCenter$.next).toHaveBeenCalledOnceWith(costCentersData[0]);
     }));
 
-    describe('checkNewReportsFlow():', () => {
-      it('should check if user is on new reports flow', () => {
-        component.checkNewReportsFlow(of(orgSettingsParamsWithSimplifiedReport));
-
-        expect(component.isNewReportsFlowEnabled).toBeTrue();
-      });
-
-      it('should return null if settings are not present', () => {
-        component.checkNewReportsFlow(of(null));
-
-        expect(component.isNewReportsFlowEnabled).toBeFalse();
-      });
-    });
-
     describe('checkIndividualMileageEnabled():', () => {
       it('should check if indvidual mileage is enabled', (done) => {
         component.checkIndividualMileageEnabled(of(orgSettingsRes));

src/app/fyle/add-edit-mileage/add-edit-mileage-5.spec.ts

@@ -232,7 +232,6 @@ export function TestCases5(getTestBed) {
       spyOn(component, 'initClassObservables');
       spyOn(component, 'setupSelectedProjects');
       spyOn(component, 'setupSelectedCostCenters');
-      spyOn(component, 'checkNewReportsFlow');
       spyOn(component, 'setupNetworkWatcher');
       spyOn(component, 'setupTfcDefaultValues');
       spyOn(component, 'getMileageRatesOptions');
@@ -300,7 +299,6 @@ export function TestCases5(getTestBed) {
       expect(storageService.get).toHaveBeenCalledOnceWith('isExpandedViewMileage');
       expect(orgSettingsService.get).toHaveBeenCalledTimes(1);
       expect(platformEmployeeSettingsService.get).toHaveBeenCalledTimes(1);
-      expect(component.checkNewReportsFlow).toHaveBeenCalledOnceWith(jasmine.any(Observable));
       expect(component.setupNetworkWatcher).toHaveBeenCalledTimes(1);
       expect(component.getTransactionFields).toHaveBeenCalledTimes(1);
       expect(currencyService.getHomeCurrency).toHaveBeenCalledTimes(1);

src/app/fyle/add-edit-mileage/add-edit-mileage.page.html

@@ -632,7 +632,6 @@
                             [options]="reports"
                             formControlName="report"
                             [autoSubmissionReportName]="autoSubmissionReportName$|async"
-                            [isNewReportsFlowEnabled]="isNewReportsFlowEnabled"
                           ></app-fy-add-to-report>
                         </div>
                       </ng-container>

src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts

@@ -128,7 +128,7 @@
 
   mode = 'add';
 
   title = 'edit';
 
   activeIndex: number;
 
@@ -256,7 +256,7 @@
 
   hardwareBackButtonAction: Subscription;
 
-  isNewReportsFlowEnabled = false;
+
 
   onPageExit$: Subject<void>;
 
@@ -969,7 +969,6 @@
   }
 
   initClassObservables(): void {
-    this.isNewReportsFlowEnabled = false;
     this.onPageExit$ = new Subject();
     this.projectDependentFieldsRef?.ngOnInit();
     this.costCenterDependentFieldsRef?.ngOnInit();
@@ -1084,12 +1083,6 @@
       .subscribe((costCenter: CostCenter) => this.selectedCostCenter$.next(costCenter));
   }
 
-  checkNewReportsFlow(orgSettings$: Observable<OrgSettings>): void {
-    orgSettings$.subscribe((orgSettings) => {
-      this.isNewReportsFlowEnabled = orgSettings?.simplified_report_closure_settings.enabled || false;
-    });
-  }
-
   getRecentlyUsedValues(): Observable<RecentlyUsed | null> {
     return this.isConnected$.pipe(
       take(1),
@@ -1532,8 +1525,6 @@
       )
     );
 
-    this.checkNewReportsFlow(orgSettings$);
-
     this.setupNetworkWatcher();
 
     this.recentlyUsedValues$ = this.getRecentlyUsedValues();

src/app/fyle/add-edit-per-diem/add-edit-per-diem-2.page.spec.ts

@@ -70,9 +70,8 @@ import { AccountType } from 'src/app/core/enums/account-type.enum';
 import { recentlyUsedRes } from 'src/app/core/mock-data/recently-used.data';
 import { categorieListRes } from 'src/app/core/mock-data/org-category-list-item.data';
 import { getEstatusApiResponse } from 'src/app/core/test-data/status.service.spec.data';
-import {
-  orgSettingsParamsWithSimplifiedReport,
-  orgSettingsRes,
+  import {
+    orgSettingsRes,
   orgSettingsWoTax,
   orgSettingsParamsWithAdvanceWallet,
 } from 'src/app/core/mock-data/org-settings.data';
@@ -491,8 +490,8 @@ export function TestCases2(getTestBed) {
         expect(component.isExpandedView).toBeTrue();
       }));
 
-      it('should call orgSettingsService.get, employeeSettingsService.get, perDiemService.getRates and reportService.getAutoSubmissionReportName once and update isNewReportsFlowEnabled', () => {
-        orgSettingsService.get.and.returnValue(of(orgSettingsParamsWithSimplifiedReport));
+      it('should call orgSettingsService.get, employeeSettingsService.get, perDiemService.getRates and reportService.getAutoSubmissionReportName once', () => {
+        orgSettingsService.get.and.returnValue(of(orgSettingsRes));
         component.ionViewWillEnter();
         expect(orgSettingsService.get).toHaveBeenCalledTimes(1);
         expect(platformEmployeeSettingsService.get).toHaveBeenCalledTimes(1);
@@ -501,7 +500,6 @@ export function TestCases2(getTestBed) {
         component.autoSubmissionReportName$.subscribe((res) => {
           expect(res).toEqual('#1: Aug 2023');
         });
-        expect(component.isNewReportsFlowEnabled).toBeTrue();
       });
 
       it('should set individualPerDiemRatesEnabled$ and recentlyUsedValues$', () => {

src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.html

@@ -623,7 +623,6 @@
                                 [options]="reports"
                                 formControlName="report"
                                 [autoSubmissionReportName]="autoSubmissionReportName$|async"
-                                [isNewReportsFlowEnabled]="isNewReportsFlowEnabled"
                               ></app-fy-add-to-report>
                             </div>
                           </ng-container>

src/app/fyle/add-edit-per-diem/add-edit-per-diem.page.ts

@@ -236,7 +236,7 @@ export class AddEditPerDiemPage implements OnInit {
 
   hardwareBackButtonAction: Subscription;
 
-  isNewReportsFlowEnabled = false;
+
 
   onPageExit$: Subject<void>;
 
@@ -806,7 +806,6 @@ export class AddEditPerDiemPage implements OnInit {
 
   ionViewWillEnter(): void {
     this.subCategories$ = this.getSubCategories().pipe(shareReplay(1));
-    this.isNewReportsFlowEnabled = false;
     this.onPageExit$ = new Subject();
     this.projectDependentFieldsRef?.ngOnInit();
     this.costCenterDependentFieldsRef?.ngOnInit();
@@ -893,10 +892,6 @@ export class AddEditPerDiemPage implements OnInit {
       map((orgSettings) => orgSettings.advanced_per_diems_settings?.enable_employee_restriction)
     );
 
-    orgSettings$.subscribe((orgSettings) => {
-      this.isNewReportsFlowEnabled = orgSettings?.simplified_report_closure_settings?.enabled || false;
-    });
-
     this.setupNetworkWatcher();
 
     this.recentlyUsedValues$ = this.isConnected$.pipe(