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/savings/saving-account-actions/activate-savings-account/activate-savings-account.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';
 
@@ -23,7 +23,7 @@ export class ActivateSavingsAccountComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Activate Savings Account form. */
-  activateSavingsAccountForm: FormGroup;
+  activateSavingsAccountForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
 
@@ -35,7 +35,7 @@ export class ActivateSavingsAccountComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.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 AddChargeSavingsAccountComponent implements OnInit {
   /** Maximum Due Date allowed. */
   maxDate = new Date();
   /** Add Savings Charge form. */
-  savingsChargeForm: FormGroup;
+  savingsChargeForm: UntypedFormGroup;
   /** savings charge options. */
   savingsChargeOptions: any;
   /** savings Id of the savings account. */
@@ -40,7 +40,7 @@ export class AddChargeSavingsAccountComponent implements OnInit {
    * @param {SavingsService} savingsService Savings Service
    * @param {SettingsService} settingsService Settings Service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private route: ActivatedRoute,
               private router: Router,
               private dateUtils: Dates,
@@ -73,17 +73,17 @@ export class AddChargeSavingsAccountComponent implements OnInit {
           this.chargeDetails.chargeTimeTypeAnnualOrMonth = true;
         }
         if (!this.chargeDetails.dueDateNotRequired && !this.chargeDetails.chargeTimeTypeAnnualOrMonth) {
-          this.savingsChargeForm.addControl('dueDate', new FormControl('', Validators.required));
+          this.savingsChargeForm.addControl('dueDate', new UntypedFormControl('', Validators.required));
         } else {
           this.savingsChargeForm.removeControl('dueDate');
         }
         if (!this.chargeDetails.dueDateNotRequired && this.chargeDetails.chargeTimeTypeAnnualOrMonth) {
-          this.savingsChargeForm.addControl('feeOnMonthDay', new FormControl('', Validators.required));
+          this.savingsChargeForm.addControl('feeOnMonthDay', new UntypedFormControl('', Validators.required));
         } else {
           this.savingsChargeForm.removeControl('feeOnMonthDay');
         }
         if (chargeTimeType.value === 'Monthly Fee') {
-          this.savingsChargeForm.addControl('feeInterval', new FormControl(data.feeInterval, Validators.required));
+          this.savingsChargeForm.addControl('feeInterval', new UntypedFormControl(data.feeInterval, Validators.required));
         } else {
           this.savingsChargeForm.removeControl('feeInterval');
         }

src/app/savings/saving-account-actions/apply-annual-fees-savings-account/apply-annual-fees-savings-account.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';
 
@@ -23,7 +23,7 @@ export class ApplyAnnualFeesSavingsAccountComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Apply annual fees form. */
-  applyAnnualFeesForm: FormGroup;
+  applyAnnualFeesForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
   /** Annual Fees charge Id */
@@ -39,7 +39,7 @@ export class ApplyAnnualFeesSavingsAccountComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.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';
 
@@ -23,7 +23,7 @@ export class ApproveSavingsAccountComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Approve Savings Account form. */
-  approveSavingsAccountForm: FormGroup;
+  approveSavingsAccountForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
 
@@ -35,7 +35,7 @@ export class ApproveSavingsAccountComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/savings/saving-account-actions/close-savings-account/close-savings-account.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 { ActivatedRoute, Router } from '@angular/router';
 import { Dates } from 'app/core/utils/dates';
 
@@ -23,7 +23,7 @@ export class CloseSavingsAccountComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Close Savings Account form. */
-  closeSavingsAccountForm: FormGroup;
+  closeSavingsAccountForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
   /** Flag to enable payment details fields. */
@@ -41,7 +41,7 @@ export class CloseSavingsAccountComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,
@@ -81,8 +81,8 @@ export class CloseSavingsAccountComponent implements OnInit {
   buildDependencies() {
     this.closeSavingsAccountForm.get('withdrawBalance').valueChanges.subscribe((value: boolean) => {
       if (value) {
-        this.closeSavingsAccountForm.addControl('amount', new FormControl({value: this.transactionAmount, disabled: true}));
-        this.closeSavingsAccountForm.addControl('paymentTypeId', new FormControl(''));
+        this.closeSavingsAccountForm.addControl('amount', new UntypedFormControl({value: this.transactionAmount, disabled: true}));
+        this.closeSavingsAccountForm.addControl('paymentTypeId', new UntypedFormControl(''));
       } else {
         this.closeSavingsAccountForm.removeControl('amount');
         this.closeSavingsAccountForm.removeControl('paymentTypeId');
@@ -96,11 +96,11 @@ export class CloseSavingsAccountComponent implements OnInit {
   addPaymentDetails() {
     this.addPaymentDetailsFlag = !this.addPaymentDetailsFlag;
     if (this.addPaymentDetailsFlag) {
-      this.closeSavingsAccountForm.addControl('accountNumber', new FormControl(''));
-      this.closeSavingsAccountForm.addControl('checkNumber', new FormControl(''));
-      this.closeSavingsAccountForm.addControl('routingCode', new FormControl(''));
-      this.closeSavingsAccountForm.addControl('receiptNumber', new FormControl(''));
-      this.closeSavingsAccountForm.addControl('bankNumber', new FormControl(''));
+      this.closeSavingsAccountForm.addControl('accountNumber', new UntypedFormControl(''));
+      this.closeSavingsAccountForm.addControl('checkNumber', new UntypedFormControl(''));
+      this.closeSavingsAccountForm.addControl('routingCode', new UntypedFormControl(''));
+      this.closeSavingsAccountForm.addControl('receiptNumber', new UntypedFormControl(''));
+      this.closeSavingsAccountForm.addControl('bankNumber', new UntypedFormControl(''));
     } else {
       this.closeSavingsAccountForm.removeControl('accountNumber');
       this.closeSavingsAccountForm.removeControl('checkNumber');

src/app/savings/saving-account-actions/manage-savings-account/manage-savings-account.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 { Dates } from 'app/core/utils/dates';
 import { SavingsService } from 'app/savings/savings.service';
@@ -18,7 +18,7 @@ export class ManageSavingsAccountComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Manage Savings Account form. */
-  manageSavingsAccountForm: FormGroup;
+  manageSavingsAccountForm: UntypedFormGroup;
   /** Savings Account Id */
   savingAccountId: string;
   transactionCommand: string;
@@ -40,7 +40,7 @@ export class ManageSavingsAccountComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     private savingsService: SavingsService,
     private dateUtils: Dates,
     private route: ActivatedRoute,

src/app/savings/saving-account-actions/post-interest-as-on-savings-account/post-interest-as-on-savings-account.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';
 
@@ -23,7 +23,7 @@ export class PostInterestAsOnSavingsAccountComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Post Interest Savings Account form. */
-  postInterestSavingsAccountForm: FormGroup;
+  postInterestSavingsAccountForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
 
@@ -35,7 +35,7 @@ export class PostInterestAsOnSavingsAccountComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/savings/saving-account-actions/reject-savings-account/reject-savings-account.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';
 
@@ -23,7 +23,7 @@ export class RejectSavingsAccountComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Reject Saving Account form. */
-  rejectSavingsAccountForm: FormGroup;
+  rejectSavingsAccountForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
 
@@ -35,7 +35,7 @@ export class RejectSavingsAccountComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/savings/saving-account-actions/savings-account-assign-staff/savings-account-assign-staff.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 { ActivatedRoute, Router } from '@angular/router';
 import { Dates } from 'app/core/utils/dates';
 
@@ -23,7 +23,7 @@ export class SavingsAccountAssignStaffComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Savings Account Assign Staff form. */
-  savingsAssignStaffForm: FormGroup;
+  savingsAssignStaffForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
   /** Field Officer Data */
@@ -39,7 +39,7 @@ export class SavingsAccountAssignStaffComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, Input, 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 */
@@ -25,7 +25,7 @@ export class SavingsAccountTransactionsComponent implements OnInit {
   /** Maximum Due Date allowed. */
   maxDate = new Date();
   /** Savings account transaction form. */
-  savingAccountTransactionForm: FormGroup;
+  savingAccountTransactionForm: UntypedFormGroup;
   /** savings account transaction payment options. */
   paymentTypeOptions: {
     id: number,
@@ -52,7 +52,7 @@ export class SavingsAccountTransactionsComponent implements OnInit {
    * @param {Router} router Router for navigation.
    * @param {SettingsService} settingsService Settings Service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private route: ActivatedRoute,
               private router: Router,
               private dateUtils: Dates,
@@ -92,11 +92,11 @@ export class SavingsAccountTransactionsComponent implements OnInit {
   addPaymentDetails() {
     this.addPaymentDetailsFlag = !this.addPaymentDetailsFlag;
     if (this.addPaymentDetailsFlag) {
-      this.savingAccountTransactionForm.addControl('accountNumber', new FormControl(''));
-      this.savingAccountTransactionForm.addControl('checkNumber', new FormControl(''));
-      this.savingAccountTransactionForm.addControl('routingCode', new FormControl(''));
-      this.savingAccountTransactionForm.addControl('receiptNumber', new FormControl(''));
-      this.savingAccountTransactionForm.addControl('bankNumber', new FormControl(''));
+      this.savingAccountTransactionForm.addControl('accountNumber', new UntypedFormControl(''));
+      this.savingAccountTransactionForm.addControl('checkNumber', new UntypedFormControl(''));
+      this.savingAccountTransactionForm.addControl('routingCode', new UntypedFormControl(''));
+      this.savingAccountTransactionForm.addControl('receiptNumber', new UntypedFormControl(''));
+      this.savingAccountTransactionForm.addControl('bankNumber', new UntypedFormControl(''));
     } else {
       this.savingAccountTransactionForm.removeControl('accountNumber');
       this.savingAccountTransactionForm.removeControl('checkNumber');

src/app/savings/saving-account-actions/savings-account-unassign-staff/savings-account-unassign-staff.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 { ActivatedRoute, Router } from '@angular/router';
 import { Dates } from 'app/core/utils/dates';
 
@@ -23,7 +23,7 @@ export class SavingsAccountUnassignStaffComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Savings Account Unassign Staff form. */
-  savingsUnassignStaffForm: FormGroup;
+  savingsUnassignStaffForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
 
@@ -35,7 +35,7 @@ export class SavingsAccountUnassignStaffComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-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 { SavingsService } from 'app/savings/savings.service';
 export class UndoApprovalSavingsAccountComponent implements OnInit {
 
   /** Undo Approval Savings Account form. */
-  undoApprovalSavingsAccountForm: FormGroup;
+  undoApprovalSavingsAccountForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
 
@@ -27,7 +27,7 @@ export class UndoApprovalSavingsAccountComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route
    * @param {Router} router Router
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private route: ActivatedRoute,
               private router: Router) {

src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.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';
 
@@ -23,7 +23,7 @@ export class WithdrawByClientSavingsAccountComponent implements OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Withdraw Savings Account form. */
-  withdrawSavingsAccountForm: FormGroup;
+  withdrawSavingsAccountForm: UntypedFormGroup;
   /** Savings Account Id */
   accountId: any;
 
@@ -35,7 +35,7 @@ export class WithdrawByClientSavingsAccountComponent implements OnInit {
    * @param {Router} router Router
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private dateUtils: Dates,
               private route: ActivatedRoute,

src/app/savings/savings-account-stepper/savings-account-charges-step/savings-account-charges-step.component.ts

@@ -1,7 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, OnChanges, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 
 /** Custom Dialogs */
 import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
@@ -28,7 +28,7 @@ export class SavingsAccountChargesStepComponent implements OnInit, OnChanges {
   /** Savings Account Template */
   @Input() savingsAccountTemplate: any;
   /** Currency Code */
-  @Input() currencyCode: FormControl;
+  @Input() currencyCode: UntypedFormControl;
   /** active Client Members in case of GSIM Account */
   @Input() activeClientMembers?: any;
 

src/app/savings/savings-account-stepper/savings-account-details-step/savings-account-details-step.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 
 /** Custom Services */
 import { SavingsService } from 'app/savings/savings.service';
@@ -30,7 +30,7 @@ export class SavingsAccountDetailsStepComponent implements OnInit {
   /** For edit savings form */
   isFieldOfficerPatched = false;
   /** Savings Account Details Form */
-  savingsAccountDetailsForm: FormGroup;
+  savingsAccountDetailsForm: UntypedFormGroup;
 
   savingsProductSelected = false;
 
@@ -43,7 +43,7 @@ export class SavingsAccountDetailsStepComponent implements OnInit {
    * @param {SavingsService} savingsService Savings Service.
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private savingsService: SavingsService,
               private settingsService: SettingsService) {
     this.createSavingsAccountDetailsForm();

src/app/savings/savings-account-stepper/savings-account-terms-step/savings-account-terms-step.component.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { Component, OnChanges, OnInit, Input } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormControl } from '@angular/forms';
 import { SettingsService } from 'app/settings/settings.service';
 
 /**
@@ -23,7 +23,7 @@ export class SavingsAccountTermsStepComponent implements OnChanges, OnInit {
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Savings Account Terms Form */
-  savingsAccountTermsForm: FormGroup;
+  savingsAccountTermsForm: UntypedFormGroup;
   /** Lockin Period Frequency Type Data */
   lockinPeriodFrequencyTypeData: any;
   /** Interest Compounding Period Type Data */
@@ -39,7 +39,7 @@ export class SavingsAccountTermsStepComponent implements OnChanges, OnInit {
    * @param {FormBuilder} formBuilder Form Builder
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
     private settingsService: SettingsService) {
     this.createSavingsAccountTermsForm();
     this.buildDependencies();
@@ -129,9 +129,9 @@ export class SavingsAccountTermsStepComponent implements OnChanges, OnInit {
   buildDependencies() {
     this.savingsAccountTermsForm.get('allowOverdraft').valueChanges.subscribe((allowOverdraft: any) => {
       if (allowOverdraft) {
-        this.savingsAccountTermsForm.addControl('minOverdraftForInterestCalculation', new FormControl(''));
-        this.savingsAccountTermsForm.addControl('nominalAnnualInterestRateOverdraft', new FormControl(''));
-        this.savingsAccountTermsForm.addControl('overdraftLimit', new FormControl(''));
+        this.savingsAccountTermsForm.addControl('minOverdraftForInterestCalculation', new UntypedFormControl(''));
+        this.savingsAccountTermsForm.addControl('nominalAnnualInterestRateOverdraft', new UntypedFormControl(''));
+        this.savingsAccountTermsForm.addControl('overdraftLimit', new UntypedFormControl(''));
       } else {
         this.savingsAccountTermsForm.removeControl('minOverdraftForInterestCalculation');
         this.savingsAccountTermsForm.removeControl('nominalAnnualInterestRateOverdraft');

src/app/savings/savings-account-view/transactions-tab/export-transactions/export-transactions.component.ts

@@ -1,7 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
-import { FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormBuilder, Validators } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 
 /** Custom Services */
@@ -43,7 +43,7 @@ export class ExportTransactionsComponent implements OnInit {
    */
   constructor(private sanitizer: DomSanitizer,
               private reportsService: ReportsService,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private dateUtils: Dates,
               private route: ActivatedRoute,
               private settingsService: SettingsService) {

src/app/savings/savings-account-view/transactions/edit-transaction/edit-transaction.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';
 import { Dates } from 'app/core/utils/dates';
 
@@ -23,7 +23,7 @@ export class EditTransactionComponent implements OnInit {
   /** Maximum Due Date allowed. */
   maxDate = new Date();
   /** Savings account transaction form. */
-  editTransactionForm: FormGroup;
+  editTransactionForm: UntypedFormGroup;
   /** savings account transaction payment options. */
   paymentTypeOptions: {
     id: number,
@@ -48,7 +48,7 @@ export class EditTransactionComponent implements OnInit {
    * @param {Router} router Router for navigation.
    * @param {SettingsService} settingsService Setting service
    */
-  constructor(private formBuilder: FormBuilder,
+  constructor(private formBuilder: UntypedFormBuilder,
               private route: ActivatedRoute,
               private router: Router,
               private dateUtils: Dates,
@@ -91,11 +91,11 @@ export class EditTransactionComponent implements OnInit {
   addPaymentDetails() {
     this.showPaymentDetails = !this.showPaymentDetails;
     if (this.showPaymentDetails) {
-      this.editTransactionForm.addControl('accountNumber', new FormControl(''));
-      this.editTransactionForm.addControl('checkNumber', new FormControl(''));
-      this.editTransactionForm.addControl('routingCode', new FormControl(''));
-      this.editTransactionForm.addControl('receiptNumber', new FormControl(''));
-      this.editTransactionForm.addControl('bankNumber', new FormControl(''));
+      this.editTransactionForm.addControl('accountNumber', new UntypedFormControl(''));
+      this.editTransactionForm.addControl('checkNumber', new UntypedFormControl(''));
+      this.editTransactionForm.addControl('routingCode', new UntypedFormControl(''));
+      this.editTransactionForm.addControl('receiptNumber', new UntypedFormControl(''));
+      this.editTransactionForm.addControl('bankNumber', new UntypedFormControl(''));
     } else {
       this.editTransactionForm.removeControl('accountNumber');
       this.editTransactionForm.removeControl('checkNumber');