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/clients/client-stepper/client-datatable-step/client-datatable-step.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { Datatables } from 'app/core/utils/datatables';
 import { SettingsService } from 'app/settings/settings.service';
 
@@ -12,11 +12,11 @@ export class ClientDatatableStepComponent implements OnInit {
   /** Input Fields Data */
   @Input() datatableData: any;
   /** Create Input Form */
-  datatableForm: FormGroup;
+  datatableForm: UntypedFormGroup;
 
   datatableInputs: any = [];
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     private settingsService: SettingsService,
     private datatableService: Datatables) { }
 
@@ -27,12 +27,12 @@ export class ClientDatatableStepComponent implements OnInit {
       input.controlName = this.getInputName(input);
       if (!input.isColumnNullable) {
         if (this.isNumeric(input.columnDisplayType)) {
-          inputItems[input.controlName] = new FormControl(0, [Validators.required]);
+          inputItems[input.controlName] = new UntypedFormControl(0, [Validators.required]);
         } else {
-          inputItems[input.controlName] = new FormControl('', [Validators.required]);
+          inputItems[input.controlName] = new UntypedFormControl('', [Validators.required]);
         }
       } else {
-        inputItems[input.controlName] = new FormControl('');
+        inputItems[input.controlName] = new UntypedFormControl('');
       }
     });
     this.datatableForm = this.formBuilder.group(inputItems);

src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.ts

@@ -1,7 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Inject } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 
 /** Custom Services */
 import { SettingsService } from 'app/settings/settings.service';
@@ -21,7 +21,7 @@ export class ClientFamilyMemberDialogComponent implements OnInit {
   maxDate = new Date();
 
   /** Add/Edit family member form. */
-  familyMemberForm: FormGroup;
+  familyMemberForm: UntypedFormGroup;
 
   /**
    * @param {MatDialogRef} dialogRef Client Family Member Dialog Reference
@@ -31,7 +31,7 @@ export class ClientFamilyMemberDialogComponent implements OnInit {
    * @param {SettingsService} settingsService Setting service
    */
   constructor(public dialogRef: MatDialogRef<ClientFamilyMemberDialogComponent>,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private dateUtils: Dates,
               @Inject(MAT_DIALOG_DATA) public data: any,
               private settingsService: SettingsService) { }

src/app/clients/client-stepper/client-general-step/client-general-step.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators, UntypedFormControl } from '@angular/forms';
 import { ClientsService } from 'app/clients/clients.service';
 import { Dates } from 'app/core/utils/dates';
 
