Upgrade/angular 14 (#1853)

* Fix Loan product Payment Allocation

* Upgrade to Angular 14

---------

Co-authored-by: Jose Alberto Hernandez <alberto@blue-daemon.local>

src/app/products/charges/create-charge/create-charge.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormControl, Validators } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
 /** Custom Services */
@@ -19,7 +19,7 @@ import { Dates } from 'app/core/utils/dates';
 export class CreateChargeComponent implements OnInit {
 
   /** Charge form. */
-  chargeForm: FormGroup;
+  chargeForm: UntypedFormGroup;
   /** Charges template data. */
   chargesTemplateData: any;
   /** Charge time type data. */
@@ -46,7 +46,7 @@ export class CreateChargeComponent implements OnInit {
    * @param {Dates} dateUtils Date Utils to format date.
    * @param {SettingsService} settingsService Settings Service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private productsService: ProductsService,
               private route: ActivatedRoute,
               private router: Router,
@@ -146,7 +146,7 @@ export class CreateChargeComponent implements OnInit {
       this.chargeForm.get('penalty').enable();
       switch (chargeAppliesTo) {
         case 1: // Loan
-          this.chargeForm.addControl('chargePaymentMode', new FormControl('', Validators.required));
+          this.chargeForm.addControl('chargePaymentMode', new UntypedFormControl('', Validators.required));
           this.chargeForm.removeControl('incomeAccountId');
           break;
         case 2: // Savings
@@ -155,7 +155,7 @@ export class CreateChargeComponent implements OnInit {
           break;
         case 3: // Client
           this.chargeForm.removeControl('chargePaymentMode');
-          this.chargeForm.addControl('incomeAccountId', new FormControl(''));
+          this.chargeForm.addControl('incomeAccountId', new UntypedFormControl(''));
           break;
         case 4: // Shares
           this.chargeForm.removeControl('chargePaymentMode');
@@ -176,20 +176,20 @@ export class CreateChargeComponent implements OnInit {
       }
       switch (chargeTimeType) {
         case 6: // Annual Fee
-          this.chargeForm.addControl('feeOnMonthDay', new FormControl('', Validators.required));
+          this.chargeForm.addControl('feeOnMonthDay', new UntypedFormControl('', Validators.required));
           break;
         case 7: // Monthly Fee
-          this.chargeForm.addControl('feeOnMonthDay', new FormControl(''));
-          this.chargeForm.addControl('feeInterval', new FormControl('', [Validators.required, Validators.min(1), Validators.max(12), Validators.pattern('^[1-9]\\d*$')]));
+          this.chargeForm.addControl('feeOnMonthDay', new UntypedFormControl(''));
+          this.chargeForm.addControl('feeInterval', new UntypedFormControl('', [Validators.required, Validators.min(1), Validators.max(12), Validators.pattern('^[1-9]\\d*$')]));
           this.repeatEveryLabel = 'Months';
           break;
         case 9: // Overdue Fee
           this.chargeForm.get('penalty').setValue(true);
-          this.chargeForm.addControl('addFeeFrequency', new FormControl(false));
+          this.chargeForm.addControl('addFeeFrequency', new UntypedFormControl(false));
           this.chargeForm.get('addFeeFrequency').valueChanges.subscribe((addFeeFrequency) => {
             if (addFeeFrequency) {
-              this.chargeForm.addControl('feeFrequency', new FormControl('', Validators.required));
-              this.chargeForm.addControl('feeInterval', new FormControl('', [Validators.required, Validators.pattern('^[1-9]\\d*$')]));
+              this.chargeForm.addControl('feeFrequency', new UntypedFormControl('', Validators.required));
+              this.chargeForm.addControl('feeInterval', new UntypedFormControl('', [Validators.required, Validators.pattern('^[1-9]\\d*$')]));
             } else {
               this.chargeForm.removeControl('feeFrequency');
               this.chargeForm.removeControl('feeInterval');
@@ -197,7 +197,7 @@ export class CreateChargeComponent implements OnInit {
           });
           break;
         case 11: // Weekly Fee
-          this.chargeForm.addControl('feeInterval', new FormControl('', [Validators.required, Validators.pattern('^[1-9]\\d*$')]));
+          this.chargeForm.addControl('feeInterval', new UntypedFormControl('', [Validators.required, Validators.pattern('^[1-9]\\d*$')]));
           this.repeatEveryLabel = 'Weeks';
           break;
       }

src/app/products/charges/edit-charge/edit-charge.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
@@ -21,7 +21,7 @@ export class EditChargeComponent implements OnInit {
   /** Selected Data. */
   chargeData: any;
   /** Charge form. */
-  chargeForm: FormGroup;
+  chargeForm: UntypedFormGroup;
   /** Select Income. */
   selectedIncome: any;
   /** Select Time Type. */
@@ -54,7 +54,7 @@ export class EditChargeComponent implements OnInit {
    * @param {SettingsService} settingsService Settings Service
    */
   constructor(private productsService: ProductsService,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private route: ActivatedRoute,
               private router: Router,
               private settingsService: SettingsService) {

src/app/products/collaterals/create-collateral/create-collateral.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, FormControl, Validators } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
 /** Custom Services */
@@ -19,7 +19,7 @@ import { Dates } from 'app/core/utils/dates';
 export class CreateCollateralComponent implements OnInit {
 
   /** Collateral form */
-  collateralForm: FormGroup;
+  collateralForm: UntypedFormGroup;
   /** Charges Template data */
   collateralTemplateData: any;
 
@@ -31,7 +31,7 @@ export class CreateCollateralComponent implements OnInit {
    * @param {Router} router Router for navigation.
    * @param {SettingsService} settingsService Settings Service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private productsService: ProductsService,
               private route:  ActivatedRoute,
               private router: Router,

src/app/products/collaterals/edit-collateral/edit-collateral.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
@@ -19,7 +19,7 @@ export class EditCollateralComponent implements OnInit {
   /** Collateral Template */
   collateralTemplateData: any;
   /** Collateral Form */
-  collateralForm: FormGroup;
+  collateralForm: UntypedFormGroup;
 
   /**
    * Retrieves the Collateral Data from `resolve`
@@ -30,7 +30,7 @@ export class EditCollateralComponent implements OnInit {
    * @param {SettingsService} settingsService Settings Service.
    */
   constructor(private productsService: ProductsService,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private route: ActivatedRoute,
               private router: Router,
               private settingsService: SettingsService) {

src/app/products/deposit-product-incentive-form-dialog/deposit-product-incentive-form-dialog.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 
 @Component({
   selector: 'mifosx-deposit-product-incentive-form-dialog',
@@ -15,7 +15,7 @@ export class DepositProductIncentiveFormDialogComponent implements OnInit {
     addButtonText: 'Add'
   };
 
-  depositProductIncentiveForm: FormGroup;
+  depositProductIncentiveForm: UntypedFormGroup;
 
   title: string;
 
@@ -27,7 +27,7 @@ export class DepositProductIncentiveFormDialogComponent implements OnInit {
 
   constructor(public dialogRef: MatDialogRef<DepositProductIncentiveFormDialogComponent>,
               @Inject(MAT_DIALOG_DATA) public data: any,
-              private formBuilder: FormBuilder) {
+              private formBuilder: UntypedFormBuilder) {
     this.createDepositProductIncentiveForm();
     this.setConditionalControls();
     this.layout = { ...this.layout, ...data.layout };

src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, FormArray, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormArray, Validators, UntypedFormControl } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 
 import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
@@ -19,7 +19,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit {
   @Input() accountingRuleData: any;
   @Input() fixedDepositProductFormValid: boolean;
 
-  fixedDepositProductAccountingForm: FormGroup;
+  fixedDepositProductAccountingForm: UntypedFormGroup;
 
   chargeData: any;
   penaltyData: any;
@@ -32,7 +32,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit {
   paymentFundSourceDisplayedColumns: string[] = ['paymentTypeId', 'fundSourceAccountId', 'actions'];
   feesPenaltyIncomeDisplayedColumns: string[] = ['chargeId', 'incomeAccountId', 'actions'];
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               public dialog: MatDialog) {
     this.createfixedDepositProductAccountingForm();
     this.setConditionalControls();
@@ -75,7 +75,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit {
             paymentTypeId: [paymentChannelToFundSourceMapping.paymentType.id, Validators.required],
             fundSourceAccountId: [paymentChannelToFundSourceMapping.fundSourceAccount.id, Validators.required]
           });
-          const formArray = this.fixedDepositProductAccountingForm.controls['paymentChannelToFundSourceMappings'] as FormArray;
+          const formArray = this.fixedDepositProductAccountingForm.controls['paymentChannelToFundSourceMappings'] as UntypedFormArray;
           formArray.push(paymentChannelToFundSourceMappingData);
         });
       }
@@ -85,7 +85,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit {
             chargeId: [feeToIncomeAccountMapping.charge.id, Validators.required],
             incomeAccountId: [feeToIncomeAccountMapping.incomeAccount.id, Validators.required]
           });
-          const formArray = this.fixedDepositProductAccountingForm.controls['feeToIncomeAccountMappings'] as FormArray;
+          const formArray = this.fixedDepositProductAccountingForm.controls['feeToIncomeAccountMappings'] as UntypedFormArray;
           formArray.push(feeToIncomeAccountMappingData);
         });
       }
@@ -95,7 +95,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit {
             chargeId: [penaltyToIncomeAccountMapping.charge.id, Validators.required],
             incomeAccountId: [penaltyToIncomeAccountMapping.incomeAccount.id, Validators.required]
           });
-          const formArray = this.fixedDepositProductAccountingForm.controls['penaltyToIncomeAccountMappings'] as FormArray;
+          const formArray = this.fixedDepositProductAccountingForm.controls['penaltyToIncomeAccountMappings'] as UntypedFormArray;
           formArray.push(penaltyToIncomeAccountMappingData);
         });
       }
@@ -112,13 +112,13 @@ export class FixedDepositProductAccountingStepComponent implements OnInit {
     this.fixedDepositProductAccountingForm.get('accountingRule').valueChanges
       .subscribe((accountingRule: any) => {
         if (accountingRule === 2) {
-          this.fixedDepositProductAccountingForm.addControl('savingsReferenceAccountId', new FormControl('', Validators.required));
-          this.fixedDepositProductAccountingForm.addControl('savingsControlAccountId', new FormControl('', Validators.required));
-          this.fixedDepositProductAccountingForm.addControl('transfersInSuspenseAccountId', new FormControl('', Validators.required));
-          this.fixedDepositProductAccountingForm.addControl('interestOnSavingsAccountId', new FormControl('', Validators.required));
-          this.fixedDepositProductAccountingForm.addControl('incomeFromFeeAccountId', new FormControl('', Validators.required));
-          this.fixedDepositProductAccountingForm.addControl('incomeFromPenaltyAccountId', new FormControl('', Validators.required));
-          this.fixedDepositProductAccountingForm.addControl('advancedAccountingRules', new FormControl(false));
+          this.fixedDepositProductAccountingForm.addControl('savingsReferenceAccountId', new UntypedFormControl('', Validators.required));
+          this.fixedDepositProductAccountingForm.addControl('savingsControlAccountId', new UntypedFormControl('', Validators.required));
+          this.fixedDepositProductAccountingForm.addControl('transfersInSuspenseAccountId', new UntypedFormControl('', Validators.required));
+          this.fixedDepositProductAccountingForm.addControl('interestOnSavingsAccountId', new UntypedFormControl('', Validators.required));
+          this.fixedDepositProductAccountingForm.addControl('incomeFromFeeAccountId', new UntypedFormControl('', Validators.required));
+          this.fixedDepositProductAccountingForm.addControl('incomeFromPenaltyAccountId', new UntypedFormControl('', Validators.required));
+          this.fixedDepositProductAccountingForm.addControl('advancedAccountingRules', new UntypedFormControl(false));
 
           this.fixedDepositProductAccountingForm.get('advancedAccountingRules').valueChanges
             .subscribe((advancedAccountingRules: boolean) => {
@@ -148,19 +148,19 @@ export class FixedDepositProductAccountingStepComponent implements OnInit {
       });
   }
 
-  get paymentChannelToFundSourceMappings(): FormArray {
-    return this.fixedDepositProductAccountingForm.get('paymentChannelToFundSourceMappings') as FormArray;
+  get paymentChannelToFundSourceMappings(): UntypedFormArray {
+    return this.fixedDepositProductAccountingForm.get('paymentChannelToFundSourceMappings') as UntypedFormArray;
   }
 
-  get feeToIncomeAccountMappings(): FormArray {
-    return this.fixedDepositProductAccountingForm.get('feeToIncomeAccountMappings') as FormArray;
+  get feeToIncomeAccountMappings(): UntypedFormArray {
+    return this.fixedDepositProductAccountingForm.get('feeToIncomeAccountMappings') as UntypedFormArray;
   }
 
-  get penaltyToIncomeAccountMappings(): FormArray {
-    return this.fixedDepositProductAccountingForm.get('penaltyToIncomeAccountMappings') as FormArray;
+  get penaltyToIncomeAccountMappings(): UntypedFormArray {
+    return this.fixedDepositProductAccountingForm.get('penaltyToIncomeAccountMappings') as UntypedFormArray;
   }
 
-  add(formType: string, formArray: FormArray) {
+  add(formType: string, formArray: UntypedFormArray) {
     const data = { ...this.getData(formType), pristine: false };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -170,7 +170,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit {
     });
   }
 
-  edit(formType: string, formArray: FormArray, index: number) {
+  edit(formType: string, formArray: UntypedFormArray, index: number) {
     const data = { ...this.getData(formType, formArray.at(index).value), layout: { addButtonText: 'Edit' } };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -180,7 +180,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit {
     });
   }
 
-  delete(formArray: FormArray, index: number) {
+  delete(formArray: UntypedFormArray, index: number) {
     const dialogRef = this.dialog.open(DeleteDialogComponent, {
       data: { deleteContext: `this` }
     });

src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-charges-step/fixed-deposit-product-charges-step.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
 
@@ -12,7 +12,7 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co
 export class FixedDepositProductChargesStepComponent implements OnInit {
 
   @Input() fixedDepositProductsTemplate: any;
-  @Input() currencyCode: FormControl;
+  @Input() currencyCode: UntypedFormControl;
 
   chargeData: any;
 

src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-currency-step/fixed-deposit-product-currency-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 
 @Component({
   selector: 'mifosx-fixed-deposit-product-currency-step',
@@ -10,11 +10,11 @@ export class FixedDepositProductCurrencyStepComponent implements OnInit {
 
   @Input() fixedDepositProductsTemplate: any;
 
-  fixedDepositProductCurrencyForm: FormGroup;
+  fixedDepositProductCurrencyForm: UntypedFormGroup;
 
   currencyData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createFixedDepositProductCurrencyForm();
   }
 

src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-details-step/fixed-deposit-product-details-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 
 @Component({
   selector: 'mifosx-fixed-deposit-product-details-step',
@@ -10,9 +10,9 @@ export class FixedDepositProductDetailsStepComponent implements OnInit {
 
   @Input() fixedDepositProductsTemplate: any;
 
-  fixedDepositProductDetailsForm: FormGroup;
+  fixedDepositProductDetailsForm: UntypedFormGroup;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createFixedDepositProductDetailsForm();
   }
 

src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormArray } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormArray } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { TooltipPosition } from '@angular/material/tooltip';
@@ -35,7 +35,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
 
   @Input() fixedDepositProductsTemplate: any;
 
-  fixedDepositProductInterestRateChartForm: FormGroup;
+  fixedDepositProductInterestRateChartForm: UntypedFormGroup;
 
   periodTypeData: any;
   entityTypeData: any;
@@ -64,7 +64,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
    * @param {SettingsService} settingsService Settings Service.
    */
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               public dialog: MatDialog,
               private dateUtils: Dates,
               private settingsService: SettingsService) {
@@ -101,7 +101,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
     this.getChartsDetailsData();
 
     // Iterates for every chart in charts
-    this.charts.controls.forEach((chartDetailControl: FormGroup, i: number) => {
+    this.charts.controls.forEach((chartDetailControl: UntypedFormGroup, i: number) => {
 
       if (!this.chartsDetail[i]) {
         return;
@@ -120,7 +120,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
           periodType: [chartSlabDetail.periodType, Validators.required],
           incentives: this.formBuilder.array([])
         });
-        const formArray = chartDetailControl.controls['chartSlabs'] as FormArray;
+        const formArray = chartDetailControl.controls['chartSlabs'] as UntypedFormArray;
         formArray.push(chartSlabInfo);
 
         // Iterate for every slab in chartSlab
@@ -136,7 +136,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
             entityType: [chartIncentiveDetail.entityType, Validators.required],
             incentiveType: [chartIncentiveDetail.incentiveType, Validators.required]
           });
-          const newFormArray = chartIncentiveControl['controls']['incentives'] as FormArray;
+          const newFormArray = chartIncentiveControl['controls']['incentives'] as UntypedFormArray;
           newFormArray.push(incentiveInfo);
         });
 
@@ -219,11 +219,11 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
     });
   }
 
-  get charts(): FormArray {
-    return this.fixedDepositProductInterestRateChartForm.get('charts') as FormArray;
+  get charts(): UntypedFormArray {
+    return this.fixedDepositProductInterestRateChartForm.get('charts') as UntypedFormArray;
   }
 
-  createChartForm(): FormGroup {
+  createChartForm(): UntypedFormGroup {
     return this.formBuilder.group({
       'name': [''],
       'description': [''],
@@ -248,11 +248,11 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
       });
   }
 
-  getIncentives(chartSlabs: FormArray, chartSlabIndex: number): FormArray {
-    return chartSlabs.at(chartSlabIndex).get('incentives') as FormArray;
+  getIncentives(chartSlabs: UntypedFormArray, chartSlabIndex: number): UntypedFormArray {
+    return chartSlabs.at(chartSlabIndex).get('incentives') as UntypedFormArray;
   }
 
-  addChartSlab(chartSlabs: FormArray) {
+  addChartSlab(chartSlabs: UntypedFormArray) {
     const data = { ...this.getData('Slab') };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -263,7 +263,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
     });
   }
 
-  addIncentive(incentives: FormArray) {
+  addIncentive(incentives: UntypedFormArray) {
     const data = { ...this.getData('Incentive'), entityType: this.entityTypeData[0].id };
     const dialogRef = this.dialog.open(DepositProductIncentiveFormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -273,7 +273,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
     });
   }
 
-  editChartSlab(chartSlabs: FormArray, chartSlabIndex: number) {
+  editChartSlab(chartSlabs: UntypedFormArray, chartSlabIndex: number) {
     const data = { ...this.getData('Slab', chartSlabs.at(chartSlabIndex).value), layout: { addButtonText: 'Edit' } };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -283,7 +283,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
     });
   }
 
-  editIncentive(incentives: FormArray, incentiveIndex: number) {
+  editIncentive(incentives: UntypedFormArray, incentiveIndex: number) {
     const data = { ...this.getData('Incentive', incentives.at(incentiveIndex).value), layout: { addButtonText: 'Edit' } };
     const dialogRef = this.dialog.open(DepositProductIncentiveFormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -293,7 +293,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit
     });
   }
 
-  delete(formArray: FormArray, index: number) {
+  delete(formArray: UntypedFormArray, index: number) {
     const dialogRef = this.dialog.open(DeleteDialogComponent, {
       data: { deleteContext: `this` }
     });

src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-settings-step/fixed-deposit-product-settings-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormControl, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,14 +11,14 @@ export class FixedDepositProductSettingsStepComponent implements OnInit {
 
   @Input() fixedDepositProductsTemplate: any;
 
-  fixedDepositProductSettingsForm: FormGroup;
+  fixedDepositProductSettingsForm: UntypedFormGroup;
 
   lockinPeriodFrequencyTypeData: any;
   periodFrequencyTypeData: any;
   preClosurePenalInterestOnTypeData: any;
   taxGroupData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createFixedDepositProductSettingsForm();
     this.setConditionalControls();
   }
@@ -71,7 +71,7 @@ export class FixedDepositProductSettingsStepComponent implements OnInit {
     this.fixedDepositProductSettingsForm.get('withHoldTax').valueChanges
       .subscribe((withHoldTax: any) => {
         if (withHoldTax) {
-          this.fixedDepositProductSettingsForm.addControl('taxGroupId', new FormControl('', Validators.required));
+          this.fixedDepositProductSettingsForm.addControl('taxGroupId', new UntypedFormControl('', Validators.required));
         } else {
           this.fixedDepositProductSettingsForm.removeControl('taxGroupId');
         }

src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,14 +11,14 @@ export class FixedDepositProductTermsStepComponent implements OnInit {
 
   @Input() fixedDepositProductsTemplate: any;
 
-  fixedDepositProductTermsForm: FormGroup;
+  fixedDepositProductTermsForm: UntypedFormGroup;
 
   interestCompoundingPeriodTypeData: any;
   interestPostingPeriodTypeData: any;
   interestCalculationTypeData: any;
   interestCalculationDaysInYearTypeData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createFixedDepositProductTermsForm();
   }
 

src/app/products/floating-rates/create-floating-rate/create-floating-rate.component.ts

@@ -1,7 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
-import { FormBuilder, FormGroup, Validators, FormArray } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators, FormArray } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
@@ -32,7 +32,7 @@ export class CreateFloatingRateComponent implements OnInit {
   /** Minimum floating rate period date allowed. */
   minDate = new Date();
   /** Floating Rate Form. */
-  floatingRateForm: FormGroup;
+  floatingRateForm: UntypedFormGroup;
   /** Columns to be displayed in floating rate periods table. */
   displayedColumns: string[] = ['fromDate', 'interestRate', 'isDifferential', 'actions'];
   /** Data source for floating rate periods table. */
@@ -55,7 +55,7 @@ export class CreateFloatingRateComponent implements OnInit {
    * @param {SettingsService} settingsService Settings Service.
    */
   constructor(private router: Router,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private productsService: ProductsService,
               private route: ActivatedRoute,
               private dateUtils: Dates,
@@ -94,7 +94,7 @@ export class CreateFloatingRateComponent implements OnInit {
    * Creates the Floating Rate Periods Form.
    * @returns {FormGroup} Floating Rate Period Form.
    */
-  createFloatingRatePeriodsForm(): FormGroup {
+  createFloatingRatePeriodsForm(): UntypedFormGroup {
     return this.formBuilder.group({
       'fromDate': ['', Validators.required],
       'interestRate': ['', Validators.required],

src/app/products/floating-rates/edit-floating-rate/edit-floating-rate.component.ts

@@ -1,7 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
-import { FormBuilder, FormGroup, Validators, FormArray } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators, FormArray } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
@@ -28,7 +28,7 @@ import { Dates } from 'app/core/utils/dates';
 export class EditFloatingRateComponent implements OnInit {
 
   /** Floating Rate Form. */
-  floatingRateForm: FormGroup;
+  floatingRateForm: UntypedFormGroup;
   /** Floating Rate Data. */
   floatingRateData: any;
   /** Minimum floating rate period date allowed. */
@@ -60,7 +60,7 @@ export class EditFloatingRateComponent implements OnInit {
    * @param {SettingsService} settingsService Settings Service.
    */
   constructor(private router: Router,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private productsService: ProductsService,
               private route: ActivatedRoute,
               private dateUtils: Dates,

src/app/products/floating-rates/floating-rate-period-dialog/floating-rate-period-dialog.component.ts

@@ -1,7 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { SettingsService } from 'app/settings/settings.service';
 
 /**
@@ -15,7 +15,7 @@ import { SettingsService } from 'app/settings/settings.service';
 export class FloatingRatePeriodDialogComponent implements OnInit {
 
   /** Floating Rate Period Form. */
-  floatingRatePeriodForm: FormGroup;
+  floatingRatePeriodForm: UntypedFormGroup;
   /** Minimum floating rate period date allowed. */
   minDate = new Date();
 
@@ -25,7 +25,7 @@ export class FloatingRatePeriodDialogComponent implements OnInit {
    * @param {any} data Provides values for the form (if available).
    */
   constructor(public dialogRef: MatDialogRef<FloatingRatePeriodDialogComponent>,
-              public formBuilder: FormBuilder,
+              public formBuilder: UntypedFormBuilder,
               private settingsService: SettingsService,
               @Inject(MAT_DIALOG_DATA) public data: any) {
   }

src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, FormArray, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormArray, Validators, UntypedFormControl } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 
 import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
@@ -19,7 +19,7 @@ export class LoanProductAccountingStepComponent implements OnInit {
   @Input() accountingRuleData: any;
   @Input() loanProductFormValid: boolean;
 
-  loanProductAccountingForm: FormGroup;
+  loanProductAccountingForm: UntypedFormGroup;
 
   chargeData: any;
   penaltyData: any;
@@ -34,7 +34,7 @@ export class LoanProductAccountingStepComponent implements OnInit {
   paymentFundSourceDisplayedColumns: string[] = ['paymentTypeId', 'fundSourceAccountId', 'actions'];
   feesPenaltyIncomeDisplayedColumns: string[] = ['chargeId', 'incomeAccountId', 'actions'];
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               public dialog: MatDialog) {
     this.createLoanProductAccountingForm();
     this.setConditionalControls();
@@ -110,25 +110,25 @@ export class LoanProductAccountingStepComponent implements OnInit {
     this.loanProductAccountingForm.get('accountingRule').valueChanges
       .subscribe((accountingRule: any) => {
         if (accountingRule >= 2 && accountingRule <= 4) {
-          this.loanProductAccountingForm.addControl('fundSourceAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('loanPortfolioAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('transfersInSuspenseAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('interestOnLoanAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('incomeFromFeeAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('incomeFromPenaltyAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('incomeFromRecoveryAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('writeOffAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('goodwillCreditAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('overpaymentLiabilityAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('advancedAccountingRules', new FormControl(false));
-          this.loanProductAccountingForm.addControl('chargeOffFraudExpenseAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('chargeOffExpenseAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('incomeFromChargeOffPenaltyAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('incomeFromChargeOffFeesAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('incomeFromChargeOffInterestAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('incomeFromGoodwillCreditInterestAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('incomeFromGoodwillCreditFeesAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('incomeFromGoodwillCreditPenaltyAccountId', new FormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('fundSourceAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('loanPortfolioAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('transfersInSuspenseAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('interestOnLoanAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('incomeFromFeeAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('incomeFromPenaltyAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('incomeFromRecoveryAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('writeOffAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('goodwillCreditAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('overpaymentLiabilityAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('advancedAccountingRules', new UntypedFormControl(false));
+          this.loanProductAccountingForm.addControl('chargeOffFraudExpenseAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('chargeOffExpenseAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('incomeFromChargeOffPenaltyAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('incomeFromChargeOffFeesAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('incomeFromChargeOffInterestAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('incomeFromGoodwillCreditInterestAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('incomeFromGoodwillCreditFeesAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('incomeFromGoodwillCreditPenaltyAccountId', new UntypedFormControl('', Validators.required));
 
           this.loanProductAccountingForm.get('advancedAccountingRules').valueChanges
             .subscribe((advancedAccountingRules: boolean) => {
@@ -165,9 +165,9 @@ export class LoanProductAccountingStepComponent implements OnInit {
         }
 
         if (accountingRule === 3 || accountingRule === 4) {
-          this.loanProductAccountingForm.addControl('receivableInterestAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('receivableFeeAccountId', new FormControl('', Validators.required));
-          this.loanProductAccountingForm.addControl('receivablePenaltyAccountId', new FormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('receivableInterestAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('receivableFeeAccountId', new UntypedFormControl('', Validators.required));
+          this.loanProductAccountingForm.addControl('receivablePenaltyAccountId', new UntypedFormControl('', Validators.required));
         } else {
           this.loanProductAccountingForm.removeControl('receivableInterestAccountId');
           this.loanProductAccountingForm.removeControl('receivableFeeAccountId');
@@ -176,16 +176,16 @@ export class LoanProductAccountingStepComponent implements OnInit {
       });
   }
 
-  get paymentChannelToFundSourceMappings(): FormArray {
-    return this.loanProductAccountingForm.get('paymentChannelToFundSourceMappings') as FormArray;
+  get paymentChannelToFundSourceMappings(): UntypedFormArray {
+    return this.loanProductAccountingForm.get('paymentChannelToFundSourceMappings') as UntypedFormArray;
   }
 
-  get feeToIncomeAccountMappings(): FormArray {
-    return this.loanProductAccountingForm.get('feeToIncomeAccountMappings') as FormArray;
+  get feeToIncomeAccountMappings(): UntypedFormArray {
+    return this.loanProductAccountingForm.get('feeToIncomeAccountMappings') as UntypedFormArray;
   }
 
-  get penaltyToIncomeAccountMappings(): FormArray {
-    return this.loanProductAccountingForm.get('penaltyToIncomeAccountMappings') as FormArray;
+  get penaltyToIncomeAccountMappings(): UntypedFormArray {
+    return this.loanProductAccountingForm.get('penaltyToIncomeAccountMappings') as UntypedFormArray;
   }
 
   setLoanProductAccountingFormDirty() {
@@ -194,7 +194,7 @@ export class LoanProductAccountingStepComponent implements OnInit {
     }
   }
 
-  add(formType: string, formArray: FormArray) {
+  add(formType: string, formArray: UntypedFormArray) {
     const data = { ...this.getData(formType), pristine: false };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -205,7 +205,7 @@ export class LoanProductAccountingStepComponent implements OnInit {
     });
   }
 
-  edit(formType: string, formArray: FormArray, index: number) {
+  edit(formType: string, formArray: UntypedFormArray, index: number) {
     const data = { ...this.getData(formType, formArray.at(index).value), layout: { addButtonText: 'Edit' } };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -216,7 +216,7 @@ export class LoanProductAccountingStepComponent implements OnInit {
     });
   }
 
-  delete(formArray: FormArray, index: number) {
+  delete(formArray: UntypedFormArray, index: number) {
     const dialogRef = this.dialog.open(DeleteDialogComponent, {
       data: { deleteContext: `this` }
     });

src/app/products/loan-products/loan-product-stepper/loan-product-charges-step/loan-product-charges-step.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
@@ -13,8 +13,8 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co
 export class LoanProductChargesStepComponent implements OnInit {
 
   @Input() loanProductsTemplate: any;
-  @Input() currencyCode: FormControl;
-  @Input() multiDisburseLoan: FormControl;
+  @Input() currencyCode: UntypedFormControl;
+  @Input() multiDisburseLoan: UntypedFormControl;
 
   chargeData: any;
   overdueChargeData: any;

src/app/products/loan-products/loan-product-stepper/loan-product-currency-step/loan-product-currency-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,11 +11,11 @@ export class LoanProductCurrencyStepComponent implements OnInit {
 
   @Input() loanProductsTemplate: any;
 
-  loanProductCurrencyForm: FormGroup;
+  loanProductCurrencyForm: UntypedFormGroup;
 
   currencyData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createLoanProductCurrencyForm();
   }
 

src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { Dates } from 'app/core/utils/dates';
 import { TooltipPosition } from '@angular/material/tooltip';
 
@@ -16,7 +16,7 @@ export class LoanProductDetailsStepComponent implements OnInit {
 
   @Input() loanProductsTemplate: any;
 
-  loanProductDetailsForm: FormGroup;
+  loanProductDetailsForm: UntypedFormGroup;
 
   fundData: any;
 
@@ -29,7 +29,7 @@ export class LoanProductDetailsStepComponent implements OnInit {
    * @param {SettingsService} settingsService Settings Service.
    */
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private dateUtils: Dates,
               private settingsService: SettingsService) {
     this.createLoanProductDetailsForm();

src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.ts

@@ -1,6 +1,6 @@
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { FormControl, Validators } from '@angular/forms';
+import { UntypedFormControl, Validators } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { MatTable } from '@angular/material/table';
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
@@ -36,8 +36,8 @@ export class LoanProductPaymentStrategyStepComponent implements OnInit {
   transactionTypeOptions: PaymentCode[] = [];
   installmentAllocationOptions: PaymentCode[] = [];
 
-  transactionType = new FormControl('');
-  futureInstallmentAllocationRule = new FormControl('', Validators.required);
+  transactionType = new UntypedFormControl('');
+  futureInstallmentAllocationRule = new UntypedFormControl('', Validators.required);
 
   @ViewChild('table') table: MatTable<any>;
 

src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormControl } from '@angular/forms';
 import { LoanProducts } from '../../loan-products';
 import { rangeValidator } from 'app/shared/validators/percentage.validator';
 
@@ -11,10 +11,10 @@ import { rangeValidator } from 'app/shared/validators/percentage.validator';
 export class LoanProductSettingsStepComponent implements OnInit {
 
   @Input() loanProductsTemplate: any;
-  @Input() isLinkedToFloatingInterestRates: FormControl;
+  @Input() isLinkedToFloatingInterestRates: UntypedFormControl;
   @Output() advancePaymentStrategy = new EventEmitter<string>();
 
-  loanProductSettingsForm: FormGroup;
+  loanProductSettingsForm: UntypedFormGroup;
 
   amortizationTypeData: any;
   interestTypeData: any;
@@ -31,7 +31,7 @@ export class LoanProductSettingsStepComponent implements OnInit {
   interestRecalculationOnDayTypeData: any;
   delinquencyBucketData: any;
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     private loanProducts: LoanProducts) {
     this.createLoanProductSettingsForm();
     this.setConditionalControls();
@@ -215,8 +215,8 @@ export class LoanProductSettingsStepComponent implements OnInit {
     this.loanProductSettingsForm.get('allowVariableInstallments').valueChanges
       .subscribe((allowVariableInstallments: any) => {
         if (allowVariableInstallments) {
-          this.loanProductSettingsForm.addControl('minimumGap', new FormControl('', Validators.required));
-          this.loanProductSettingsForm.addControl('maximumGap', new FormControl('', Validators.required));
+          this.loanProductSettingsForm.addControl('minimumGap', new UntypedFormControl('', Validators.required));
+          this.loanProductSettingsForm.addControl('maximumGap', new UntypedFormControl('', Validators.required));
         } else {
           this.loanProductSettingsForm.removeControl('minimumGap');
           this.loanProductSettingsForm.removeControl('maximumGap');
@@ -226,40 +226,40 @@ export class LoanProductSettingsStepComponent implements OnInit {
     this.loanProductSettingsForm.get('isInterestRecalculationEnabled').valueChanges
       .subscribe((isInterestRecalculationEnabled: any) => {
         if (isInterestRecalculationEnabled) {
-          this.loanProductSettingsForm.addControl('preClosureInterestCalculationStrategy', new FormControl(this.preClosureInterestCalculationStrategyData[0].id, Validators.required));
-          this.loanProductSettingsForm.addControl('rescheduleStrategyMethod', new FormControl(this.rescheduleStrategyTypeData[0].id, Validators.required));
-          this.loanProductSettingsForm.addControl('interestRecalculationCompoundingMethod', new FormControl(this.interestRecalculationCompoundingTypeData[0].id, Validators.required));
-          this.loanProductSettingsForm.addControl('recalculationRestFrequencyType', new FormControl(this.interestRecalculationFrequencyTypeData[0].id, Validators.required));
-          this.loanProductSettingsForm.addControl('isArrearsBasedOnOriginalSchedule', new FormControl(''));
+          this.loanProductSettingsForm.addControl('preClosureInterestCalculationStrategy', new UntypedFormControl(this.preClosureInterestCalculationStrategyData[0].id, Validators.required));
+          this.loanProductSettingsForm.addControl('rescheduleStrategyMethod', new UntypedFormControl(this.rescheduleStrategyTypeData[0].id, Validators.required));
+          this.loanProductSettingsForm.addControl('interestRecalculationCompoundingMethod', new UntypedFormControl(this.interestRecalculationCompoundingTypeData[0].id, Validators.required));
+          this.loanProductSettingsForm.addControl('recalculationRestFrequencyType', new UntypedFormControl(this.interestRecalculationFrequencyTypeData[0].id, Validators.required));
+          this.loanProductSettingsForm.addControl('isArrearsBasedOnOriginalSchedule', new UntypedFormControl(''));
 
           this.loanProductSettingsForm.get('interestRecalculationCompoundingMethod').valueChanges
             .subscribe((interestRecalculationCompoundingMethod: any) => {
               if (interestRecalculationCompoundingMethod !== 0) {
-                this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyType', new FormControl(this.interestRecalculationFrequencyTypeData[0].id, Validators.required));
+                this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyType', new UntypedFormControl(this.interestRecalculationFrequencyTypeData[0].id, Validators.required));
 
                 this.loanProductSettingsForm.get('recalculationCompoundingFrequencyType').valueChanges
                   .subscribe((recalculationCompoundingFrequencyType: any) => {
                     if (recalculationCompoundingFrequencyType !== 1) {
-                      this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyInterval', new FormControl('', Validators.required));
+                      this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyInterval', new UntypedFormControl('', Validators.required));
                     } else {
                       this.loanProductSettingsForm.removeControl('recalculationCompoundingFrequencyInterval');
                     }
 
                     if (recalculationCompoundingFrequencyType === 3) {
-                      this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyDayOfWeekType', new FormControl(''));
+                      this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyDayOfWeekType', new UntypedFormControl(''));
                       this.loanProductSettingsForm.removeControl('recalculationCompoundingFrequencyNthDayType');
                       this.loanProductSettingsForm.removeControl('recalculationCompoundingFrequencyOnDayType');
                     } else if (recalculationCompoundingFrequencyType === 4) {
-                      this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyNthDayType', new FormControl(''));
-                      this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyDayOfWeekType', new FormControl(''));
+                      this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyNthDayType', new UntypedFormControl(''));
+                      this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyDayOfWeekType', new UntypedFormControl(''));
 
                       this.loanProductSettingsForm.get('recalculationCompoundingFrequencyNthDayType').valueChanges
                         .subscribe((recalculationCompoundingFrequencyNthDayType: any) => {
                           if (recalculationCompoundingFrequencyNthDayType === -2) {
-                            this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyOnDayType', new FormControl(''));
+                            this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyOnDayType', new UntypedFormControl(''));
                             this.loanProductSettingsForm.removeControl('recalculationCompoundingFrequencyDayOfWeekType');
                           } else {
-                            this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyDayOfWeekType', new FormControl(''));
+                            this.loanProductSettingsForm.addControl('recalculationCompoundingFrequencyDayOfWeekType', new UntypedFormControl(''));
                             this.loanProductSettingsForm.removeControl('recalculationCompoundingFrequencyOnDayType');
                           }
                         });
@@ -278,26 +278,26 @@ export class LoanProductSettingsStepComponent implements OnInit {
           this.loanProductSettingsForm.get('recalculationRestFrequencyType').valueChanges
             .subscribe((recalculationRestFrequencyType: any) => {
               if (recalculationRestFrequencyType !== 1) {
-                this.loanProductSettingsForm.addControl('recalculationRestFrequencyInterval', new FormControl('', Validators.required));
+                this.loanProductSettingsForm.addControl('recalculationRestFrequencyInterval', new UntypedFormControl('', Validators.required));
               } else {
                 this.loanProductSettingsForm.removeControl('recalculationRestFrequencyInterval');
               }
 
               if (recalculationRestFrequencyType === 3) {
-                this.loanProductSettingsForm.addControl('recalculationRestFrequencyDayOfWeekType', new FormControl(''));
+                this.loanProductSettingsForm.addControl('recalculationRestFrequencyDayOfWeekType', new UntypedFormControl(''));
                 this.loanProductSettingsForm.removeControl('recalculationRestFrequencyNthDayType');
                 this.loanProductSettingsForm.removeControl('recalculationRestFrequencyOnDayType');
               } else if (recalculationRestFrequencyType === 4) {
-                this.loanProductSettingsForm.addControl('recalculationRestFrequencyNthDayType', new FormControl(''));
-                this.loanProductSettingsForm.addControl('recalculationRestFrequencyDayOfWeekType', new FormControl(''));
+                this.loanProductSettingsForm.addControl('recalculationRestFrequencyNthDayType', new UntypedFormControl(''));
+                this.loanProductSettingsForm.addControl('recalculationRestFrequencyDayOfWeekType', new UntypedFormControl(''));
 
                 this.loanProductSettingsForm.get('recalculationRestFrequencyNthDayType').valueChanges
                   .subscribe((recalculationRestFrequencyNthDayType: any) => {
                     if (recalculationRestFrequencyNthDayType === -2) {
-                      this.loanProductSettingsForm.addControl('recalculationRestFrequencyOnDayType', new FormControl(''));
+                      this.loanProductSettingsForm.addControl('recalculationRestFrequencyOnDayType', new UntypedFormControl(''));
                       this.loanProductSettingsForm.removeControl('recalculationRestFrequencyDayOfWeekType');
                     } else {
-                      this.loanProductSettingsForm.addControl('recalculationRestFrequencyDayOfWeekType', new FormControl(''));
+                      this.loanProductSettingsForm.addControl('recalculationRestFrequencyDayOfWeekType', new UntypedFormControl(''));
                       this.loanProductSettingsForm.removeControl('recalculationRestFrequencyOnDayType');
                     }
                   });
@@ -321,9 +321,9 @@ export class LoanProductSettingsStepComponent implements OnInit {
     this.loanProductSettingsForm.get('holdGuaranteeFunds').valueChanges
       .subscribe(holdGuaranteeFunds => {
         if (holdGuaranteeFunds) {
-          this.loanProductSettingsForm.addControl('mandatoryGuarantee', new FormControl('', Validators.required));
-          this.loanProductSettingsForm.addControl('minimumGuaranteeFromOwnFunds', new FormControl(''));
-          this.loanProductSettingsForm.addControl('minimumGuaranteeFromGuarantor', new FormControl(''));
+          this.loanProductSettingsForm.addControl('mandatoryGuarantee', new UntypedFormControl('', Validators.required));
+          this.loanProductSettingsForm.addControl('minimumGuaranteeFromOwnFunds', new UntypedFormControl(''));
+          this.loanProductSettingsForm.addControl('minimumGuaranteeFromGuarantor', new UntypedFormControl(''));
         } else {
           this.loanProductSettingsForm.removeControl('mandatoryGuarantee');
           this.loanProductSettingsForm.removeControl('minimumGuaranteeFromOwnFunds');
@@ -334,8 +334,8 @@ export class LoanProductSettingsStepComponent implements OnInit {
     this.loanProductSettingsForm.get('multiDisburseLoan').valueChanges
       .subscribe(multiDisburseLoan => {
         if (multiDisburseLoan) {
-          this.loanProductSettingsForm.addControl('maxTrancheCount', new FormControl('', Validators.required));
-          this.loanProductSettingsForm.addControl('outstandingLoanBalance', new FormControl(''));
+          this.loanProductSettingsForm.addControl('maxTrancheCount', new UntypedFormControl('', Validators.required));
+          this.loanProductSettingsForm.addControl('outstandingLoanBalance', new UntypedFormControl(''));
         } else {
           this.loanProductSettingsForm.removeControl('maxTrancheCount');
           this.loanProductSettingsForm.removeControl('outstandingLoanBalance');
@@ -346,8 +346,8 @@ export class LoanProductSettingsStepComponent implements OnInit {
       this.loanProductSettingsForm.get('enableDownPayment').valueChanges
       .subscribe(enableDownPayment => {
         if (enableDownPayment) {
-          this.loanProductSettingsForm.addControl('disbursedAmountPercentageForDownPayment', new FormControl(0, [Validators.required, rangeValidator(0, 100) ]));
-          this.loanProductSettingsForm.addControl('enableAutoRepaymentForDownPayment', new FormControl(false, []));
+          this.loanProductSettingsForm.addControl('disbursedAmountPercentageForDownPayment', new UntypedFormControl(0, [Validators.required, rangeValidator(0, 100) ]));
+          this.loanProductSettingsForm.addControl('enableAutoRepaymentForDownPayment', new UntypedFormControl(false, []));
         } else {
           this.loanProductSettingsForm.removeControl('disbursedAmountPercentageForDownPayment');
           this.loanProductSettingsForm.removeControl('enableAutoRepaymentForDownPayment');

src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormArray, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormArray, UntypedFormControl } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { TooltipPosition } from '@angular/material/tooltip';
 
@@ -19,7 +19,7 @@ export class LoanProductTermsStepComponent implements OnInit {
 
   @Input() loanProductsTemplate: any;
 
-  loanProductTermsForm: FormGroup;
+  loanProductTermsForm: UntypedFormGroup;
 
   valueConditionTypeData: any;
   floatingRateData: any;
@@ -30,7 +30,7 @@ export class LoanProductTermsStepComponent implements OnInit {
 
   displayedColumns: string[] = ['valueConditionType', 'borrowerCycleNumber', 'minValue', 'defaultValue', 'maxValue', 'actions'];
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               public dialog: MatDialog) {
     this.createLoanProductTermsForm();
     this.setConditionalControls();
@@ -111,9 +111,9 @@ export class LoanProductTermsStepComponent implements OnInit {
     this.loanProductTermsForm.get('allowApprovedDisbursedAmountsOverApplied').valueChanges
       .subscribe(allowApprovedDisbursedAmountsOverApplied => {
         if (allowApprovedDisbursedAmountsOverApplied) {
-          this.loanProductTermsForm.addControl('overAppliedCalculationType', new FormControl(''));
-          this.loanProductTermsForm.addControl('overAppliedNumber', new FormControl(''));
-          this.loanProductTermsForm.addControl('disallowExpectedDisbursements', new FormControl('true'));
+          this.loanProductTermsForm.addControl('overAppliedCalculationType', new UntypedFormControl(''));
+          this.loanProductTermsForm.addControl('overAppliedNumber', new UntypedFormControl(''));
+          this.loanProductTermsForm.addControl('disallowExpectedDisbursements', new UntypedFormControl('true'));
         } else {
           this.loanProductTermsForm.removeControl('overAppliedCalculationType');
           this.loanProductTermsForm.removeControl('overAppliedNumber');
@@ -129,17 +129,17 @@ export class LoanProductTermsStepComponent implements OnInit {
           this.loanProductTermsForm.removeControl('interestRatePerPeriod');
           this.loanProductTermsForm.removeControl('maxInterestRatePerPeriod');
           this.loanProductTermsForm.removeControl('interestRateFrequencyType');
-          this.loanProductTermsForm.addControl('floatingRatesId', new FormControl('', Validators.required));
-          this.loanProductTermsForm.addControl('interestRateDifferential', new FormControl('', Validators.required));
-          this.loanProductTermsForm.addControl('isFloatingInterestRateCalculationAllowed', new FormControl(false));
-          this.loanProductTermsForm.addControl('minDifferentialLendingRate', new FormControl('', Validators.required));
-          this.loanProductTermsForm.addControl('defaultDifferentialLendingRate', new FormControl('', Validators.required));
-          this.loanProductTermsForm.addControl('maxDifferentialLendingRate', new FormControl('', Validators.required));
+          this.loanProductTermsForm.addControl('floatingRatesId', new UntypedFormControl('', Validators.required));
+          this.loanProductTermsForm.addControl('interestRateDifferential', new UntypedFormControl('', Validators.required));
+          this.loanProductTermsForm.addControl('isFloatingInterestRateCalculationAllowed', new UntypedFormControl(false));
+          this.loanProductTermsForm.addControl('minDifferentialLendingRate', new UntypedFormControl('', Validators.required));
+          this.loanProductTermsForm.addControl('defaultDifferentialLendingRate', new UntypedFormControl('', Validators.required));
+          this.loanProductTermsForm.addControl('maxDifferentialLendingRate', new UntypedFormControl('', Validators.required));
         } else {
-          this.loanProductTermsForm.addControl('minInterestRatePerPeriod', new FormControl(''));
-          this.loanProductTermsForm.addControl('interestRatePerPeriod', new FormControl('', Validators.required));
-          this.loanProductTermsForm.addControl('maxInterestRatePerPeriod', new FormControl(''));
-          this.loanProductTermsForm.addControl('interestRateFrequencyType', new FormControl(this.interestRateFrequencyTypeData.id, Validators.required));
+          this.loanProductTermsForm.addControl('minInterestRatePerPeriod', new UntypedFormControl(''));
+          this.loanProductTermsForm.addControl('interestRatePerPeriod', new UntypedFormControl('', Validators.required));
+          this.loanProductTermsForm.addControl('maxInterestRatePerPeriod', new UntypedFormControl(''));
+          this.loanProductTermsForm.addControl('interestRateFrequencyType', new UntypedFormControl(this.interestRateFrequencyTypeData.id, Validators.required));
           this.loanProductTermsForm.removeControl('floatingRatesId');
           this.loanProductTermsForm.removeControl('interestRateDifferential');
           this.loanProductTermsForm.removeControl('isFloatingInterestRateCalculationAllowed');
@@ -163,16 +163,16 @@ export class LoanProductTermsStepComponent implements OnInit {
         });
   }
 
-  get principalVariationsForBorrowerCycle(): FormArray {
-    return this.loanProductTermsForm.get('principalVariationsForBorrowerCycle') as FormArray;
+  get principalVariationsForBorrowerCycle(): UntypedFormArray {
+    return this.loanProductTermsForm.get('principalVariationsForBorrowerCycle') as UntypedFormArray;
   }
 
-  get numberOfRepaymentVariationsForBorrowerCycle(): FormArray {
-    return this.loanProductTermsForm.get('numberOfRepaymentVariationsForBorrowerCycle') as FormArray;
+  get numberOfRepaymentVariationsForBorrowerCycle(): UntypedFormArray {
+    return this.loanProductTermsForm.get('numberOfRepaymentVariationsForBorrowerCycle') as UntypedFormArray;
   }
 
-  get interestRateVariationsForBorrowerCycle(): FormArray {
-    return this.loanProductTermsForm.get('interestRateVariationsForBorrowerCycle') as FormArray;
+  get interestRateVariationsForBorrowerCycle(): UntypedFormArray {
+    return this.loanProductTermsForm.get('interestRateVariationsForBorrowerCycle') as UntypedFormArray;
   }
 
   setLoanProductTermsFormDirty() {
@@ -181,7 +181,7 @@ export class LoanProductTermsStepComponent implements OnInit {
     }
   }
 
-  addVariationsForBorrowerCycle(formType: string, variationsForBorrowerCycleFormArray: FormArray) {
+  addVariationsForBorrowerCycle(formType: string, variationsForBorrowerCycleFormArray: UntypedFormArray) {
     const data = this.getData(formType);
     const addVariationsForBorrowerCycleDialogRef = this.dialog.open(FormDialogComponent, { data });
     addVariationsForBorrowerCycleDialogRef.afterClosed().subscribe((response: any) => {
@@ -192,7 +192,7 @@ export class LoanProductTermsStepComponent implements OnInit {
     });
   }
 
-  editVariationsForBorrowerCycle(formType: string, variationsForBorrowerCycleFormArray: FormArray, index: number) {
+  editVariationsForBorrowerCycle(formType: string, variationsForBorrowerCycleFormArray: UntypedFormArray, index: number) {
     const data = { ...this.getData(formType, variationsForBorrowerCycleFormArray.at(index).value), layout: { addButtonText: 'Edit' } };
     const addVariationsForBorrowerCycleDialogRef = this.dialog.open(FormDialogComponent, { data });
     addVariationsForBorrowerCycleDialogRef.afterClosed().subscribe((response: any) => {
@@ -203,7 +203,7 @@ export class LoanProductTermsStepComponent implements OnInit {
     });
   }
 
-  deleteVariationsForBorrowerCycle(variationsForBorrowerCycleFormArray: FormArray, index: number) {
+  deleteVariationsForBorrowerCycle(variationsForBorrowerCycleFormArray: UntypedFormArray, index: number) {
     const deleteVariationsForBorrowerCycleDialogRef = this.dialog.open(DeleteDialogComponent, {
       data: { deleteContext: `this` }
     });

src/app/products/manage-delinquency-buckets/delinquency-bucket/create-bucket/create-bucket.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ProductsService } from 'app/products/products.service';
@@ -15,7 +15,7 @@ import { SelectBase } from 'app/shared/form-dialog/formfield/model/select-base';
 })
 export class CreateBucketComponent implements OnInit {
   /** Delinquency Bucket form. */
-  bucketForm: FormGroup;
+  bucketForm: UntypedFormGroup;
   /** Delinquency Bucket template data. */
   bucketTemplateData: any;
   /** Delinquency Range Data Source */
@@ -27,7 +27,7 @@ export class CreateBucketComponent implements OnInit {
   /** Delinquency Range Displayed Columns */
   displayedColumns: string[] = ['classification', 'minimumAgeDays', 'maximumAgeDays', 'actions'];
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     private productsService: ProductsService,
     private router: Router,
     private route: ActivatedRoute,

src/app/products/manage-delinquency-buckets/delinquency-bucket/edit-bucket/edit-bucket.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ProductsService } from 'app/products/products.service';
@@ -15,7 +15,7 @@ import { SelectBase } from 'app/shared/form-dialog/formfield/model/select-base';
 })
 export class EditBucketComponent implements OnInit {
   /** Delinquency Bucket form. */
-  bucketForm: FormGroup;
+  bucketForm: UntypedFormGroup;
   /** Delinquency Bucket template data. */
   bucketTemplateData: any;
   /** Delinquency Range Data Source */
@@ -33,7 +33,7 @@ export class EditBucketComponent implements OnInit {
   /** Delinquency Range Displayed Columns */
   displayedColumns: string[] = ['classification', 'minimumAgeDays', 'maximumAgeDays', 'actions'];
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     private productsService: ProductsService,
     private router: Router,
     private route: ActivatedRoute,

src/app/products/manage-delinquency-buckets/delinquency-range/create-range/create-range.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ProductsService } from 'app/products/products.service';
 import { SettingsService } from 'app/settings/settings.service';
@@ -12,9 +12,9 @@ import { SettingsService } from 'app/settings/settings.service';
 export class CreateRangeComponent implements OnInit {
 
   /** Delinquency Range form. */
-  delinquencyRangeForm: FormGroup;
+  delinquencyRangeForm: UntypedFormGroup;
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     private productsService: ProductsService,
     private route: ActivatedRoute,
     private router: Router,

src/app/products/manage-delinquency-buckets/delinquency-range/edit-range/edit-range.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ProductsService } from 'app/products/products.service';
 import { SettingsService } from 'app/settings/settings.service';
@@ -14,9 +14,9 @@ export class EditRangeComponent implements OnInit {
   /** Delinquency Range Data. */
   delinquencyRangeData: any;
   /** Delinquency Range form. */
-  delinquencyRangeForm: FormGroup;
+  delinquencyRangeForm: UntypedFormGroup;
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     private productsService: ProductsService,
     private route: ActivatedRoute,
     private router: Router,

src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormControl } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
 /** Custom Services */
@@ -23,7 +23,7 @@ export class CreateTaxComponentComponent implements OnInit {
   /** Maximum start date allowed. */
   maxDate = new Date();
   /** Tax Component form. */
-  taxComponentForm: FormGroup;
+  taxComponentForm: UntypedFormGroup;
   /** Tax Component template data. */
   taxComponentTemplateData: any;
   /** Credit Account Type data. */
@@ -44,7 +44,7 @@ export class CreateTaxComponentComponent implements OnInit {
    * @param {Dates} dateUtils Date Utils to format date.
    * @param {SettingsService} settingsService Settings Service.
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private productsService: ProductsService,
               private route: ActivatedRoute,
               private router: Router,
@@ -85,11 +85,11 @@ export class CreateTaxComponentComponent implements OnInit {
   setConditionalControls() {
     this.taxComponentForm.get('debitAccountType').valueChanges.subscribe(debitAccountTypeId => {
       this.debitAccountData = this.getAccountsData(debitAccountTypeId);
-      this.taxComponentForm.addControl('debitAcountId', new FormControl('', Validators.required));
+      this.taxComponentForm.addControl('debitAcountId', new UntypedFormControl('', Validators.required));
     });
     this.taxComponentForm.get('creditAccountType').valueChanges.subscribe(creditAccountTypeId => {
       this.creditAccountData = this.getAccountsData(creditAccountTypeId);
-      this.taxComponentForm.addControl('creditAcountId', new FormControl('', Validators.required));
+      this.taxComponentForm.addControl('creditAcountId', new UntypedFormControl('', Validators.required));
     });
   }
 

src/app/products/manage-tax-components/edit-tax-component/edit-tax-component.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
 /** Custom Services */
@@ -23,7 +23,7 @@ export class EditTaxComponentComponent implements OnInit {
   /** Maximum start date allowed. */
   maxDate = new Date();
   /** Tax Component form. */
-  taxComponentForm: FormGroup;
+  taxComponentForm: UntypedFormGroup;
   /** Tax Component data. */
   taxComponentData: any;
 
@@ -36,7 +36,7 @@ export class EditTaxComponentComponent implements OnInit {
    * @param {Dates} dateUtils Date Utils to format date.
    * @param {SettingsService} settingsService Settings Service.
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private productsService: ProductsService,
               private route: ActivatedRoute,
               private router: Router,

src/app/products/manage-tax-groups/create-tax-group/create-tax-group.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl, FormArray } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, FormControl, FormArray } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';
 
@@ -31,7 +31,7 @@ export class CreateTaxGroupComponent implements OnInit {
   /** Maximum start date allowed. */
   maxDate = new Date(2100, 0, 1);
   /** Tax Group form. */
-  taxGroupForm: FormGroup;
+  taxGroupForm: UntypedFormGroup;
   /** Tax Group template data. */
   taxGroupTemplateData: any;
   /** Tax Component Data Source */
@@ -52,7 +52,7 @@ export class CreateTaxGroupComponent implements OnInit {
    * @param {MatDialog} dialog Dialog reference.
    * @param {SettingsService} settingsService Settings Service.
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private productsService: ProductsService,
               private route: ActivatedRoute,
               private router: Router,

src/app/products/manage-tax-groups/edit-tax-group/edit-tax-group.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl, FormArray } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, FormControl, FormArray } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';
 
@@ -31,7 +31,7 @@ export class EditTaxGroupComponent implements OnInit {
   /** Maximum start date allowed. */
   maxDate = new Date(2100, 0, 1);
   /** Tax Group form. */
-  taxGroupForm: FormGroup;
+  taxGroupForm: UntypedFormGroup;
   /** Tax Group template data. */
   taxGroupData: any;
   /** Tax Component Data Source */
@@ -52,7 +52,7 @@ export class EditTaxGroupComponent implements OnInit {
    * @param {MatDialog} dialog Dialog reference.
    * @param {SettingsService} settingsService Settings Service.
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private productsService: ProductsService,
               private route: ActivatedRoute,
               private router: Router,

src/app/products/products-mix/create-product-mix/create-product-mix.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, FormControl } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
 /** Custom Services */
@@ -17,7 +17,7 @@ import { ProductsService } from '../../products.service';
 export class CreateProductMixComponent implements OnInit {
 
   /** Product mix form. */
-  productMixForm: FormGroup;
+  productMixForm: UntypedFormGroup;
   /** Products mix template data. */
   productsMixTemplateData: any;
   /** Product option data. */
@@ -32,7 +32,7 @@ export class CreateProductMixComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route.
    * @param {Router} router Router for navigation.
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private productsService: ProductsService,
               private route: ActivatedRoute,
               private router: Router) {

src/app/products/products-mix/edit-product-mix/edit-product-mix.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, FormControl } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
 /** Custom Services */
@@ -17,7 +17,7 @@ import { ProductsService } from '../../products.service';
 export class EditProductMixComponent implements OnInit {
 
   /** Product mix form. */
-  productMixForm: FormGroup;
+  productMixForm: UntypedFormGroup;
   /** Products mix template data. */
   productMixData: any;
   /** Product option data. */
@@ -32,7 +32,7 @@ export class EditProductMixComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route.
    * @param {Router} router Router for navigation.
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     private productsService: ProductsService,
     private route: ActivatedRoute,
     private router: Router) {

src/app/products/products.module.ts

@@ -124,128 +124,124 @@ import { LoanProductPaymentStrategyStepComponent } from './loan-products/loan-pr
  * All components related to product functions should be declared here.
  */
 @NgModule({
-  imports: [
-    SharedModule,
-    ProductsRoutingModule,
-    PipesModule,
-    DirectivesModule
-  ],
-  declarations: [
-    ProductsComponent,
-    LoanProductsComponent,
-    LoanProductDetailsStepComponent,
-    LoanProductCurrencyStepComponent,
-    LoanProductTermsStepComponent,
-    LoanProductSettingsStepComponent,
-    LoanProductPaymentStrategyStepComponent,
-    LoanProductChargesStepComponent,
-    LoanProductAccountingStepComponent,
-    LoanProductPreviewStepComponent,
-    CreateLoanProductComponent,
-    ManageTaxConfigurationsComponent,
-    RecurringDepositProductsComponent,
-    ChargesComponent,
-    ViewChargeComponent,
-    FixedDepositProductsComponent,
-    ManageTaxComponentsComponent,
-    ProductsMixComponent,
-    FloatingRatesComponent,
-    CreateFloatingRateComponent,
-    ViewFloatingRateComponent,
-    EditFloatingRateComponent,
-    FloatingRatePeriodDialogComponent,
-    ViewProductMixComponent,
-    ManageTaxComponentsComponent,
-    ViewLoanProductComponent,
-    EditLoanProductComponent,
-    SavingProductsComponent,
-    SavingProductDetailsStepComponent,
-    SavingProductCurrencyStepComponent,
-    SavingProductTermsStepComponent,
-    SavingProductSettingsStepComponent,
-    SavingProductChargesStepComponent,
-    SavingProductAccountingStepComponent,
-    SavingProductPreviewStepComponent,
-    CreateSavingProductComponent,
-    ViewSavingProductComponent,
-    EditSavingProductComponent,
-    ShareProductsComponent,
-    ShareProductDetailsStepComponent,
-    ShareProductCurrencyStepComponent,
-    ShareProductTermsStepComponent,
-    ShareProductSettingsStepComponent,
-    ShareProductMarketPriceStepComponent,
-    ShareProductChargesStepComponent,
-    ShareProductAccountingStepComponent,
-    ShareProductPreviewStepComponent,
-    CreateShareProductComponent,
-    ViewShareProductComponent,
-    EditShareProductComponent,
-    CreateFixedDepositProductComponent,
-    FixedDepositProductDetailsStepComponent,
-    FixedDepositProductCurrencyStepComponent,
-    FixedDepositProductTermsStepComponent,
-    FixedDepositProductSettingsStepComponent,
-    FixedDepositProductInterestRateChartStepComponent,
-    FixedDepositProductChargesStepComponent,
-    FixedDepositProductAccountingStepComponent,
-    FixedDepositProductPreviewStepComponent,
-    ManageTaxGroupsComponent,
-    ViewTaxComponentComponent,
-    CreateTaxComponentComponent,
-    EditTaxComponentComponent,
-    EditChargeComponent,
-    ViewTaxGroupComponent,
-    ShareProductsDividendsComponent,
-    DepositProductIncentiveFormDialogComponent,
-    ViewRecurringDepositProductComponent,
-    CreateRecurringDepositProductComponent,
-    RecurringDepositProductAccountingStepComponent,
-    RecurringDepositProductChargesStepComponent,
-    RecurringDepositProductCurrencyStepComponent,
-    RecurringDepositProductDetailsStepComponent,
-    RecurringDepositProductInterestRateChartStepComponent,
-    RecurringDepositProductPreviewStepComponent,
-    RecurringDepositProductSettingsStepComponent,
-    RecurringDepositProductTermsStepComponent,
-    EditRecurringDepositProductComponent,
-    CreateDividendComponent,
-    ViewDividendComponent,
-    ViewFixedDepositProductComponent,
-    CreateTaxGroupComponent,
-    EditTaxGroupComponent,
-    CreateProductMixComponent,
-    EditProductMixComponent,
-    ManageTaxGroupsComponent,
-    CreateChargeComponent,
-    EditFixedDepositProductComponent,
-    CollateralsComponent,
-    CreateCollateralComponent,
-    EditCollateralComponent,
-    ViewCollateralComponent,
-    ManageDelinquencyBucketsComponent,
-    DelinquencyBucketComponent,
-    DelinquencyRangeComponent,
-    CreateRangeComponent,
-    ViewRangeComponent,
-    EditRangeComponent,
-    ViewBucketComponent,
-    CreateBucketComponent,
-    EditBucketComponent,
-    DatatableTabComponent,
-    GeneralTabComponent,
-    SavingProductGeneralTabComponent,
-    SavingProductDatatableTabComponent,
-    FixedDepositGeneralTabComponent,
-    FixedDepositDatatableTabComponent,
-    RecurringDepositDatatableTabComponent,
-    RecurringDepositGeneralTabComponent,
-    ShareProductGeneralTabComponent,
-    ShareProductDatatableTabComponent
-  ],
-  entryComponents: [
-    DepositProductIncentiveFormDialogComponent,
-    FloatingRatePeriodDialogComponent
-  ],
+    imports: [
+        SharedModule,
+        ProductsRoutingModule,
+        PipesModule,
+        DirectivesModule
+    ],
+    declarations: [
+        ProductsComponent,
+        LoanProductsComponent,
+        LoanProductDetailsStepComponent,
+        LoanProductCurrencyStepComponent,
+        LoanProductTermsStepComponent,
+        LoanProductSettingsStepComponent,
+        LoanProductPaymentStrategyStepComponent,
+        LoanProductChargesStepComponent,
+        LoanProductAccountingStepComponent,
+        LoanProductPreviewStepComponent,
+        CreateLoanProductComponent,
+        ManageTaxConfigurationsComponent,
+        RecurringDepositProductsComponent,
+        ChargesComponent,
+        ViewChargeComponent,
+        FixedDepositProductsComponent,
+        ManageTaxComponentsComponent,
+        ProductsMixComponent,
+        FloatingRatesComponent,
+        CreateFloatingRateComponent,
+        ViewFloatingRateComponent,
+        EditFloatingRateComponent,
+        FloatingRatePeriodDialogComponent,
+        ViewProductMixComponent,
+        ManageTaxComponentsComponent,
+        ViewLoanProductComponent,
+        EditLoanProductComponent,
+        SavingProductsComponent,
+        SavingProductDetailsStepComponent,
+        SavingProductCurrencyStepComponent,
+        SavingProductTermsStepComponent,
+        SavingProductSettingsStepComponent,
+        SavingProductChargesStepComponent,
+        SavingProductAccountingStepComponent,
+        SavingProductPreviewStepComponent,
+        CreateSavingProductComponent,
+        ViewSavingProductComponent,
+        EditSavingProductComponent,
+        ShareProductsComponent,
+        ShareProductDetailsStepComponent,
+        ShareProductCurrencyStepComponent,
+        ShareProductTermsStepComponent,
+        ShareProductSettingsStepComponent,
+        ShareProductMarketPriceStepComponent,
+        ShareProductChargesStepComponent,
+        ShareProductAccountingStepComponent,
+        ShareProductPreviewStepComponent,
+        CreateShareProductComponent,
+        ViewShareProductComponent,
+        EditShareProductComponent,
+        CreateFixedDepositProductComponent,
+        FixedDepositProductDetailsStepComponent,
+        FixedDepositProductCurrencyStepComponent,
+        FixedDepositProductTermsStepComponent,
+        FixedDepositProductSettingsStepComponent,
+        FixedDepositProductInterestRateChartStepComponent,
+        FixedDepositProductChargesStepComponent,
+        FixedDepositProductAccountingStepComponent,
+        FixedDepositProductPreviewStepComponent,
+        ManageTaxGroupsComponent,
+        ViewTaxComponentComponent,
+        CreateTaxComponentComponent,
+        EditTaxComponentComponent,
+        EditChargeComponent,
+        ViewTaxGroupComponent,
+        ShareProductsDividendsComponent,
+        DepositProductIncentiveFormDialogComponent,
+        ViewRecurringDepositProductComponent,
+        CreateRecurringDepositProductComponent,
+        RecurringDepositProductAccountingStepComponent,
+        RecurringDepositProductChargesStepComponent,
+        RecurringDepositProductCurrencyStepComponent,
+        RecurringDepositProductDetailsStepComponent,
+        RecurringDepositProductInterestRateChartStepComponent,
+        RecurringDepositProductPreviewStepComponent,
+        RecurringDepositProductSettingsStepComponent,
+        RecurringDepositProductTermsStepComponent,
+        EditRecurringDepositProductComponent,
+        CreateDividendComponent,
+        ViewDividendComponent,
+        ViewFixedDepositProductComponent,
+        CreateTaxGroupComponent,
+        EditTaxGroupComponent,
+        CreateProductMixComponent,
+        EditProductMixComponent,
+        ManageTaxGroupsComponent,
+        CreateChargeComponent,
+        EditFixedDepositProductComponent,
+        CollateralsComponent,
+        CreateCollateralComponent,
+        EditCollateralComponent,
+        ViewCollateralComponent,
+        ManageDelinquencyBucketsComponent,
+        DelinquencyBucketComponent,
+        DelinquencyRangeComponent,
+        CreateRangeComponent,
+        ViewRangeComponent,
+        EditRangeComponent,
+        ViewBucketComponent,
+        CreateBucketComponent,
+        EditBucketComponent,
+        DatatableTabComponent,
+        GeneralTabComponent,
+        SavingProductGeneralTabComponent,
+        SavingProductDatatableTabComponent,
+        FixedDepositGeneralTabComponent,
+        FixedDepositDatatableTabComponent,
+        RecurringDepositDatatableTabComponent,
+        RecurringDepositGeneralTabComponent,
+        ShareProductGeneralTabComponent,
+        ShareProductDatatableTabComponent
+    ]
 })
 export class ProductsModule { }

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-accounting-step/recurring-deposit-product-accounting-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, FormArray, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormArray, Validators, UntypedFormControl } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 
 import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
@@ -19,7 +19,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
   @Input() accountingRuleData: any;
   @Input() recurringDepositProductFormValid: boolean;
 
-  recurringDepositProductAccountingForm: FormGroup;
+  recurringDepositProductAccountingForm: UntypedFormGroup;
 
   chargeData: any;
   penaltyData: any;
@@ -32,7 +32,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
   paymentFundSourceDisplayedColumns: string[] = ['paymentTypeId', 'fundSourceAccountId', 'actions'];
   feesPenaltyIncomeDisplayedColumns: string[] = ['chargeId', 'incomeAccountId', 'actions'];
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     public dialog: MatDialog) {
     this.createrecurringDepositProductAccountingForm();
     this.setConditionalControls();
@@ -75,7 +75,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
             paymentTypeId: [paymentChannelToFundSourceMapping.paymentType.id, Validators.required],
             fundSourceAccountId: [paymentChannelToFundSourceMapping.fundSourceAccount.id, Validators.required]
           });
-          const formArray = this.recurringDepositProductAccountingForm.controls['paymentChannelToFundSourceMappings'] as FormArray;
+          const formArray = this.recurringDepositProductAccountingForm.controls['paymentChannelToFundSourceMappings'] as UntypedFormArray;
           formArray.push(paymentChannelToFundSourceMappingData);
         });
       }
@@ -85,7 +85,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
             chargeId: [feeToIncomeAccountMapping.charge.id, Validators.required],
             incomeAccountId: [feeToIncomeAccountMapping.incomeAccount.id, Validators.required]
           });
-          const formArray = this.recurringDepositProductAccountingForm.controls['feeToIncomeAccountMappings'] as FormArray;
+          const formArray = this.recurringDepositProductAccountingForm.controls['feeToIncomeAccountMappings'] as UntypedFormArray;
           formArray.push(feeToIncomeAccountMappingData);
         });
       }
@@ -95,7 +95,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
             chargeId: [penaltyToIncomeAccountMapping.charge.id, Validators.required],
             incomeAccountId: [penaltyToIncomeAccountMapping.incomeAccount.id, Validators.required]
           });
-          const formArray = this.recurringDepositProductAccountingForm.controls['penaltyToIncomeAccountMappings'] as FormArray;
+          const formArray = this.recurringDepositProductAccountingForm.controls['penaltyToIncomeAccountMappings'] as UntypedFormArray;
           formArray.push(penaltyToIncomeAccountMappingData);
         });
       }
@@ -112,13 +112,13 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
     this.recurringDepositProductAccountingForm.get('accountingRule').valueChanges
       .subscribe((accountingRule: any) => {
         if (accountingRule === 2) {
-          this.recurringDepositProductAccountingForm.addControl('savingsReferenceAccountId', new FormControl('', Validators.required));
-          this.recurringDepositProductAccountingForm.addControl('savingsControlAccountId', new FormControl('', Validators.required));
-          this.recurringDepositProductAccountingForm.addControl('transfersInSuspenseAccountId', new FormControl('', Validators.required));
-          this.recurringDepositProductAccountingForm.addControl('interestOnSavingsAccountId', new FormControl('', Validators.required));
-          this.recurringDepositProductAccountingForm.addControl('incomeFromFeeAccountId', new FormControl('', Validators.required));
-          this.recurringDepositProductAccountingForm.addControl('incomeFromPenaltyAccountId', new FormControl('', Validators.required));
-          this.recurringDepositProductAccountingForm.addControl('advancedAccountingRules', new FormControl(false));
+          this.recurringDepositProductAccountingForm.addControl('savingsReferenceAccountId', new UntypedFormControl('', Validators.required));
+          this.recurringDepositProductAccountingForm.addControl('savingsControlAccountId', new UntypedFormControl('', Validators.required));
+          this.recurringDepositProductAccountingForm.addControl('transfersInSuspenseAccountId', new UntypedFormControl('', Validators.required));
+          this.recurringDepositProductAccountingForm.addControl('interestOnSavingsAccountId', new UntypedFormControl('', Validators.required));
+          this.recurringDepositProductAccountingForm.addControl('incomeFromFeeAccountId', new UntypedFormControl('', Validators.required));
+          this.recurringDepositProductAccountingForm.addControl('incomeFromPenaltyAccountId', new UntypedFormControl('', Validators.required));
+          this.recurringDepositProductAccountingForm.addControl('advancedAccountingRules', new UntypedFormControl(false));
 
           this.recurringDepositProductAccountingForm.get('advancedAccountingRules').valueChanges
             .subscribe((advancedAccountingRules: boolean) => {
@@ -148,19 +148,19 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
       });
   }
 
-  get paymentChannelToFundSourceMappings(): FormArray {
-    return this.recurringDepositProductAccountingForm.get('paymentChannelToFundSourceMappings') as FormArray;
+  get paymentChannelToFundSourceMappings(): UntypedFormArray {
+    return this.recurringDepositProductAccountingForm.get('paymentChannelToFundSourceMappings') as UntypedFormArray;
   }
 
-  get feeToIncomeAccountMappings(): FormArray {
-    return this.recurringDepositProductAccountingForm.get('feeToIncomeAccountMappings') as FormArray;
+  get feeToIncomeAccountMappings(): UntypedFormArray {
+    return this.recurringDepositProductAccountingForm.get('feeToIncomeAccountMappings') as UntypedFormArray;
   }
 
-  get penaltyToIncomeAccountMappings(): FormArray {
-    return this.recurringDepositProductAccountingForm.get('penaltyToIncomeAccountMappings') as FormArray;
+  get penaltyToIncomeAccountMappings(): UntypedFormArray {
+    return this.recurringDepositProductAccountingForm.get('penaltyToIncomeAccountMappings') as UntypedFormArray;
   }
 
-  add(formType: string, formArray: FormArray) {
+  add(formType: string, formArray: UntypedFormArray) {
     const data = { ...this.getData(formType), pristine: false };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -170,7 +170,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
     });
   }
 
-  edit(formType: string, formArray: FormArray, index: number) {
+  edit(formType: string, formArray: UntypedFormArray, index: number) {
     const data = { ...this.getData(formType, formArray.at(index).value), layout: { addButtonText: 'Edit' } };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -180,7 +180,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
     });
   }
 
-  delete(formArray: FormArray, index: number) {
+  delete(formArray: UntypedFormArray, index: number) {
     const dialogRef = this.dialog.open(DeleteDialogComponent, {
       data: { deleteContext: `this` }
     });

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-charges-step/recurring-deposit-product-charges-step.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
 
@@ -12,7 +12,7 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co
 export class RecurringDepositProductChargesStepComponent implements OnInit {
 
   @Input() recurringDepositProductsTemplate: any;
-  @Input() currencyCode: FormControl;
+  @Input() currencyCode: UntypedFormControl;
 
   chargeData: any;
 

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-currency-step/recurring-deposit-product-currency-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 
 @Component({
   selector: 'mifosx-recurring-deposit-product-currency-step',
@@ -10,11 +10,11 @@ export class RecurringDepositProductCurrencyStepComponent implements OnInit {
 
   @Input() recurringDepositProductsTemplate: any;
 
-  recurringDepositProductCurrencyForm: FormGroup;
+  recurringDepositProductCurrencyForm: UntypedFormGroup;
 
   currencyData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createrecurringDepositProductCurrencyForm();
   }
 

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-details-step/recurring-deposit-product-details-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 
 @Component({
   selector: 'mifosx-recurring-deposit-product-details-step',
@@ -10,9 +10,9 @@ export class RecurringDepositProductDetailsStepComponent implements OnInit {
 
   @Input() recurringDepositProductsTemplate: any;
 
-  recurringDepositProductDetailsForm: FormGroup;
+  recurringDepositProductDetailsForm: UntypedFormGroup;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createrecurringDepositProductDetailsForm();
   }
 

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-interest-rate-chart-step/recurring-deposit-product-interest-rate-chart-step.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormArray } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormArray } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 
@@ -34,7 +34,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
 
   @Input() recurringDepositProductsTemplate: any;
 
-  recurringDepositProductInterestRateChartForm: FormGroup;
+  recurringDepositProductInterestRateChartForm: UntypedFormGroup;
 
   periodTypeData: any;
   entityTypeData: any;
@@ -63,7 +63,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
    * @param {SettingsService} settingsService Settings Service.
    */
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               public dialog: MatDialog,
               private dateUtils: Dates,
               private settingsService: SettingsService) {
@@ -101,7 +101,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
     this.getChartsDetailsData();
 
     // Iterates for every chart in charts
-    this.charts.controls.forEach((chartDetailControl: FormGroup, i: number) => {
+    this.charts.controls.forEach((chartDetailControl: UntypedFormGroup, i: number) => {
 
       if (!this.chartsDetail[i]) {
         return;
@@ -120,7 +120,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
           periodType: [chartSlabDetail.periodType, Validators.required],
           incentives: this.formBuilder.array([])
         });
-        const formArray = chartDetailControl.controls['chartSlabs'] as FormArray;
+        const formArray = chartDetailControl.controls['chartSlabs'] as UntypedFormArray;
         formArray.push(chartSlabInfo);
 
         // Iterate for every slab in chartSlab
@@ -136,7 +136,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
             entityType: [chartIncentiveDetail.entityType, Validators.required],
             incentiveType: [chartIncentiveDetail.incentiveType, Validators.required]
           });
-          const newFormArray = chartIncentiveControl['controls']['incentives'] as FormArray;
+          const newFormArray = chartIncentiveControl['controls']['incentives'] as UntypedFormArray;
           newFormArray.push(incentiveInfo);
         });
 
@@ -218,11 +218,11 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
     });
   }
 
-  get charts(): FormArray {
-    return this.recurringDepositProductInterestRateChartForm.get('charts') as FormArray;
+  get charts(): UntypedFormArray {
+    return this.recurringDepositProductInterestRateChartForm.get('charts') as UntypedFormArray;
   }
 
-  createChartForm(): FormGroup {
+  createChartForm(): UntypedFormGroup {
     return this.formBuilder.group({
       'name': [''],
       'description': [''],
@@ -247,11 +247,11 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
       });
   }
 
-  getIncentives(chartSlabs: FormArray, chartSlabIndex: number): FormArray {
-    return chartSlabs.at(chartSlabIndex).get('incentives') as FormArray;
+  getIncentives(chartSlabs: UntypedFormArray, chartSlabIndex: number): UntypedFormArray {
+    return chartSlabs.at(chartSlabIndex).get('incentives') as UntypedFormArray;
   }
 
-  addChartSlab(chartSlabs: FormArray) {
+  addChartSlab(chartSlabs: UntypedFormArray) {
     const data = { ...this.getData('Slab') };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -262,7 +262,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
     });
   }
 
-  addIncentive(incentives: FormArray) {
+  addIncentive(incentives: UntypedFormArray) {
     const data = { ...this.getData('Incentive'), entityType: this.entityTypeData[0].id };
     const dialogRef = this.dialog.open(DepositProductIncentiveFormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -272,7 +272,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
     });
   }
 
-  editChartSlab(chartSlabs: FormArray, chartSlabIndex: number) {
+  editChartSlab(chartSlabs: UntypedFormArray, chartSlabIndex: number) {
     const data = { ...this.getData('Slab', chartSlabs.at(chartSlabIndex).value), layout: { addButtonText: 'Edit' } };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -282,7 +282,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
     });
   }
 
-  editIncentive(incentives: FormArray, incentiveIndex: number) {
+  editIncentive(incentives: UntypedFormArray, incentiveIndex: number) {
     const data = { ...this.getData('Incentive', incentives.at(incentiveIndex).value), layout: { addButtonText: 'Edit' } };
     const dialogRef = this.dialog.open(DepositProductIncentiveFormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -292,7 +292,7 @@ export class RecurringDepositProductInterestRateChartStepComponent implements On
     });
   }
 
-  delete(formArray: FormArray, index: number) {
+  delete(formArray: UntypedFormArray, index: number) {
     const dialogRef = this.dialog.open(DeleteDialogComponent, {
       data: { deleteContext: `this` }
     });

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-settings-step/recurring-deposit-product-settings-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormControl, Validators } from '@angular/forms';
 
 @Component({
   selector: 'mifosx-recurring-deposit-product-settings-step',
@@ -10,14 +10,14 @@ export class RecurringDepositProductSettingsStepComponent implements OnInit {
 
   @Input() recurringDepositProductsTemplate: any;
 
-  recurringDepositProductSettingsForm: FormGroup;
+  recurringDepositProductSettingsForm: UntypedFormGroup;
 
   lockinPeriodFrequencyTypeData: any;
   periodFrequencyTypeData: any;
   preClosurePenalInterestOnTypeData: any;
   taxGroupData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createrecurringDepositProductSettingsForm();
     this.setConditionalControls();
   }
@@ -73,7 +73,7 @@ export class RecurringDepositProductSettingsStepComponent implements OnInit {
     this.recurringDepositProductSettingsForm.get('withHoldTax').valueChanges
       .subscribe((withHoldTax: any) => {
         if (withHoldTax) {
-          this.recurringDepositProductSettingsForm.addControl('taxGroupId', new FormControl('', Validators.required));
+          this.recurringDepositProductSettingsForm.addControl('taxGroupId', new UntypedFormControl('', Validators.required));
         } else {
           this.recurringDepositProductSettingsForm.removeControl('taxGroupId');
         }

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-terms-step/recurring-deposit-product-terms-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 
 @Component({
   selector: 'mifosx-recurring-deposit-product-terms-step',
@@ -10,14 +10,14 @@ export class RecurringDepositProductTermsStepComponent implements OnInit {
 
   @Input() recurringDepositProductsTemplate: any;
 
-  recurringDepositProductTermsForm: FormGroup;
+  recurringDepositProductTermsForm: UntypedFormGroup;
 
   interestCompoundingPeriodTypeData: any;
   interestPostingPeriodTypeData: any;
   interestCalculationTypeData: any;
   interestCalculationDaysInYearTypeData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createrecurringDepositProductTermsForm();
   }
 

src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, FormArray, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormArray, Validators, UntypedFormControl } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 
 import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
@@ -17,10 +17,10 @@ export class SavingProductAccountingStepComponent implements OnInit {
 
   @Input() savingProductsTemplate: any;
   @Input() accountingRuleData: any;
-  @Input() isDormancyTrackingActive: FormControl;
+  @Input() isDormancyTrackingActive: UntypedFormControl;
   @Input() savingProductFormValid: boolean;
 
-  savingProductAccountingForm: FormGroup;
+  savingProductAccountingForm: UntypedFormGroup;
 
   chargeData: any;
   penaltyData: any;
@@ -34,7 +34,7 @@ export class SavingProductAccountingStepComponent implements OnInit {
   paymentFundSourceDisplayedColumns: string[] = ['paymentTypeId', 'fundSourceAccountId', 'actions'];
   feesPenaltyIncomeDisplayedColumns: string[] = ['chargeId', 'incomeAccountId', 'actions'];
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               public dialog: MatDialog) {
     this.createsavingProductAccountingForm();
     this.setConditionalControls();
@@ -93,25 +93,25 @@ export class SavingProductAccountingStepComponent implements OnInit {
     this.savingProductAccountingForm.get('accountingRule').valueChanges
       .subscribe((accountingRule: any) => {
         if (accountingRule === 2) {
-          this.savingProductAccountingForm.addControl('savingsReferenceAccountId', new FormControl('', Validators.required));
-          this.savingProductAccountingForm.addControl('overdraftPortfolioControlId', new FormControl('', Validators.required));
-          this.savingProductAccountingForm.addControl('savingsControlAccountId', new FormControl('', Validators.required));
-          this.savingProductAccountingForm.addControl('transfersInSuspenseAccountId', new FormControl('', Validators.required));
-          this.savingProductAccountingForm.addControl('interestOnSavingsAccountId', new FormControl('', Validators.required));
-          this.savingProductAccountingForm.addControl('writeOffAccountId', new FormControl('', Validators.required));
-          this.savingProductAccountingForm.addControl('incomeFromFeeAccountId', new FormControl('', Validators.required));
-          this.savingProductAccountingForm.addControl('incomeFromPenaltyAccountId', new FormControl('', Validators.required));
-          this.savingProductAccountingForm.addControl('incomeFromInterestId', new FormControl('', Validators.required));
-          this.savingProductAccountingForm.addControl('advancedAccountingRules', new FormControl(false));
+          this.savingProductAccountingForm.addControl('savingsReferenceAccountId', new UntypedFormControl('', Validators.required));
+          this.savingProductAccountingForm.addControl('overdraftPortfolioControlId', new UntypedFormControl('', Validators.required));
+          this.savingProductAccountingForm.addControl('savingsControlAccountId', new UntypedFormControl('', Validators.required));
+          this.savingProductAccountingForm.addControl('transfersInSuspenseAccountId', new UntypedFormControl('', Validators.required));
+          this.savingProductAccountingForm.addControl('interestOnSavingsAccountId', new UntypedFormControl('', Validators.required));
+          this.savingProductAccountingForm.addControl('writeOffAccountId', new UntypedFormControl('', Validators.required));
+          this.savingProductAccountingForm.addControl('incomeFromFeeAccountId', new UntypedFormControl('', Validators.required));
+          this.savingProductAccountingForm.addControl('incomeFromPenaltyAccountId', new UntypedFormControl('', Validators.required));
+          this.savingProductAccountingForm.addControl('incomeFromInterestId', new UntypedFormControl('', Validators.required));
+          this.savingProductAccountingForm.addControl('advancedAccountingRules', new UntypedFormControl(false));
 
           if (this.isDormancyTrackingActive.value) {
-            this.savingProductAccountingForm.addControl('escheatLiabilityId', new FormControl('', Validators.required));
+            this.savingProductAccountingForm.addControl('escheatLiabilityId', new UntypedFormControl('', Validators.required));
           }
 
           this.isDormancyTrackingActive.valueChanges
             .subscribe((isDormancyTrackingActive: boolean) => {
               if (isDormancyTrackingActive) {
-                this.savingProductAccountingForm.addControl('escheatLiabilityId', new FormControl('', Validators.required));
+                this.savingProductAccountingForm.addControl('escheatLiabilityId', new UntypedFormControl('', Validators.required));
               } else {
                 this.savingProductAccountingForm.removeControl('escheatLiabilityId');
               }
@@ -145,16 +145,16 @@ export class SavingProductAccountingStepComponent implements OnInit {
       });
   }
 
-  get paymentChannelToFundSourceMappings(): FormArray {
-    return this.savingProductAccountingForm.get('paymentChannelToFundSourceMappings') as FormArray;
+  get paymentChannelToFundSourceMappings(): UntypedFormArray {
+    return this.savingProductAccountingForm.get('paymentChannelToFundSourceMappings') as UntypedFormArray;
   }
 
-  get feeToIncomeAccountMappings(): FormArray {
-    return this.savingProductAccountingForm.get('feeToIncomeAccountMappings') as FormArray;
+  get feeToIncomeAccountMappings(): UntypedFormArray {
+    return this.savingProductAccountingForm.get('feeToIncomeAccountMappings') as UntypedFormArray;
   }
 
-  get penaltyToIncomeAccountMappings(): FormArray {
-    return this.savingProductAccountingForm.get('penaltyToIncomeAccountMappings') as FormArray;
+  get penaltyToIncomeAccountMappings(): UntypedFormArray {
+    return this.savingProductAccountingForm.get('penaltyToIncomeAccountMappings') as UntypedFormArray;
   }
 
   setSavingProductAccountingFormDirty() {
@@ -163,7 +163,7 @@ export class SavingProductAccountingStepComponent implements OnInit {
     }
   }
 
-  add(formType: string, formArray: FormArray) {
+  add(formType: string, formArray: UntypedFormArray) {
     const data = { ...this.getData(formType), pristine: false };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -174,7 +174,7 @@ export class SavingProductAccountingStepComponent implements OnInit {
     });
   }
 
-  edit(formType: string, formArray: FormArray, index: number) {
+  edit(formType: string, formArray: UntypedFormArray, index: number) {
     const data = { ...this.getData(formType, formArray.at(index).value), layout: { addButtonText: 'Edit' } };
     const dialogRef = this.dialog.open(FormDialogComponent, { data });
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -185,7 +185,7 @@ export class SavingProductAccountingStepComponent implements OnInit {
     });
   }
 
-  delete(formArray: FormArray, index: number) {
+  delete(formArray: UntypedFormArray, index: number) {
     const dialogRef = this.dialog.open(DeleteDialogComponent, {
       data: { deleteContext: `this` }
     });

src/app/products/saving-products/saving-product-stepper/saving-product-charges-step/saving-product-charges-step.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
 
@@ -12,7 +12,7 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co
 export class SavingProductChargesStepComponent implements OnInit {
 
   @Input() savingProductsTemplate: any;
-  @Input() currencyCode: FormControl;
+  @Input() currencyCode: UntypedFormControl;
 
   chargeData: any;
 

src/app/products/saving-products/saving-product-stepper/saving-product-currency-step/saving-product-currency-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,11 +11,11 @@ export class SavingProductCurrencyStepComponent implements OnInit {
 
   @Input() savingProductsTemplate: any;
 
-  savingProductCurrencyForm: FormGroup;
+  savingProductCurrencyForm: UntypedFormGroup;
 
   currencyData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createSavingProductCurrencyForm();
   }
 

src/app/products/saving-products/saving-product-stepper/saving-product-details-step/saving-product-details-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,9 +11,9 @@ export class SavingProductDetailsStepComponent implements OnInit {
 
   @Input() savingProductsTemplate: any;
 
-  savingProductDetailsForm: FormGroup;
+  savingProductDetailsForm: UntypedFormGroup;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createSavingProductDetailsForm();
   }
 

src/app/products/saving-products/saving-product-stepper/saving-product-settings-step/saving-product-settings-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormControl, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,12 +11,12 @@ export class SavingProductSettingsStepComponent implements OnInit {
 
   @Input() savingProductsTemplate: any;
 
-  savingProductSettingsForm: FormGroup;
+  savingProductSettingsForm: UntypedFormGroup;
 
   lockinPeriodFrequencyTypeData: any;
   taxGroupData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createSavingProductSettingsForm();
     this.setConditionalControls();
   }
@@ -65,9 +65,9 @@ export class SavingProductSettingsStepComponent implements OnInit {
     this.savingProductSettingsForm.get('allowOverdraft').valueChanges
       .subscribe((allowOverdraft: any) => {
         if (allowOverdraft) {
-          this.savingProductSettingsForm.addControl('minOverdraftForInterestCalculation', new FormControl(''));
-          this.savingProductSettingsForm.addControl('nominalAnnualInterestRateOverdraft', new FormControl(''));
-          this.savingProductSettingsForm.addControl('overdraftLimit', new FormControl(''));
+          this.savingProductSettingsForm.addControl('minOverdraftForInterestCalculation', new UntypedFormControl(''));
+          this.savingProductSettingsForm.addControl('nominalAnnualInterestRateOverdraft', new UntypedFormControl(''));
+          this.savingProductSettingsForm.addControl('overdraftLimit', new UntypedFormControl(''));
         } else {
           this.savingProductSettingsForm.removeControl('minOverdraftForInterestCalculation');
           this.savingProductSettingsForm.removeControl('nominalAnnualInterestRateOverdraft');
@@ -78,7 +78,7 @@ export class SavingProductSettingsStepComponent implements OnInit {
     this.savingProductSettingsForm.get('withHoldTax').valueChanges
       .subscribe((withHoldTax: any) => {
         if (withHoldTax) {
-          this.savingProductSettingsForm.addControl('taxGroupId', new FormControl('', Validators.required));
+          this.savingProductSettingsForm.addControl('taxGroupId', new UntypedFormControl('', Validators.required));
         } else {
           this.savingProductSettingsForm.removeControl('taxGroupId');
         }
@@ -87,9 +87,9 @@ export class SavingProductSettingsStepComponent implements OnInit {
     this.savingProductSettingsForm.get('isDormancyTrackingActive').valueChanges
       .subscribe((isDormancyTrackingActive: any) => {
         if (isDormancyTrackingActive) {
-          this.savingProductSettingsForm.addControl('daysToInactive', new FormControl('', Validators.required));
-          this.savingProductSettingsForm.addControl('daysToDormancy', new FormControl('', Validators.required));
-          this.savingProductSettingsForm.addControl('daysToEscheat', new FormControl('', Validators.required));
+          this.savingProductSettingsForm.addControl('daysToInactive', new UntypedFormControl('', Validators.required));
+          this.savingProductSettingsForm.addControl('daysToDormancy', new UntypedFormControl('', Validators.required));
+          this.savingProductSettingsForm.addControl('daysToEscheat', new UntypedFormControl('', Validators.required));
         } else {
           this.savingProductSettingsForm.removeControl('daysToInactive');
           this.savingProductSettingsForm.removeControl('daysToDormancy');

src/app/products/saving-products/saving-product-stepper/saving-product-terms-step/saving-product-terms-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,14 +11,14 @@ export class SavingProductTermsStepComponent implements OnInit {
 
   @Input() savingProductsTemplate: any;
 
-  savingProductTermsForm: FormGroup;
+  savingProductTermsForm: UntypedFormGroup;
 
   interestCompoundingPeriodTypeData: any;
   interestPostingPeriodTypeData: any;
   interestCalculationTypeData: any;
   interestCalculationDaysInYearTypeData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createSavingProductTermsForm();
   }
 

src/app/products/share-products/create-dividend/create-dividend.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports. */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Dates } from 'app/core/utils/dates';
 
@@ -20,7 +20,7 @@ import { SettingsService } from 'app/settings/settings.service';
 export class CreateDividendComponent implements OnInit {
 
   /** Create Dividend Form. */
-  createDividendForm: FormGroup;
+  createDividendForm: UntypedFormGroup;
   /** Share Product data. */
   shareProductData: any;
   /** Minimum Date allowed. */
@@ -37,7 +37,7 @@ export class CreateDividendComponent implements OnInit {
    * @param {Router} router Router.
    * @param {SettingsService} settingsService Settings Service.
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private route: ActivatedRoute,
               private dateUtils: Dates,
               private productService: ProductsService,

src/app/products/share-products/share-product-stepper/share-product-accounting-step/share-product-accounting-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormControl } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -13,14 +13,14 @@ export class ShareProductAccountingStepComponent implements OnInit {
   @Input() accountingRuleData: any;
   @Input() shareProductFormValid: boolean;
 
-  shareProductAccountingForm: FormGroup;
+  shareProductAccountingForm: UntypedFormGroup;
 
   assetAccountData: any;
   incomeAccountData: any;
   equityAccountData: any;
   liabilityAccountData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createShareProductAccountingForm();
     this.setConditionalControls();
   }
@@ -57,10 +57,10 @@ export class ShareProductAccountingStepComponent implements OnInit {
     this.shareProductAccountingForm.get('accountingRule').valueChanges
       .subscribe((accountingRule: any) => {
         if (accountingRule === 2) {
-          this.shareProductAccountingForm.addControl('shareReferenceId', new FormControl('', Validators.required));
-          this.shareProductAccountingForm.addControl('shareSuspenseId', new FormControl('', Validators.required));
-          this.shareProductAccountingForm.addControl('shareEquityId', new FormControl('', Validators.required));
-          this.shareProductAccountingForm.addControl('incomeFromFeeAccountId', new FormControl('', Validators.required));
+          this.shareProductAccountingForm.addControl('shareReferenceId', new UntypedFormControl('', Validators.required));
+          this.shareProductAccountingForm.addControl('shareSuspenseId', new UntypedFormControl('', Validators.required));
+          this.shareProductAccountingForm.addControl('shareEquityId', new UntypedFormControl('', Validators.required));
+          this.shareProductAccountingForm.addControl('incomeFromFeeAccountId', new UntypedFormControl('', Validators.required));
         } else {
           this.shareProductAccountingForm.removeControl('shareReferenceId');
           this.shareProductAccountingForm.removeControl('shareSuspenseId');

src/app/products/share-products/share-product-stepper/share-product-charges-step/share-product-charges-step.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
@@ -13,7 +13,7 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co
 export class ShareProductChargesStepComponent implements OnInit {
 
   @Input() shareProductsTemplate: any;
-  @Input() currencyCode: FormControl;
+  @Input() currencyCode: UntypedFormControl;
 
   chargeData: any;
 

src/app/products/share-products/share-product-stepper/share-product-currency-step/share-product-currency-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,11 +11,11 @@ export class ShareProductCurrencyStepComponent implements OnInit {
 
   @Input() shareProductsTemplate: any;
 
-  shareProductCurrencyForm: FormGroup;
+  shareProductCurrencyForm: UntypedFormGroup;
 
   currencyData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createShareProductCurrencyForm();
   }
 

src/app/products/share-products/share-product-stepper/share-product-details-step/share-product-details-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,9 +11,9 @@ export class ShareProductDetailsStepComponent implements OnInit {
 
   @Input() shareProductsTemplate: any;
 
-  shareProductDetailsForm: FormGroup;
+  shareProductDetailsForm: UntypedFormGroup;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createShareProductDetailsForm();
   }
 

src/app/products/share-products/share-product-stepper/share-product-market-price-step/share-product-market-price-step.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, FormArray } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormArray } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { TooltipPosition } from '@angular/material/tooltip';
 
@@ -24,7 +24,7 @@ export class ShareProductMarketPriceStepComponent implements OnInit {
 
   @Input() shareProductsTemplate: any;
 
-  shareProductMarketPriceForm: FormGroup;
+  shareProductMarketPriceForm: UntypedFormGroup;
 
   /** For displaying required columns */
   displayedColumns: string[] = ['fromDate', 'shareValue', 'actions'];
@@ -35,7 +35,7 @@ export class ShareProductMarketPriceStepComponent implements OnInit {
    * @param {SettingsService} settingsService Settings Service
    */
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               public dialog: MatDialog,
               private dateUtils: Dates,
               private settingsService: SettingsService) {
@@ -54,8 +54,8 @@ export class ShareProductMarketPriceStepComponent implements OnInit {
     });
   }
 
-  get marketPricePeriods(): FormArray {
-    return this.shareProductMarketPriceForm.get('marketPricePeriods') as FormArray;
+  get marketPricePeriods(): UntypedFormArray {
+    return this.shareProductMarketPriceForm.get('marketPricePeriods') as UntypedFormArray;
   }
 
   setShareProductMarketPriceFormDirty() {

src/app/products/share-products/share-product-stepper/share-product-settings-step/share-product-settings-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, FormControl, Validators } from '@angular/forms';
 import { TooltipPosition } from '@angular/material/tooltip';
 
 @Component({
@@ -11,12 +11,12 @@ export class ShareProductSettingsStepComponent implements OnInit {
 
   @Input() shareProductsTemplate: any;
 
-  shareProductSettingsForm: FormGroup;
+  shareProductSettingsForm: UntypedFormGroup;
 
   minimumActivePeriodFrequencyTypeData: any;
   lockinPeriodFrequencyTypeData: any;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createShareProductSettingsForm();
   }
 

src/app/products/share-products/share-product-stepper/share-product-terms-step/share-product-terms-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 import { combineLatest } from 'rxjs';
 import { TooltipPosition } from '@angular/material/tooltip';
 
@@ -12,9 +12,9 @@ export class ShareProductTermsStepComponent implements OnInit {
 
   @Input() shareProductsTemplate: any;
 
-  shareProductTermsForm: FormGroup;
+  shareProductTermsForm: UntypedFormGroup;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.createShareProductTermsForm();
   }