@@ -27,7 +27,7 @@ export class ClientGeneralStepComponent implements OnInit {
   /** Client Template */
   @Input() clientTemplate: any;
   /** Create Client Form */
-  createClientForm: FormGroup;
+  createClientForm: UntypedFormGroup;
 
   /** Office Options */
   officeOptions: any;
@@ -54,7 +54,7 @@ export class ClientGeneralStepComponent implements OnInit {
    * @param {SettingsService} settingsService Setting service
    * @param {ClientsService} clientService Client service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private dateUtils: Dates,
               private settingsService: SettingsService,
               private clientService: ClientsService) {
@@ -114,14 +114,14 @@ export class ClientGeneralStepComponent implements OnInit {
       if (legalFormId === 1) {
         this.createClientForm.removeControl('fullname');
         this.createClientForm.removeControl('clientNonPersonDetails');
-        this.createClientForm.addControl('firstname', new FormControl('', [Validators.required, Validators.pattern('(^[A-z]).*')]));
-        this.createClientForm.addControl('middlename', new FormControl('', Validators.pattern('(^[A-z]).*')));
-        this.createClientForm.addControl('lastname', new FormControl('', [Validators.required, Validators.pattern('(^[A-z]).*')]));
+        this.createClientForm.addControl('firstname', new UntypedFormControl('', [Validators.required, Validators.pattern('(^[A-z]).*')]));
+        this.createClientForm.addControl('middlename', new UntypedFormControl('', Validators.pattern('(^[A-z]).*')));
+        this.createClientForm.addControl('lastname', new UntypedFormControl('', [Validators.required, Validators.pattern('(^[A-z]).*')]));
       } else {
         this.createClientForm.removeControl('firstname');
         this.createClientForm.removeControl('middlename');
         this.createClientForm.removeControl('lastname');
-        this.createClientForm.addControl('fullname', new FormControl('', [Validators.required, Validators.pattern('(^[A-z]).*')]));
+        this.createClientForm.addControl('fullname', new UntypedFormControl('', [Validators.required, Validators.pattern('(^[A-z]).*')]));
         this.createClientForm.addControl('clientNonPersonDetails', this.formBuilder.group({
           'constitutionId': ['', Validators.required],
           'incorpValidityTillDate': [''],
@@ -134,14 +134,14 @@ export class ClientGeneralStepComponent implements OnInit {
     this.createClientForm.get('legalFormId').patchValue(1);
     this.createClientForm.get('active').valueChanges.subscribe((active: boolean) => {
       if (active) {
-        this.createClientForm.addControl('activationDate', new FormControl('', Validators.required));
+        this.createClientForm.addControl('activationDate', new UntypedFormControl('', Validators.required));
       } else {
         this.createClientForm.removeControl('activationDate');
       }
     });
     this.createClientForm.get('addSavings').valueChanges.subscribe((active: boolean) => {
       if (active) {
-        this.createClientForm.addControl('savingsProductId', new FormControl('', Validators.required));
+        this.createClientForm.addControl('savingsProductId', new UntypedFormControl('', Validators.required));
       } else {
         this.createClientForm.removeControl('savingsProductId');
       }

src/app/clients/clients-routing.module.ts

@@ -1,4 +1,4 @@
-import { NgModule, Component } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 /** Routing Imports */

src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormBuilder, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services. */
@@ -35,7 +35,7 @@ export class ClientPayChargesComponent implements OnInit {
      */
   constructor(
     private clientsService: ClientsService,
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private route: ActivatedRoute,
     private router: Router,
     private dateUtils: Dates,

src/app/clients/clients-view/client-actions/accept-client-transfer/accept-client-transfer.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
@@ -19,7 +19,7 @@ import { SettingsService } from 'app/settings/settings.service';
 export class AcceptClientTransferComponent implements OnInit {
 
   /** Accept Client Transfer form. */
-  acceptClientTransferForm: FormGroup;
+  acceptClientTransferForm: UntypedFormGroup;
   /** Client Id */
   clientId: any;
   /** Transfer Date */
@@ -33,7 +33,7 @@ export class AcceptClientTransferComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route
    * @param {Router} router Router
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private settingsService: SettingsService,
               private dateUtils: Dates,

src/app/clients/clients-view/client-actions/activate-client/activate-client.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 */
@@ -23,7 +23,7 @@ export class ActivateClientComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Activate client form. */
-  activateClientForm: FormGroup;
+  activateClientForm: UntypedFormGroup;
   /** Client Id */
   clientId: any;
 
@@ -35,7 +35,7 @@ export class ActivateClientComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Settings Service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.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 AddClientChargeComponent implements OnInit {
   /** Maximum Due Date allowed. */
   maxDate = new Date();
   /** Add Clients Charge form. */
-  clientChargeForm: FormGroup;
+  clientChargeForm: UntypedFormGroup;
   /** clients charge options. */
   clientChargeOptions: any;
   /** clients Id */
@@ -41,7 +41,7 @@ export class AddClientChargeComponent implements OnInit {
    * @param {SettingsService} settingsService Setting service
    */
   constructor(
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private route: ActivatedRoute,
     private router: Router,
     private dateUtils: Dates,
@@ -75,17 +75,17 @@ export class AddClientChargeComponent implements OnInit {
           this.chargeDetails.chargeTimeTypeAnnualOrMonth = true;
         }
         if (!this.chargeDetails.dueDateNotRequired && !this.chargeDetails.chargeTimeTypeAnnualOrMonth) {
-          this.clientChargeForm.addControl('dueDate', new FormControl('', Validators.required));
+          this.clientChargeForm.addControl('dueDate', new UntypedFormControl('', Validators.required));
         } else {
           this.clientChargeForm.removeControl('dueDate');
         }
         if (!this.chargeDetails.dueDateNotRequired && this.chargeDetails.chargeTimeTypeAnnualOrMonth) {
-          this.clientChargeForm.addControl('feeOnMonthDay', new FormControl('', Validators.required));
+          this.clientChargeForm.addControl('feeOnMonthDay', new UntypedFormControl('', Validators.required));
         } else {
           this.clientChargeForm.removeControl('feeOnMonthDay');
         }
         if (chargeTimeType.value === 'Monthly Fee') {
-          this.clientChargeForm.addControl('feeInterval', new FormControl(data.feeInterval, Validators.required));
+          this.clientChargeForm.addControl('feeInterval', new UntypedFormControl(data.feeInterval, Validators.required));
         } else {
           this.clientChargeForm.removeControl('feeInterval');
         }

src/app/clients/clients-view/client-actions/add-client-collateral/add-client-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';
 
 /**
@@ -18,7 +18,7 @@ import { SettingsService } from 'app/settings/settings.service';
 export class AddClientCollateralComponent implements OnInit {
 
   /** Client Collateral Form */
-  clientCollateralForm: FormGroup;
+  clientCollateralForm: UntypedFormGroup;
   /** Client Collateral Options */
   clientCollateralOptions: any;
   /** Client Id */
@@ -34,7 +34,7 @@ export class AddClientCollateralComponent implements OnInit {
    * @param {ProductsService} productsService Products Service
    */
   constructor(
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private route: ActivatedRoute,
     private router: Router,
     private productsService: ProductsService,

src/app/clients/clients-view/client-actions/client-assign-staff/client-assign-staff.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
@@ -17,7 +17,7 @@ import { ClientsService } from 'app/clients/clients.service';
 export class ClientAssignStaffComponent implements OnInit {
 
   /** Client Assign Staff form. */
-  clientAssignStaffForm: FormGroup;
+  clientAssignStaffForm: UntypedFormGroup;
   /** Staff Data */
   staffData: any;
   /** Client Data */
@@ -30,7 +30,7 @@ export class ClientAssignStaffComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route
    * @param {Router} router Router
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private route: ActivatedRoute,
               private router: Router) {

src/app/clients/clients-view/client-actions/client-screen-reports/client-screen-reports.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit, Renderer2, ViewChild, ElementRef, SecurityContext } from '@angular/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
@@ -18,7 +18,7 @@ import { DomSanitizer } from '@angular/platform-browser';
 export class ClientScreenReportsComponent implements OnInit {
 
   /** Client Screen Reportform. */
-  clientScreenReportForm: FormGroup;
+  clientScreenReportForm: UntypedFormGroup;
   /** Templates Data */
   templatesData: any;
   /** Client Id */
@@ -37,7 +37,7 @@ export class ClientScreenReportsComponent implements OnInit {
    * @param {DomSanitizer} sanitizer DOM Sanitizer
    * @param {Renderer2} renderer Renderer 2
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private route: ActivatedRoute,
               private sanitizer: DomSanitizer,

src/app/clients/clients-view/client-actions/close-client/close-client.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 */
@@ -23,7 +23,7 @@ export class CloseClientComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Close Client form. */
-  closeClientForm: FormGroup;
+  closeClientForm: UntypedFormGroup;
   /** Client Data */
   closureData: any;
   /** Client Id */
@@ -37,7 +37,7 @@ export class CloseClientComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/clients/clients-view/client-actions/create-self-service-user/create-self-service-user.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports. */
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, FormControl, Validators, AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, UntypedFormControl, Validators, AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
 
@@ -14,11 +14,11 @@ import { ClientsService } from 'app/clients/clients.service';
 })
 export class CreateSelfServiceUserComponent implements OnInit {
 
-  createSelfServiceForm: FormGroup;
+  createSelfServiceForm: UntypedFormGroup;
   clientData: any;
   hidePasswordField = true;
 
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private route: ActivatedRoute,
               private clientService: ClientsService,
               private router: Router) {
@@ -43,8 +43,8 @@ export class CreateSelfServiceUserComponent implements OnInit {
         this.createSelfServiceForm.removeControl('repeatPassword');
       } else {
         this.hidePasswordField = false;
-        this.createSelfServiceForm.addControl('password', new FormControl('', [Validators.required]));
-        this.createSelfServiceForm.addControl('repeatPassword', new FormControl('', [Validators.required, this.confirmPassword('password')]));
+        this.createSelfServiceForm.addControl('password', new UntypedFormControl('', [Validators.required]));
+        this.createSelfServiceForm.addControl('repeatPassword', new UntypedFormControl('', [Validators.required, this.confirmPassword('password')]));
       }
     });
   }
@@ -54,13 +54,13 @@ export class CreateSelfServiceUserComponent implements OnInit {
    */
   createSelfServiceUser() {
     this.createSelfServiceForm = this.formBuilder.group({
-      'username': new FormControl('', [Validators.required]),
-      'firstname': new FormControl(this.clientData.firstname, [Validators.required]),
-      'lastname': new FormControl(this.clientData.lastname, [Validators.required]),
-      'email': new FormControl('', [Validators.required, Validators.email]),
-      'sendPasswordToEmail': new FormControl(true),
-      'passwordNeverExpires': new FormControl(false),
-      'status': new FormControl({value: this.clientData.subStatus.active ? 'Active' : 'Inactive', disabled: true})
+      'username': new UntypedFormControl('', [Validators.required]),
+      'firstname': new UntypedFormControl(this.clientData.firstname, [Validators.required]),
+      'lastname': new UntypedFormControl(this.clientData.lastname, [Validators.required]),
+      'email': new UntypedFormControl('', [Validators.required, Validators.email]),
+      'sendPasswordToEmail': new UntypedFormControl(true),
+      'passwordNeverExpires': new UntypedFormControl(false),
+      'status': new UntypedFormControl({value: this.clientData.subStatus.active ? 'Active' : 'Inactive', disabled: true})
     });
   }
 

src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.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 */
@@ -23,7 +23,7 @@ export class ReactivateClientComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Reactivate client form. */
-  reactivateClientForm: FormGroup;
+  reactivateClientForm: UntypedFormGroup;
   /** Client Account Id */
   clientId: any;
 
@@ -35,7 +35,7 @@ export class ReactivateClientComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
@@ -19,7 +19,7 @@ import { SettingsService } from 'app/settings/settings.service';
 export class RejectClientTransferComponent implements OnInit {
 
   /** Reject Client Transfer form. */
-  rejectClientTransferForm: FormGroup;
+  rejectClientTransferForm: UntypedFormGroup;
   /** Client Id */
   clientId: any;
   /** Transfer Date */
@@ -31,7 +31,7 @@ export class RejectClientTransferComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route
    * @param {Router} router Router
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private settingsService: SettingsService,
               private dateUtils: Dates,

src/app/clients/clients-view/client-actions/reject-client/reject-client.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 */
@@ -23,7 +23,7 @@ export class RejectClientComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Reject Share Account form. */
-  rejectClientForm: FormGroup;
+  rejectClientForm: UntypedFormGroup;
   /** Client Data */
   rejectionData: any;
   /** Client Id */
@@ -37,7 +37,7 @@ export class RejectClientComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/clients/clients-view/client-actions/transfer-client/transfer-client.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 */
@@ -23,7 +23,7 @@ export class TransferClientComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Transfer Client form. */
-  transferClientForm: FormGroup;
+  transferClientForm: UntypedFormGroup;
   /** Client Data */
   officeData: any;
   /** Client Id */
@@ -37,7 +37,7 @@ export class TransferClientComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.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 */
@@ -23,7 +23,7 @@ export class UndoClientRejectionComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Undo Client Rejection form. */
-  undoClientRejectionForm: FormGroup;
+  undoClientRejectionForm: UntypedFormGroup;
   /** Client Id */
   clientId: any;
 
@@ -34,7 +34,7 @@ export class UndoClientRejectionComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route
    * @param {Router} router Router
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
@@ -19,7 +19,7 @@ import { SettingsService } from 'app/settings/settings.service';
 export class UndoClientTransferComponent implements OnInit {
 
   /** Undo Client Transfer form. */
-  undoClientTransferForm: FormGroup;
+  undoClientTransferForm: UntypedFormGroup;
   /** Client Id */
   clientId: any;
   /** Transfer Date */
@@ -31,7 +31,7 @@ export class UndoClientTransferComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route
    * @param {Router} router Router
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private settingsService: SettingsService,
               private dateUtils: Dates,

src/app/clients/clients-view/client-actions/update-client-savings-account/update-client-savings-account.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Services */
@@ -17,7 +17,7 @@ import { ClientsService } from 'app/clients/clients.service';
 export class UpdateClientSavingsAccountComponent implements OnInit {
 
   /** Client Update Savings Account form. */
-  clientSavingsAccountForm: FormGroup;
+  clientSavingsAccountForm: UntypedFormGroup;
   /** Savings Accounts Data */
   savingsAccounts: any;
   /** Client Data */
@@ -30,7 +30,7 @@ export class UpdateClientSavingsAccountComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route
    * @param {Router} router Router
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private route: ActivatedRoute,
               private router: Router) {

src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.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 */
@@ -23,7 +23,7 @@ export class WithdrawClientComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Withdraw Client form. */
-  withdrawClientForm: FormGroup;
+  withdrawClientForm: UntypedFormGroup;
   /** Client Data */
   withdrawalData: any;
   /** Client Id */
@@ -37,7 +37,7 @@ export class WithdrawClientComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private clientsService: ClientsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/clients/clients-view/custom-dialogs/edit-notes-dialog/edit-notes-dialog.component.ts

@@ -1,7 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Inject } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 
 @Component({
   selector: 'mifosx-edit-notes-dialog',
@@ -9,10 +9,10 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
   styleUrls: ['./edit-notes-dialog.component.scss']
 })
 export class EditNotesDialogComponent implements OnInit {
-  noteForm: FormGroup;
+  noteForm: UntypedFormGroup;
 
   constructor(public dialogRef: MatDialogRef<EditNotesDialogComponent>,
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     @Inject(MAT_DIALOG_DATA) public data: any) { }
 
   ngOnInit() {

src/app/clients/clients-view/custom-dialogs/upload-document-dialog/upload-document-dialog.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, FormControl } from '@angular/forms';
 
 @Component({
   selector: 'mifosx-upload-document-dialog',
@@ -10,7 +10,7 @@ import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms'
 export class UploadDocumentDialogComponent implements OnInit {
 
   /** Upload Document form. */
-  uploadDocumentForm: FormGroup;
+  uploadDocumentForm: UntypedFormGroup;
   /** Upload Document Data */
   uploadDocumentData: any = [];
   /** Triggers description field */
@@ -24,7 +24,7 @@ export class UploadDocumentDialogComponent implements OnInit {
    * @param {any} data Dialog Data
    */
   constructor(public dialogRef: MatDialogRef<UploadDocumentDialogComponent>,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               @Inject(MAT_DIALOG_DATA) public data: any) {
     this.documentIdentifier = data.documentIdentifier;
     this.entityType = data.entityType;

src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.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 AddFamilyMemberComponent implements OnInit {
   /** Minimum age allowed is 0. */
   minAge = 0;
   /** Add family member form. */
-  addFamilyMemberForm: FormGroup;
+  addFamilyMemberForm: UntypedFormGroup;
   /** Add family member template. */
   addFamilyMemberTemplate: any;
   /** Client ID */
@@ -37,7 +37,7 @@ export class AddFamilyMemberComponent implements OnInit {
    * @param {ClientsService} clientsService Clients Service
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private dateUtils: Dates,
               private router: Router,
               private route: ActivatedRoute,

src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.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 */
@@ -22,7 +22,7 @@ export class EditFamilyMemberComponent implements OnInit {
   /** Maximum Due Date allowed. */
   maxDate = new Date();
   /** Add family member form. */
-  editFamilyMemberForm: FormGroup;
+  editFamilyMemberForm: UntypedFormGroup;
   /** Add family member template. */
   addFamilyMemberTemplate: any;
   /** Family Members Details */
@@ -36,7 +36,7 @@ export class EditFamilyMemberComponent implements OnInit {
    * @param {ClientsService} clientsService Clients Service
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private dateUtils: Dates,
               private router: Router,
               private route: ActivatedRoute,

src/app/clients/edit-client/edit-client.component.ts

@@ -1,7 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators, UntypedFormControl } from '@angular/forms';
 
 /** Custom Services */
 import { ClientsService } from '../clients.service';
@@ -26,7 +26,7 @@ export class EditClientComponent implements OnInit {
   /** Client Data and Template */
   clientDataAndTemplate: any;
   /** Edit Client Form */
-  editClientForm: FormGroup;
+  editClientForm: UntypedFormGroup;
 
   /** Office Options */
   officeOptions: any;
@@ -55,7 +55,7 @@ export class EditClientComponent implements OnInit {
    * @param {Dates} dateUtils Date Utils
    * @param {SettingsService} settingsService Settings Service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private route: ActivatedRoute,
               private router: Router,
               private clientsService: ClientsService,
@@ -139,14 +139,14 @@ export class EditClientComponent implements OnInit {
       if (legalFormId === 1) {
         this.editClientForm.removeControl('fullname');
         this.editClientForm.removeControl('clientNonPersonDetails');
-        this.editClientForm.addControl('firstname', new FormControl(this.clientDataAndTemplate.firstname, Validators.required));
-        this.editClientForm.addControl('middlename', new FormControl(this.clientDataAndTemplate.middlename));
-        this.editClientForm.addControl('lastname', new FormControl(this.clientDataAndTemplate.lastname, Validators.required));
+        this.editClientForm.addControl('firstname', new UntypedFormControl(this.clientDataAndTemplate.firstname, Validators.required));
+        this.editClientForm.addControl('middlename', new UntypedFormControl(this.clientDataAndTemplate.middlename));
+        this.editClientForm.addControl('lastname', new UntypedFormControl(this.clientDataAndTemplate.lastname, Validators.required));
       } else {
         this.editClientForm.removeControl('firstname');
         this.editClientForm.removeControl('middlename');
         this.editClientForm.removeControl('lastname');
-        this.editClientForm.addControl('fullname', new FormControl(this.clientDataAndTemplate.fullname, Validators.required));
+        this.editClientForm.addControl('fullname', new UntypedFormControl(this.clientDataAndTemplate.fullname, Validators.required));
         this.editClientForm.addControl('clientNonPersonDetails', this.formBuilder.group({
           'constitutionId': [this.clientDataAndTemplate.clientNonPersonDetails.constitution && this.clientDataAndTemplate.clientNonPersonDetails.constitution.id, Validators.required],
           'incorpValidityTillDate': [this.clientDataAndTemplate.clientNonPersonDetails.incorpValidityTillDate && new Date(this.clientDataAndTemplate.clientNonPersonDetails.incorpValidityTillDate)],