taxtank-core 0.29.37 → 0.30.1

package/{fesm2015/taxtank-core.js → fesm2020/taxtank-core.mjs}

@@ -4,11 +4,11 @@ import * as i1$2 from '@angular/common';
 import { CommonModule, DatePipe } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
-import { map, mergeMap, filter, catchError, take, switchMap, finalize, first as first$1, skip, distinctUntilChanged, debounceTime } from 'rxjs/operators';
+import { map, mergeMap, filter, catchError, take, switchMap, finalize, first as first$1, skip, debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import { ReplaySubject, Subject, BehaviorSubject, throwError, Observable, of, combineLatest, forkJoin, from, merge as merge$1 } from 'rxjs';
 import { plainToClass, Type, Exclude, Transform, Expose, classToPlain } from 'class-transformer';
 import { JwtHelperService } from '@auth0/angular-jwt';
-import { __decorate, __awaiter } from 'tslib';
+import { __decorate } from 'tslib';
 import get from 'lodash/get';
 import last from 'lodash/last';
 import flatten from 'lodash/flatten';
@@ -16,13 +16,13 @@ import hasIn from 'lodash/hasIn';
 import first from 'lodash/first';
 import uniqBy from 'lodash/uniqBy';
 import differenceBy from 'lodash/differenceBy';
-import * as moment$1 from 'moment';
-import { DateRange, extendMoment } from 'moment-range';
+import * as moment from 'moment';
+import { DateRange } from 'moment-range';
 import compact from 'lodash/compact';
 import concat from 'lodash/concat';
 import intersection from 'lodash/intersection';
 import cloneDeep$1 from 'lodash/cloneDeep';
-import { Validators, FormGroup, FormControl, FormArray } from '@angular/forms';
+import { Validators, UntypedFormGroup, UntypedFormControl, UntypedFormArray, FormArray, FormGroup, FormControl } from '@angular/forms';
 import clone from 'lodash/clone';
 import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource.min.js';
 import { throwError as throwError$1 } from 'rxjs/internal/observable/throwError';
@@ -73,9 +73,9 @@ class CorelogicService {
         }));
     }
 }
-CorelogicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: CorelogicService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-CorelogicService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: CorelogicService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: CorelogicService, decorators: [{
+CorelogicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: CorelogicService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+CorelogicService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: CorelogicService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: CorelogicService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -115,9 +115,9 @@ class CorelogicInterceptor {
         });
     }
 }
-CorelogicInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: CorelogicInterceptor, deps: [{ token: CorelogicService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-CorelogicInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: CorelogicInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: CorelogicInterceptor, decorators: [{
+CorelogicInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: CorelogicInterceptor, deps: [{ token: CorelogicService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+CorelogicInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: CorelogicInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: CorelogicInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: CorelogicService }, { type: undefined, decorators: [{
                     type: Inject,
@@ -154,9 +154,9 @@ class FinancialYearInterceptor {
         return next.handle(clonedReq);
     }
 }
-FinancialYearInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FinancialYearInterceptor, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-FinancialYearInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FinancialYearInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FinancialYearInterceptor, decorators: [{
+FinancialYearInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FinancialYearInterceptor, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+FinancialYearInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FinancialYearInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FinancialYearInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
@@ -170,11 +170,11 @@ class AbstractModel {
     }
 }
 
-class Address$1 extends AbstractModel {
-}
+let Address$1 = class Address extends AbstractModel {
+};
 
-class Country$1 extends AbstractModel {
-}
+let Country$1 = class Country extends AbstractModel {
+};
 
 class Country extends Country$1 {
     /**
@@ -267,8 +267,8 @@ class BasiqConfig {
     }
 }
 
-class BasiqJob$1 extends AbstractModel {
-}
+let BasiqJob$1 = class BasiqJob extends AbstractModel {
+};
 
 class BasiqJob extends BasiqJob$1 {
 }
@@ -297,8 +297,8 @@ __decorate([
 class BankAccountBalance extends AbstractModel {
 }
 
-class BankAccountProperty$1 extends AbstractModel {
-}
+let BankAccountProperty$1 = class BankAccountProperty extends AbstractModel {
+};
 
 /**
  * Model, which children should be listened via event dispatcher service ising automatic events
@@ -312,11 +312,11 @@ class ObservableModel extends AbstractModel {
     }
 }
 
-class BankAccount$1 extends ObservableModel {
-}
+let BankAccount$1 = class BankAccount extends ObservableModel {
+};
 
-class BankConnection$1 extends ObservableModel {
-}
+let BankConnection$1 = class BankConnection extends ObservableModel {
+};
 
 class BankTransactionImport extends AbstractModel {
 }
@@ -324,38 +324,38 @@ class BankTransactionImport extends AbstractModel {
 class BankTransactionRule extends AbstractModel {
 }
 
-class BankTransaction$1 extends ObservableModel {
-}
+let BankTransaction$1 = class BankTransaction extends ObservableModel {
+};
 
-class Bank$1 extends AbstractModel {
-}
+let Bank$1 = class Bank extends AbstractModel {
+};
 
 class FinancialDataSystem extends AbstractModel {
 }
 
-class ChartAccountsDepreciation$1 extends AbstractModel {
-}
+let ChartAccountsDepreciation$1 = class ChartAccountsDepreciation extends AbstractModel {
+};
 
-class ChartAccountsHeading$1 extends AbstractModel {
-}
+let ChartAccountsHeading$1 = class ChartAccountsHeading extends AbstractModel {
+};
 
-class ChartAccountsMetadata$1 extends AbstractModel {
-}
+let ChartAccountsMetadata$1 = class ChartAccountsMetadata extends AbstractModel {
+};
 
-class ChartAccountsValue$1 extends AbstractModel {
-}
+let ChartAccountsValue$1 = class ChartAccountsValue extends AbstractModel {
+};
 
-class ChartAccounts$1 extends AbstractModel {
-}
+let ChartAccounts$1 = class ChartAccounts extends AbstractModel {
+};
 
-class DepreciationCapitalProject$1 extends AbstractModel {
-}
+let DepreciationCapitalProject$1 = class DepreciationCapitalProject extends AbstractModel {
+};
 
-class DepreciationForecast$1 extends AbstractModel {
-}
+let DepreciationForecast$1 = class DepreciationForecast extends AbstractModel {
+};
 
-class DepreciationReceipt$1 extends AbstractModel {
-}
+let DepreciationReceipt$1 = class DepreciationReceipt extends AbstractModel {
+};
 
 var TankTypeEnum;
 (function (TankTypeEnum) {
@@ -395,10 +395,9 @@ class TransactionBase extends ObservableModel {
      * Check if current tank is Work
      */
     isWorkTank() {
-        var _a;
         // chart accounts may be empty for new instances
         if (this.chartAccounts) {
-            return CHART_ACCOUNTS_CATEGORIES.work.includes((_a = this.chartAccounts) === null || _a === void 0 ? void 0 : _a.category);
+            return CHART_ACCOUNTS_CATEGORIES.work.includes(this.chartAccounts?.category);
         }
         return !this.isPropertyTank() && !this.isSoleTank();
     }
@@ -406,10 +405,9 @@ class TransactionBase extends ObservableModel {
      * Check if current tank is Sole
      */
     isSoleTank() {
-        var _a;
         // chart accounts may be empty for new instances
         if (this.chartAccounts) {
-            return CHART_ACCOUNTS_CATEGORIES.sole.includes((_a = this.chartAccounts) === null || _a === void 0 ? void 0 : _a.category);
+            return CHART_ACCOUNTS_CATEGORIES.sole.includes(this.chartAccounts?.category);
         }
         return !!this.business;
     }
@@ -449,152 +447,152 @@ __decorate([
     Exclude()
 ], TransactionBase.prototype, "gstClaimAmount", null);
 
-class Depreciation$1 extends TransactionBase {
-}
+let Depreciation$1 = class Depreciation extends TransactionBase {
+};
 
 class DocumentBase extends AbstractModel {
 }
 
-class DocumentFolder$1 extends AbstractModel {
-}
+let DocumentFolder$1 = class DocumentFolder extends AbstractModel {
+};
 
-class Document$1 extends AbstractModel {
-}
+let Document$1 = class Document extends AbstractModel {
+};
 
-class PropertyDocument$1 extends AbstractModel {
+let PropertyDocument$1 = class PropertyDocument extends AbstractModel {
     getApiUrlPrefix() {
         return '';
     }
     getEntity() {
         return undefined;
     }
-}
+};
 
-class TaxReview$1 extends AbstractModel {
-}
+let TaxReview$1 = class TaxReview extends AbstractModel {
+};
 
 class Ticket extends AbstractModel {
 }
 
-class Chat$1 extends AbstractModel {
-}
+let Chat$1 = class Chat extends AbstractModel {
+};
 
-class ClientInvite$1 extends AbstractModel {
-}
+let ClientInvite$1 = class ClientInvite extends AbstractModel {
+};
 
-class ClientMovement$1 extends AbstractModel {
-}
+let ClientMovement$1 = class ClientMovement extends AbstractModel {
+};
 
-class EmployeeInvite$1 extends AbstractModel {
-}
+let EmployeeInvite$1 = class EmployeeInvite extends AbstractModel {
+};
 
 class FirmInvite extends AbstractModel {
 }
 
-class Firm$1 extends AbstractModel {
-}
+let Firm$1 = class Firm extends AbstractModel {
+};
 
-class MessageDocument$1 extends AbstractModel {
-}
+let MessageDocument$1 = class MessageDocument extends AbstractModel {
+};
 
-class Message$1 extends ObservableModel {
-}
+let Message$1 = class Message extends ObservableModel {
+};
 
-class IncomeSourceForecast$1 extends AbstractModel {
-}
+let IncomeSourceForecast$1 = class IncomeSourceForecast extends AbstractModel {
+};
 
-class IncomeSourceType$1 extends AbstractModel {
-}
+let IncomeSourceType$1 = class IncomeSourceType extends AbstractModel {
+};
 
-class IncomeSource$1 extends AbstractModel {
-}
+let IncomeSource$1 = class IncomeSource extends AbstractModel {
+};
 
-class SalaryForecast$1 extends AbstractModel {
-}
+let SalaryForecast$1 = class SalaryForecast extends AbstractModel {
+};
 
-class BorrowingExpenseLoan$1 extends AbstractModel {
-}
+let BorrowingExpenseLoan$1 = class BorrowingExpenseLoan extends AbstractModel {
+};
 
-class BorrowingExpense$1 extends AbstractModel {
-}
+let BorrowingExpense$1 = class BorrowingExpense extends AbstractModel {
+};
 
-class LoanPayout$1 extends ObservableModel {
-}
+let LoanPayout$1 = class LoanPayout extends ObservableModel {
+};
 
-class Loan$1 extends ObservableModel {
-}
+let Loan$1 = class Loan extends ObservableModel {
+};
 
-class PropertySaleTaxExemptionMetadata$1 extends AbstractModel {
-}
+let PropertySaleTaxExemptionMetadata$1 = class PropertySaleTaxExemptionMetadata extends AbstractModel {
+};
 
-class PropertySale$1 extends ObservableModel {
-}
+let PropertySale$1 = class PropertySale extends ObservableModel {
+};
 
-class TaxExemptionMetadata$1 extends AbstractModel {
-}
+let TaxExemptionMetadata$1 = class TaxExemptionMetadata extends AbstractModel {
+};
 
-class TaxExemption$1 extends AbstractModel {
-}
+let TaxExemption$1 = class TaxExemption extends AbstractModel {
+};
 
-class PropertyCategoryMovement$1 extends ObservableModel {
-}
+let PropertyCategoryMovement$1 = class PropertyCategoryMovement extends ObservableModel {
+};
 
-class PropertyCategory$1 extends ObservableModel {
-}
+let PropertyCategory$1 = class PropertyCategory extends ObservableModel {
+};
 
-class PropertyForecast$1 extends AbstractModel {
-}
+let PropertyForecast$1 = class PropertyForecast extends AbstractModel {
+};
 
-class PropertyShare$1 extends ObservableModel {
-}
+let PropertyShare$1 = class PropertyShare extends ObservableModel {
+};
 
-class PropertySubscription$1 extends AbstractModel {
-}
+let PropertySubscription$1 = class PropertySubscription extends AbstractModel {
+};
 
-class PropertyValuation$1 extends AbstractModel {
-}
+let PropertyValuation$1 = class PropertyValuation extends AbstractModel {
+};
 
-class Property$1 extends ObservableModel {
-}
+let Property$1 = class Property extends ObservableModel {
+};
 
-class BasReport$1 extends AbstractModel {
-}
+let BasReport$1 = class BasReport extends AbstractModel {
+};
 
-class SoleBusinessActivity$1 extends AbstractModel {
-}
+let SoleBusinessActivity$1 = class SoleBusinessActivity extends AbstractModel {
+};
 
-class SoleBusinessAllocation$1 extends AbstractModel {
-}
+let SoleBusinessAllocation$1 = class SoleBusinessAllocation extends AbstractModel {
+};
 
-class SoleBusinessLossOffsetRule$1 extends AbstractModel {
-}
+let SoleBusinessLossOffsetRule$1 = class SoleBusinessLossOffsetRule extends AbstractModel {
+};
 
-class SoleBusinessLoss$1 extends AbstractModel {
-}
+let SoleBusinessLoss$1 = class SoleBusinessLoss extends AbstractModel {
+};
 
-class SoleBusiness$1 extends AbstractModel {
-}
+let SoleBusiness$1 = class SoleBusiness extends AbstractModel {
+};
 
-class SoleContact$1 extends AbstractModel {
-}
+let SoleContact$1 = class SoleContact extends AbstractModel {
+};
 
-class SoleDepreciationMethod$1 extends AbstractModel {
-}
+let SoleDepreciationMethod$1 = class SoleDepreciationMethod extends AbstractModel {
+};
 
-class SoleDetails$1 extends AbstractModel {
-}
+let SoleDetails$1 = class SoleDetails extends AbstractModel {
+};
 
-class SoleForecast$1 extends AbstractModel {
-}
+let SoleForecast$1 = class SoleForecast extends AbstractModel {
+};
 
-class SoleInvoiceItem$1 extends AbstractModel {
-}
+let SoleInvoiceItem$1 = class SoleInvoiceItem extends AbstractModel {
+};
 
-class SoleInvoiceTemplate$1 extends AbstractModel {
-}
+let SoleInvoiceTemplate$1 = class SoleInvoiceTemplate extends AbstractModel {
+};
 
-class SoleInvoice$1 extends AbstractModel {
-}
+let SoleInvoice$1 = class SoleInvoice extends AbstractModel {
+};
 
 class SpareDocumentCategory extends AbstractModel {
 }
@@ -602,20 +600,20 @@ class SpareDocumentCategory extends AbstractModel {
 class SpareDocument extends AbstractModel {
 }
 
-class ServicePayment$1 extends AbstractModel {
-}
+let ServicePayment$1 = class ServicePayment extends AbstractModel {
+};
 
-class ServicePrice$1 extends AbstractModel {
-}
+let ServicePrice$1 = class ServicePrice extends AbstractModel {
+};
 
-class ServiceProduct$1 extends AbstractModel {
-}
+let ServiceProduct$1 = class ServiceProduct extends AbstractModel {
+};
 
-class ServiceSubscriptionItem$1 extends AbstractModel {
-}
+let ServiceSubscriptionItem$1 = class ServiceSubscriptionItem extends AbstractModel {
+};
 
-class ServiceSubscription$1 extends ObservableModel {
-}
+let ServiceSubscription$1 = class ServiceSubscription extends ObservableModel {
+};
 
 class TaxReturnCategory extends AbstractModel {
 }
@@ -623,65 +621,65 @@ class TaxReturnCategory extends AbstractModel {
 class TaxReturn extends AbstractModel {
 }
 
-class TransactionAllocation$1 extends AbstractModel {
-}
+let TransactionAllocation$1 = class TransactionAllocation extends AbstractModel {
+};
 
-class TransactionMetadata$1 extends AbstractModel {
-}
+let TransactionMetadata$1 = class TransactionMetadata extends AbstractModel {
+};
 
-class TransactionReceipt$1 extends AbstractModel {
-}
+let TransactionReceipt$1 = class TransactionReceipt extends AbstractModel {
+};
 
-class Transaction$1 extends TransactionBase {
-}
+let Transaction$1 = class Transaction extends TransactionBase {
+};
 
-class ClientDetails$1 extends AbstractModel {
-}
+let ClientDetails$1 = class ClientDetails extends AbstractModel {
+};
 
-class ClientIncomeTypes$1 extends ObservableModel {
-}
+let ClientIncomeTypes$1 = class ClientIncomeTypes extends ObservableModel {
+};
 
-class EmployeeDetails$1 extends AbstractModel {
-}
+let EmployeeDetails$1 = class EmployeeDetails extends AbstractModel {
+};
 
-class Occupation$1 extends AbstractModel {
-}
+let Occupation$1 = class Occupation extends AbstractModel {
+};
 
-class RegistrationInvite$1 extends AbstractModel {
-}
+let RegistrationInvite$1 = class RegistrationInvite extends AbstractModel {
+};
 
-class UserEventSetting$1 extends AbstractModel {
-}
+let UserEventSetting$1 = class UserEventSetting extends AbstractModel {
+};
 
-class UserEventTypeCategory$1 extends AbstractModel {
-}
+let UserEventTypeCategory$1 = class UserEventTypeCategory extends AbstractModel {
+};
 
-class UserEventType$1 extends AbstractModel {
-}
+let UserEventType$1 = class UserEventType extends AbstractModel {
+};
 
 class UserEvent extends AbstractModel {
 }
 
-class User$1 extends AbstractModel {
-}
+let User$1 = class User extends AbstractModel {
+};
 
-class VehicleClaimDetails$1 extends AbstractModel {
-}
+let VehicleClaimDetails$1 = class VehicleClaimDetails extends AbstractModel {
+};
 
-class VehicleClaim$1 extends AbstractModel {
-}
+let VehicleClaim$1 = class VehicleClaim extends AbstractModel {
+};
 
-class VehicleLogbook$1 extends AbstractModel {
-}
+let VehicleLogbook$1 = class VehicleLogbook extends AbstractModel {
+};
 
-class Vehicle$1 extends AbstractModel {
-}
+let Vehicle$1 = class Vehicle extends AbstractModel {
+};
 
-class File$1 extends AbstractModel {
-}
+let File$1 = class File extends AbstractModel {
+};
 
-class Phone$1 extends AbstractModel {
-}
+let Phone$1 = class Phone extends AbstractModel {
+};
 
 class ServiceNotification extends AbstractModel {
 }
@@ -1156,8 +1154,7 @@ class Collection {
         return this.items.find((model) => value === get(model, path));
     }
     findIndexBy(path, value) {
-        var _a;
-        return (_a = this.items.findIndex((item) => get(item, path) === value)) !== null && _a !== void 0 ? _a : null;
+        return this.items.findIndex((item) => get(item, path) === value) ?? null;
     }
     push(...items) {
         this.items.push(...items);
@@ -1565,14 +1562,14 @@ class LoanCollection extends Collection {
      * @param ids list of bank accounts ids for filter
      */
     getByBankAccountsIds(ids) {
-        return new LoanCollection(this.items.filter((loan) => { var _a; return ids.includes((_a = loan.bankAccount) === null || _a === void 0 ? void 0 : _a.id); }));
+        return new LoanCollection(this.items.filter((loan) => ids.includes(loan.bankAccount?.id)));
     }
     /**
      * Get single loan by bank account id
      * @param id id of bank account
      */
     getByBankAccountId(id) {
-        return this.items.find((loan) => { var _a; return ((_a = loan.bankAccount) === null || _a === void 0 ? void 0 : _a.id) === id; });
+        return this.items.find((loan) => loan.bankAccount?.id === id);
     }
     /**
      * Get list of current fin year payments grouped by loan id
@@ -1616,16 +1613,13 @@ var TaxExemptionMetadataEnum;
 
 class PropertySaleTaxExemptionMetadataCollection extends Collection {
     getPPRDays() {
-        var _a, _b;
-        return (_b = (_a = this.getByMetadataId(TaxExemptionMetadataEnum.PPR_DAYS)) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 0;
+        return this.getByMetadataId(TaxExemptionMetadataEnum.PPR_DAYS)?.value ?? 0;
     }
     getMarketValue() {
-        var _a, _b;
-        return (_b = (_a = this.getByMetadataId(TaxExemptionMetadataEnum.MARKET_VALUE)) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 0;
+        return this.getByMetadataId(TaxExemptionMetadataEnum.MARKET_VALUE)?.value ?? 0;
     }
     getClaimPercent() {
-        var _a, _b;
-        return (_b = (_a = this.getByMetadataId(TaxExemptionMetadataEnum.CLAIM_PERCENT)) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 100;
+        return this.getByMetadataId(TaxExemptionMetadataEnum.CLAIM_PERCENT)?.value ?? 100;
     }
     getByMetadataId(id) {
         return this.items.find((metadata) => metadata.metadata.id === id);
@@ -1768,8 +1762,7 @@ class PropertyShareCollection extends Collection {
      */
     getIncoming() {
         return this.filter((propertyShare) => {
-            var _a;
-            return ((_a = propertyShare.user) === null || _a === void 0 ? void 0 : _a.isLoggedIn()) && propertyShare.isPending() && propertyShare.property.user.id !== +localStorage.getItem('userId');
+            return propertyShare.user?.isLoggedIn() && propertyShare.isPending() && propertyShare.property.user.id !== +localStorage.getItem('userId');
         });
     }
     /**
@@ -1778,7 +1771,7 @@ class PropertyShareCollection extends Collection {
      * @TODO Alex: rename
      */
     getOutcoming() {
-        return this.filter((propertyShare) => { var _a; return !((_a = propertyShare.user) === null || _a === void 0 ? void 0 : _a.isLoggedIn()); });
+        return this.filter((propertyShare) => !propertyShare.user?.isLoggedIn());
     }
 }
 
@@ -2104,7 +2097,7 @@ class DepreciationForecast extends DepreciationForecast$1 {
         return this.claimAmount / this.daysApplied;
     }
     get daysApplied() {
-        return moment$1(this.toDate).diff(moment$1(this.fromDate), 'days');
+        return moment(this.toDate).diff(moment(this.fromDate), 'days');
     }
     getDaysByMonth(month) {
         // @TODO find a better place
@@ -2433,8 +2426,7 @@ class ChartAccounts extends ChartAccounts$1 {
         return this.category === ChartAccountsCategoryEnum.WORK_INCOME;
     }
     isVehicleExpense() {
-        var _a;
-        return !!ChartAccountsHeadingVehicleListEnum[(_a = this.heading) === null || _a === void 0 ? void 0 : _a.id];
+        return !!ChartAccountsHeadingVehicleListEnum[this.heading?.id];
     }
     /**
      * Check if chart accounts is other income
@@ -2513,7 +2505,6 @@ class ChartAccounts extends ChartAccounts$1 {
      * tax type depends on chart account heading or category.
      */
     getTaxLabel() {
-        var _a, _b;
         // get simple array of ids from enum with taxable chart accounts headings
         const taxableCAHeadingsIds = enumToList(ChartAccountsHeadingTaxableEnum)
             .map((item) => item.value);
@@ -2523,9 +2514,9 @@ class ChartAccounts extends ChartAccounts$1 {
         // check if one of ids arrays includes current chart accounts heading id and set tax label
         // otherwise label is empty for this class
         switch (true) {
-            case taxableCAHeadingsIds.includes((_a = this.heading) === null || _a === void 0 ? void 0 : _a.id):
+            case taxableCAHeadingsIds.includes(this.heading?.id):
                 return ChartAccountsTaxLabelsEnum.TAX_PAID;
-            case deductibleCAHeadingsIds.includes((_b = this.heading) === null || _b === void 0 ? void 0 : _b.id):
+            case deductibleCAHeadingsIds.includes(this.heading?.id):
                 return ChartAccountsTaxLabelsEnum.TAX_DEDUCTED;
             case CHART_ACCOUNTS_CATEGORIES.workIncome.includes(this.category):
                 return ChartAccountsTaxLabelsEnum.TAX_WITHHELD;
@@ -3220,8 +3211,6 @@ __decorate([
     Type(() => Date)
 ], LogbookPeriod.prototype, "to", void 0);
 
-// problem with DateRange and typescript. See more https://github.com/rotaready/moment-range/issues/263
-const moment = extendMoment(moment$1);
 class VehicleLogbook extends VehicleLogbook$1 {
     get kilometers() {
         return this.odometerEnd - this.odometerStart;
@@ -3239,7 +3228,12 @@ class VehicleLogbook extends VehicleLogbook$1 {
      * Get logbook period date range from logbook date and weeksInPeriod duration
      */
     getPeriod() {
-        return moment.rangeFromInterval('milliseconds', VehicleLogbook.bestPeriodDuration, this.date);
+        /**
+         * Hack: The library is using not by documentation, but works
+         * moment-range is broken since we updated Typescript to v4 (https://github.com/rotaready/moment-range/issues/238)
+         * extendMoment(Moment) cause error and broke the app
+         */
+        return new DateRange([this.date, new Date(this.date.getTime() + VehicleLogbook.bestPeriodDuration)]);
     }
 }
 /**
@@ -3458,8 +3452,7 @@ class Transaction extends Transaction$1 {
         this.amount = 0;
     }
     get invoiceId() {
-        var _a;
-        return (_a = this.soleInvoiceItem) === null || _a === void 0 ? void 0 : _a.invoice.id;
+        return this.soleInvoiceItem?.invoice.id;
     }
     isDebit() {
         return this.type === TransactionTypeEnum.DEBIT;
@@ -3554,10 +3547,9 @@ class Transaction extends Transaction$1 {
      * @Todo modify 'metadata' property from array to Collection
      */
     getMetadataFieldValue(field) {
-        var _a;
-        return +((_a = this.metadata.find((transactionMetadata) => {
+        return +this.metadata.find((transactionMetadata) => {
             return transactionMetadata.chartAccountsMetadata.id === field;
-        })) === null || _a === void 0 ? void 0 : _a.value) || 0;
+        })?.value || 0;
     }
     isCash() {
         return this.source === TransactionSourceEnum.CASH;
@@ -3606,7 +3598,7 @@ class Transaction extends Transaction$1 {
         }
         // salary included transactions affect parent transaction amount and as a result grossAmount, skip to avoid double sum
         grossAmount += new Collection(this.transactions)
-            .filter((t) => { var _a; return !((_a = t.chartAccounts) === null || _a === void 0 ? void 0 : _a.isSalaryIncluded()); })
+            .filter((t) => !t.chartAccounts?.isSalaryIncluded())
             .sumBy('amount', true);
         if (this.isWorkTank()) {
             grossAmount += this.frankingCredit - this.taxFreeComponent - this.eligibleForReduction;
@@ -3620,7 +3612,7 @@ class Transaction extends Transaction$1 {
      */
     get netAmount() {
         return new Collection(this.transactions)
-            .filter((t) => { var _a; return (_a = t.chartAccounts) === null || _a === void 0 ? void 0 : _a.isSalaryIncluded(); })
+            .filter((t) => t.chartAccounts?.isSalaryIncluded())
             .sumBy('amount') + this.amountWithGst;
     }
     /**
@@ -3628,8 +3620,7 @@ class Transaction extends Transaction$1 {
      * user's choice and transform amount, but there are exceptions like advance (negative or positive amount)
      */
     ignoreSign() {
-        var _a;
-        return !(((_a = this.chartAccounts) === null || _a === void 0 ? void 0 : _a.id) in ChartAccountsKeepSign);
+        return !(this.chartAccounts?.id in ChartAccountsKeepSign);
     }
 }
 __decorate([
@@ -3725,18 +3716,16 @@ class Depreciation extends Depreciation$1 {
         return this.writeOffYear === new FinancialYear().year;
     }
     get writeOffYear() {
-        var _a;
         if (!this.writeOffManualDate && !this.writeOffDate) {
             return null;
         }
-        return (_a = new FinancialYear(this.writeOffManualDate || this.writeOffDate)) === null || _a === void 0 ? void 0 : _a.year;
+        return new FinancialYear(this.writeOffManualDate || this.writeOffDate)?.year;
     }
     /**
      * Check if depreciation chart accounts heading related to vehicles category
      */
     isVehicleDepreciation() {
-        var _a;
-        return ((_a = this.chartAccounts.heading) === null || _a === void 0 ? void 0 : _a.id) === ChartAccountsHeadingVehicleListEnum.DEPRECIATION_VEHICLES;
+        return this.chartAccounts.heading?.id === ChartAccountsHeadingVehicleListEnum.DEPRECIATION_VEHICLES;
     }
     /**
      * Get depreciation purchase date
@@ -3764,12 +3753,10 @@ class Depreciation extends Depreciation$1 {
         });
     }
     getClaimAmountByYear(year) {
-        var _a;
-        return ((_a = this.getForecastByYear(year)) === null || _a === void 0 ? void 0 : _a.claimAmount) || 0;
+        return this.getForecastByYear(year)?.claimAmount || 0;
     }
     getCloseBalanceByYear(year) {
-        var _a;
-        return ((_a = this.getForecastByYear(year)) === null || _a === void 0 ? void 0 : _a.closeBalance) || 0;
+        return this.getForecastByYear(year)?.closeBalance || 0;
     }
     isBuildingAtCost() {
         return this.chartAccounts.id === ChartAccountsListEnum.BUILDING_AT_COST;
@@ -3778,18 +3765,16 @@ class Depreciation extends Depreciation$1 {
      * Create a new transaction from current depreciation
      */
     toTransaction(params = {}) {
-        var _a, _b;
         return plainToClass(Transaction, Object.assign(params, this, {
-            amount: -((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.amount) || 0,
-            claimAmount: -((_b = this.currentYearForecast) === null || _b === void 0 ? void 0 : _b.claimAmount) || 0,
+            amount: -this.currentYearForecast?.amount || 0,
+            claimAmount: -this.currentYearForecast?.claimAmount || 0,
         }));
     }
     /**
      * @TODO Michael: remove and check everywhere in reports
      */
     get claimAmount() {
-        var _a;
-        return ((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.claimAmount) || 0;
+        return this.currentYearForecast?.claimAmount || 0;
     }
     get amountWithGst() {
         // gst applies only to new assets
@@ -3799,8 +3784,7 @@ class Depreciation extends Depreciation$1 {
         return this.amount;
     }
     get gstClaimAmount() {
-        var _a;
-        return this.gstAmount * ((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.claimRate);
+        return this.gstAmount * this.currentYearForecast?.claimRate;
     }
     /**
      * assets purchased in the current financial year
@@ -3978,8 +3962,7 @@ class TransactionCollection extends ExportableCollection {
      */
     getByPropertiesIds(ids) {
         return new TransactionCollection(this.items.filter((transaction) => {
-            var _a;
-            return ids.includes((_a = transaction.property) === null || _a === void 0 ? void 0 : _a.id);
+            return ids.includes(transaction.property?.id);
         }));
     }
     /**
@@ -3987,7 +3970,7 @@ class TransactionCollection extends ExportableCollection {
      * @param id id of income source for filter
      */
     getByIncomeSourceId(id) {
-        return new TransactionCollection(this.items.filter((transaction) => { var _a; return ((_a = transaction.incomeSource) === null || _a === void 0 ? void 0 : _a.id) === id; }));
+        return new TransactionCollection(this.items.filter((transaction) => transaction.incomeSource?.id === id));
     }
     /**
      * Get new collection filtered by chart accounts category
@@ -4204,7 +4187,7 @@ class DepreciationCollection extends Collection {
         return this.sumBy('currentYearForecast.closeBalance');
     }
     getByPropertiesIds(ids) {
-        return new DepreciationCollection(this.items.filter((depreciation) => { var _a; return ids.includes((_a = depreciation.property) === null || _a === void 0 ? void 0 : _a.id); }));
+        return new DepreciationCollection(this.items.filter((depreciation) => ids.includes(depreciation.property?.id)));
     }
     getWithCapitalProject() {
         return new DepreciationCollection(this.items.filter((depreciation) => !!depreciation.depreciationCapitalProject));
@@ -4507,9 +4490,9 @@ class SoleBusinessLossesCollection extends Collection {
         const claimAmountsByBusinessId = this.getClaimAmountsByBusinessId(transactions, allocations);
         return Object.keys(claimAmountsByBusinessId.items).reduce((sum, businessId) => {
             const loss = this.findBy('business.id', +businessId);
-            const lossOpenBalance = (loss === null || loss === void 0 ? void 0 : loss.openBalance) || 0;
+            const lossOpenBalance = loss?.openBalance || 0;
             // business loss can be applied to business profit or other income types profit in case in offset rule met
-            return sum + ((loss === null || loss === void 0 ? void 0 : loss.offsetRule) ? lossOpenBalance : Math.min(lossOpenBalance, claimAmountsByBusinessId.get(businessId)));
+            return sum + (loss?.offsetRule ? lossOpenBalance : Math.min(lossOpenBalance, claimAmountsByBusinessId.get(businessId)));
         }, 0);
     }
     /**
@@ -4521,9 +4504,8 @@ class SoleBusinessLossesCollection extends Collection {
         const claimAmountsByBusinessId = new Dictionary([]);
         const transactionsByBusinessId = new CollectionDictionary(transactions, 'business.id');
         transactionsByBusinessId.keys.forEach((businessId) => {
-            var _a;
             // business loss may not exist if, when creating a business, user didn't add losses for previous years
-            const lossOffsetRule = (_a = this.findBy('business.id', +businessId)) === null || _a === void 0 ? void 0 : _a.offsetRule;
+            const lossOffsetRule = this.findBy('business.id', +businessId)?.offsetRule;
             const businessClaimAmount = transactionsByBusinessId
                 .get(businessId)
                 .getBusinessClaimAmount(allocations, +businessId);
@@ -5318,7 +5300,7 @@ class BankTransactionCollection extends Collection {
      */
     preselectAllocateOperationForSalary(salaryIncomeSources) {
         // incomeSource.salaryForecasts[0] because each income source has only one forecast for current fin year
-        const salaryAmounts = salaryIncomeSources.map((incomeSource) => { var _a; return ((_a = incomeSource.salaryForecasts[0]) === null || _a === void 0 ? void 0 : _a.netPay) || 0; });
+        const salaryAmounts = salaryIncomeSources.map((incomeSource) => incomeSource.salaryForecasts[0]?.netPay || 0);
         this.items.forEach((bankTransaction) => {
             if (salaryAmounts.includes(bankTransaction.amount)) {
                 bankTransaction.operation = TransactionOperationEnum.ALLOCATE;
@@ -5367,8 +5349,7 @@ var FirmTypeEnum;
 
 class EmployeeCollection extends Collection {
     get accountant() {
-        var _a;
-        return (_a = this.items.filter((user) => user.employeeDetails.firm.type === FirmTypeEnum.ACCOUNTANT)[0]) !== null && _a !== void 0 ? _a : null;
+        return this.items.filter((user) => user.employeeDetails.firm.type === FirmTypeEnum.ACCOUNTANT)[0] ?? null;
     }
     get advisors() {
         return this.items.filter((user) => user.employeeDetails.firm.type === FirmTypeEnum.ADVISOR);
@@ -5389,8 +5370,7 @@ class ClientMovementCollection extends Collection {
         return new EmployeeCollection(this.items.map((clientMovement) => clientMovement.client));
     }
     get accountant() {
-        var _a;
-        return (_a = this.items.filter((clientMovement) => clientMovement.firm.type === FirmTypeEnum.ACCOUNTANT)[0]) !== null && _a !== void 0 ? _a : null;
+        return this.items.filter((clientMovement) => clientMovement.firm.type === FirmTypeEnum.ACCOUNTANT)[0] ?? null;
     }
     get advisors() {
         return new ClientMovementCollection(this.items.filter((clientMovement) => clientMovement.firm.type === FirmTypeEnum.ADVISOR));
@@ -5765,11 +5745,11 @@ class User extends User$1 {
      * @param roleType by which role should be returned
      */
     getSubscriptionRole(roleType) {
-        var _a;
         /**
          * Add @TODO for Alex to check if we should use getLastSubscription here
          */
-        return (_a = this.activeSubscription) === null || _a === void 0 ? void 0 : _a.items.find((subscriptionItem) => subscriptionItem.price.product.role.includes(roleType));
+        return this.activeSubscription?.items
+            .find((subscriptionItem) => subscriptionItem.price.product.role.includes(roleType));
     }
     /**
      * Get user's photo link
@@ -5960,15 +5940,13 @@ class Property extends Property$1 {
         return this.address.name;
     }
     get isActive() {
-        var _a;
-        return !!((_a = this.subscriptions) === null || _a === void 0 ? void 0 : _a.length);
+        return !!this.subscriptions?.length;
     }
     isOwn() {
         return this.user.id === +localStorage.getItem('userId');
     }
     isSold() {
-        var _a;
-        return !!((_a = this.myShare) === null || _a === void 0 ? void 0 : _a.sale);
+        return !!this.myShare?.sale;
     }
     /**
      * Get initials of property. Required by Photoable interface
@@ -5989,23 +5967,19 @@ class Property extends Property$1 {
         return this.valuations.filter((valuation) => valuation.isCurrentYear());
     }
     get marketValue() {
-        var _a;
-        return ((_a = this.actualValuation) === null || _a === void 0 ? void 0 : _a.marketValue) || 0;
+        return this.actualValuation?.marketValue || 0;
     }
     get currentYearForecast() {
         return this.forecasts.find((forecast) => forecast.isCurrentYear());
     }
     get forecastedRentalReturn() {
-        var _a;
-        return ((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.rentalReturn) || 0;
+        return this.currentYearForecast?.rentalReturn || 0;
     }
     get forecastedTaxPosition() {
-        var _a;
-        return ((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.taxPosition) || 0;
+        return this.currentYearForecast?.taxPosition || 0;
     }
     get forecastedCashPosition() {
-        var _a;
-        return ((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.cashPosition) || 0;
+        return this.currentYearForecast?.cashPosition || 0;
     }
     get firstForecastYear() {
         return this.forecasts.reduce((min, forecast) => {
@@ -6099,9 +6073,8 @@ class Property extends Property$1 {
      * tax exemption can reduce cgt from 100% to less (up to zero)
      */
     getCGTExemptionRatio(sale) {
-        var _a;
         const metadata = new PropertySaleTaxExemptionMetadataCollection(sale.taxExemptionMetadata);
-        switch ((_a = sale.taxExemption) === null || _a === void 0 ? void 0 : _a.id) {
+        switch (sale.taxExemption?.id) {
             // 50% exemption for investments owned for at least one year
             case TaxExemptionEnum.ONE_YEAR_RULE:
                 return 0.5;
@@ -6139,7 +6112,7 @@ class Property extends Property$1 {
      * ownership duration from purchase till sale
      */
     getOwnershipDuration(sale, unitOfTime = 'days') {
-        return moment$1(sale.contractDate).diff(moment$1(this.contractDate), unitOfTime);
+        return moment(sale.contractDate).diff(moment(this.contractDate), unitOfTime);
     }
     /**
      * Tax Position = Income - Expense - Interest - Depreciation
@@ -6256,8 +6229,7 @@ class BankAccount extends BankAccount$1 {
      * Get current opening balance amount
      */
     getOpeningBalance() {
-        var _a;
-        return ((_a = this.getCurrentYearBalance()) === null || _a === void 0 ? void 0 : _a.openingBalance) || 0;
+        return this.getCurrentYearBalance()?.openingBalance || 0;
     }
     /**
      * Get bank account balance for current financial year
@@ -6970,8 +6942,7 @@ class PropertySale extends PropertySale$1 {
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form ("Capital gains or losses" section)
      */
     isCGTApplicable() {
-        var _a;
-        return ((_a = this.taxExemption) === null || _a === void 0 ? void 0 : _a.id) !== TaxExemptionEnum.PPR;
+        return this.taxExemption?.id !== TaxExemptionEnum.PPR;
     }
     get lossApplied() {
         return this.grossCGT <= 0 ? 0 : Math.min(this.grossCGT, this.capitalLoss);
@@ -7004,13 +6975,12 @@ __decorate([
  */
 class PropertySaleCostBase {
     static createFrom(property, propertySale, depreciations, holdingCosts) {
-        var _a, _b, _c;
         return plainToClass(PropertySaleCostBase, {
             property: plainToClass(Property, property),
             sale: plainToClass(PropertySale, Object.assign({}, propertySale, {
-                holdingCosts: (_a = propertySale.holdingCosts) !== null && _a !== void 0 ? _a : Math.abs(holdingCosts.sumBy('amount')),
-                structuralImprovementsWDV: (_b = propertySale.structuralImprovementsWDV) !== null && _b !== void 0 ? _b : depreciations.getWithCapitalProject().getCloseBalanceByYear(),
-                buildingAtCostClaimed: (_c = propertySale.buildingAtCostClaimed) !== null && _c !== void 0 ? _c : depreciations.getWithoutCapitalProject().getClaimedAmountByYear(),
+                holdingCosts: propertySale.holdingCosts ?? Math.abs(holdingCosts.sumBy('amount')),
+                structuralImprovementsWDV: propertySale.structuralImprovementsWDV ?? depreciations.getWithCapitalProject().getCloseBalanceByYear(),
+                buildingAtCostClaimed: propertySale.buildingAtCostClaimed ?? depreciations.getWithoutCapitalProject().getClaimedAmountByYear(),
             })),
         });
     }
@@ -7254,8 +7224,7 @@ class PropertyEquityChartData {
      */
     getLoanBalanceByYear(property, year, bankAccounts, loans) {
         return bankAccounts.items.reduce((totalSum, bankAccount) => {
-            var _a, _b;
-            return totalSum + (bankAccount.getPropertyPercentage(property.id) * (((_b = (_a = loans.getByBankAccountId(bankAccount.id)) === null || _a === void 0 ? void 0 : _a.getLastPaymentByYear(year)) === null || _b === void 0 ? void 0 : _b.totalOwed) || 0));
+            return totalSum + (bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.getLastPaymentByYear(year)?.totalOwed || 0));
         }, 0);
     }
     getMarketValueForPropertyByYear(property, year) {
@@ -7265,11 +7234,10 @@ class PropertyEquityChartData {
         return (property.getForecastByYear(year) || first(property.forecasts)).marketValue;
     }
     getLoanBalanceForPropertyByYear(property, year) {
-        var _a;
         if (new FinancialYear(property.contractDate).year > year) {
             return 0;
         }
-        return ((_a = property.getForecastByYear(year)) === null || _a === void 0 ? void 0 : _a.loanBalance) || this.bankAccounts.getPropertyBalanceAmount(property.id);
+        return property.getForecastByYear(year)?.loanBalance || this.bankAccounts.getPropertyBalanceAmount(property.id);
     }
     /**
      * Check if loan balance is 0 and set it as null (to not to draw point on the chart)
@@ -7320,8 +7288,7 @@ class PropertyShare extends PropertyShare$1 {
         return this.status === PropertyShareStatusEnum.REJECTED;
     }
     get statusName() {
-        var _a;
-        return (_a = PropertyShareStatusEnum[this.status]) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        return PropertyShareStatusEnum[this.status]?.toLowerCase();
     }
     /**
      * Return full user name if user is already registered.
@@ -7389,9 +7356,9 @@ class JwtService extends JwtHelperService {
         return this.getUser().id === userId;
     }
 }
-JwtService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: JwtService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-JwtService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: JwtService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: JwtService, decorators: [{
+JwtService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+JwtService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -7426,9 +7393,9 @@ class EventDispatcherService {
         this.eventSubject2.next(event);
     }
 }
-EventDispatcherService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EventDispatcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-EventDispatcherService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EventDispatcherService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EventDispatcherService, decorators: [{
+EventDispatcherService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EventDispatcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+EventDispatcherService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EventDispatcherService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EventDispatcherService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -7477,9 +7444,9 @@ class AuthService {
         location.replace(url);
     }
 }
-AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AuthService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AuthService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AuthService, decorators: [{
+AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AuthService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AuthService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AuthService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -7564,9 +7531,8 @@ class JwtInterceptor {
         // });
     }
     handle401Error(req, next, err) {
-        var _a;
         // skip 401 errors not from JWT (basiq login case or other)
-        if (!((_a = err.error.message) === null || _a === void 0 ? void 0 : _a.includes('JWT Token'))) {
+        if (!err.error.message?.includes('JWT Token')) {
             return throwError(err);
         }
         if (req.url.includes('token/refresh') || req.url.includes('login')) {
@@ -7615,9 +7581,9 @@ class JwtInterceptor {
         });
     }
 }
-JwtInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: JwtInterceptor, deps: [{ token: JwtService }, { token: AuthService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-JwtInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: JwtInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: JwtInterceptor, decorators: [{
+JwtInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtInterceptor, deps: [{ token: JwtService }, { token: AuthService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+JwtInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: JwtInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: JwtService }, { type: AuthService }, { type: undefined, decorators: [{
                     type: Inject,
@@ -7650,9 +7616,9 @@ class UserSwitcherService {
         window.location.replace('/firm/dashboard');
     }
 }
-UserSwitcherService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserSwitcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-UserSwitcherService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserSwitcherService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserSwitcherService, decorators: [{
+UserSwitcherService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserSwitcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+UserSwitcherService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserSwitcherService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserSwitcherService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -7698,9 +7664,9 @@ class UserSwitcherInterceptor {
         return next.handle(this.switch(request, this.userSwitcherService.get()));
     }
 }
-UserSwitcherInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserSwitcherInterceptor, deps: [{ token: UserSwitcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-UserSwitcherInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserSwitcherInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserSwitcherInterceptor, decorators: [{
+UserSwitcherInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserSwitcherInterceptor, deps: [{ token: UserSwitcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+UserSwitcherInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserSwitcherInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserSwitcherInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: UserSwitcherService }, { type: undefined, decorators: [{
                     type: Inject,
@@ -7943,9 +7909,9 @@ class PreloaderService {
         this.activePreloaders.next(activePreloaders);
     }
 }
-PreloaderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PreloaderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PreloaderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PreloaderService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PreloaderService, decorators: [{
+PreloaderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PreloaderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+PreloaderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PreloaderService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PreloaderService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -7973,9 +7939,9 @@ class PreloaderInterceptor {
         return Object.values(ENDPOINTS).find((endpoint) => endpoint.test(requestPath));
     }
 }
-PreloaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PreloaderInterceptor, deps: [{ token: PreloaderService }], target: i0.ɵɵFactoryTarget.Injectable });
-PreloaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PreloaderInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PreloaderInterceptor, decorators: [{
+PreloaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PreloaderInterceptor, deps: [{ token: PreloaderService }], target: i0.ɵɵFactoryTarget.Injectable });
+PreloaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PreloaderInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PreloaderInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: PreloaderService }]; } });
 
@@ -8011,9 +7977,9 @@ class SseService {
         }));
     }
 }
-SseService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SseService, deps: [{ token: i0.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-SseService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SseService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SseService, decorators: [{
+SseService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SseService, deps: [{ token: i0.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+SseService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SseService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SseService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -8030,7 +7996,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
  * BaseModel - base entity model that extends by Model
  * CollectionModel - entity collection class
  */
-class RestService$1 {
+let RestService$1 = class RestService {
     constructor(http, eventDispatcherService, environment) {
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
@@ -8240,10 +8206,10 @@ class RestService$1 {
      * Method that call all listeners. Empty by default. Should be redefined by child services if required
      */
     listenEvents() { }
-}
-RestService$1.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService$1, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-RestService$1.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService$1, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService$1, decorators: [{
+};
+RestService$1.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: RestService$1, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+RestService$1.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: RestService$1, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: RestService$1, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -8361,9 +8327,9 @@ class ToastService {
         }));
     }
 }
-ToastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ToastService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-ToastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ToastService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ToastService, decorators: [{
+ToastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ToastService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+ToastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ToastService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ToastService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -8453,9 +8419,9 @@ BankConnectionService.userEventTypes = [
     UserEventTypeTypeEnum.BASIQ_NEW_ACCOUNTS,
     UserEventTypeTypeEnum.BASIQ_AUTHORIZATION_FAIL
 ];
-BankConnectionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankConnectionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
-BankConnectionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankConnectionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankConnectionService, decorators: [{
+BankConnectionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankConnectionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+BankConnectionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankConnectionService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankConnectionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -8565,9 +8531,9 @@ BasiqService.basiqApiUrl = 'https://au-api.basiq.io';
  * Basiq does not provide a hook, so we have to check job status manually every x seconds
  */
 BasiqService.bankCredintialsCheckInterval = 3000;
-BasiqService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: BankConnectionService }], target: i0.ɵɵFactoryTarget.Injectable });
-BasiqService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqService, decorators: [{
+BasiqService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: BankConnectionService }], target: i0.ɵɵFactoryTarget.Injectable });
+BasiqService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -8602,9 +8568,9 @@ class BasiqTokenService extends RestService$1 {
         return this.cacheSubject.asObservable();
     }
 }
-BasiqTokenService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqTokenService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BasiqTokenService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqTokenService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqTokenService, decorators: [{
+BasiqTokenService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqTokenService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BasiqTokenService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqTokenService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqTokenService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -8635,9 +8601,9 @@ class BasiqTokenInterceptor {
         });
     }
 }
-BasiqTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqTokenInterceptor, deps: [{ token: BasiqTokenService }], target: i0.ɵɵFactoryTarget.Injectable });
-BasiqTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqTokenInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqTokenInterceptor, decorators: [{
+BasiqTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqTokenInterceptor, deps: [{ token: BasiqTokenService }], target: i0.ɵɵFactoryTarget.Injectable });
+BasiqTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqTokenInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqTokenInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: BasiqTokenService }]; } });
 
@@ -8779,10 +8745,9 @@ class UserService {
      * Create basiq (if not exist yet) to provide access to basiq api
      */
     createBasiq() {
-        var _a;
         // no need to create basiqId if already exist
         // @TODO Alex (TT-2431): move this check to component or separated method
-        if ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.basiqId) {
+        if (this.cache?.basiqId) {
             return of(this.cache.basiqId);
         }
         return this.http.post(`${this.environment.apiV2}/basiq/user`, {})
@@ -8823,9 +8788,9 @@ class UserService {
         });
     }
 }
-UserService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-UserService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserService, decorators: [{
+UserService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserService, deps: [{ token: i1.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+UserService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -8855,17 +8820,17 @@ class BasiqClientIdInterceptor {
         });
     }
 }
-BasiqClientIdInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqClientIdInterceptor, deps: [{ token: UserService }], target: i0.ɵɵFactoryTarget.Injectable });
-BasiqClientIdInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqClientIdInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasiqClientIdInterceptor, decorators: [{
+BasiqClientIdInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqClientIdInterceptor, deps: [{ token: UserService }], target: i0.ɵɵFactoryTarget.Injectable });
+BasiqClientIdInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqClientIdInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasiqClientIdInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: UserService }]; } });
 
 class InterceptorsModule {
 }
-InterceptorsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: InterceptorsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-InterceptorsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: InterceptorsModule });
-InterceptorsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: InterceptorsModule, providers: [
+InterceptorsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: InterceptorsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+InterceptorsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.1.5", ngImport: i0, type: InterceptorsModule });
+InterceptorsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: InterceptorsModule, providers: [
         {
             provide: HTTP_INTERCEPTORS,
             useClass: CorelogicInterceptor,
@@ -8903,7 +8868,7 @@ InterceptorsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", vers
             multi: true
         }
     ] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: InterceptorsModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: InterceptorsModule, decorators: [{
             type: NgModule,
             args: [{
                     providers: [
@@ -8961,14 +8926,12 @@ class TtCoreModule {
         };
     }
 }
-TtCoreModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-TtCoreModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, imports: [CommonModule,
+TtCoreModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TtCoreModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+TtCoreModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.1.5", ngImport: i0, type: TtCoreModule, imports: [CommonModule,
         InterceptorsModule] });
-TtCoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, imports: [[
-            CommonModule,
-            InterceptorsModule
-        ]] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TtCoreModule, decorators: [{
+TtCoreModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TtCoreModule, imports: [CommonModule,
+        InterceptorsModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TtCoreModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [],
@@ -9440,12 +9403,10 @@ class ClientInvite extends ClientInvite$1 {
         return this.type === ClientInviteTypeEnum.FROM_CLIENT;
     }
     get firstName() {
-        var _a;
-        return this.client ? this.client.firstName : (_a = this.registrationInvite) === null || _a === void 0 ? void 0 : _a.firstName;
+        return this.client ? this.client.firstName : this.registrationInvite?.firstName;
     }
     get email() {
-        var _a;
-        return this.client ? this.client.email : (_a = this.registrationInvite) === null || _a === void 0 ? void 0 : _a.email;
+        return this.client ? this.client.email : this.registrationInvite?.email;
     }
 }
 __decorate([
@@ -9700,10 +9661,9 @@ var LossTypeEnum;
  */
 class MyTaxBusinessDetails {
     constructor(vehicleClaimDetails, businesses, soleDetails, user) {
-        var _a;
         this.businessActivities = uniqBy(businesses.mapBy('activity'), 'id');
-        this.businessABN = soleDetails === null || soleDetails === void 0 ? void 0 : soleDetails.abn;
-        this.businessAddress = (_a = user.address) === null || _a === void 0 ? void 0 : _a.name;
+        this.businessABN = soleDetails?.abn;
+        this.businessAddress = user.address?.name;
         this.businesses = businesses;
         this.vehicleClaimDetails = vehicleClaimDetails;
     }
@@ -10350,13 +10310,12 @@ class MyTaxRent {
      * property contract date, e.t.c.). Details in the TT-2009 task
      */
     calculateOtherRentalDeductionsAmount() {
-        var _a, _b, _c;
-        const plantAndEquipmentAmount = Math.abs(((_a = this.taxSummaryPropertySection.items
-            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
-        const borrowingExpensesAmount = Math.abs(((_b = this.taxSummaryPropertySection.items
-            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _b === void 0 ? void 0 : _b.amount) || 0);
-        const otherRentalDeductionsAmount = Math.abs(((_c = this.taxSummaryPropertySection.items
-            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)) === null || _c === void 0 ? void 0 : _c.amount) || 0);
+        const plantAndEquipmentAmount = Math.abs(this.taxSummaryPropertySection.items
+            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT)?.amount || 0);
+        const borrowingExpensesAmount = Math.abs(this.taxSummaryPropertySection.items
+            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)?.amount || 0);
+        const otherRentalDeductionsAmount = Math.abs(this.taxSummaryPropertySection.items
+            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)?.amount || 0);
         return +Math.floor(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount).toFixed(2);
     }
 }
@@ -10504,8 +10463,7 @@ class ReportItem extends AbstractModel {
      * @param name Name of income source for filter
      */
     getAmountByIncomeSourceName(name) {
-        var _a;
-        return ((_a = this.details.find((detail) => detail.name === name)) === null || _a === void 0 ? void 0 : _a.amount) || 0;
+        return this.details.find((detail) => detail.name === name)?.amount || 0;
     }
 }
 __decorate([
@@ -10639,16 +10597,14 @@ class TaxSummary {
         return profit - lossCurrent;
     }
     getDeferredBusinessLoss(business) {
-        var _a;
-        return (_a = this.sole.items
+        return this.sole.items
             .findByCategory(TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES).items
-            .findBy('title', `Item 15c - ${business.name}`)) === null || _a === void 0 ? void 0 : _a.amount;
+            .findBy('title', `Item 15c - ${business.name}`)?.amount;
     }
     getBusinessCloseBalance(business) {
-        var _a;
-        return (_a = this.sole.items
+        return this.sole.items
             .findByCategory(TaxReturnCategoryListEnum.BUSINESS_INCOME_OR_LOSS).items
-            .findBy('title', `Item 15c - ${business.name}`)) === null || _a === void 0 ? void 0 : _a.amount;
+            .findBy('title', `Item 15c - ${business.name}`)?.amount;
     }
 }
 __decorate([
@@ -10737,9 +10693,9 @@ class AddressService {
         return this.countriesSubject.asObservable();
     }
 }
-AddressService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AddressService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-AddressService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AddressService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AddressService, decorators: [{
+AddressService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AddressService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+AddressService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AddressService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AddressService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -10792,9 +10748,9 @@ class BankAccountService extends RestService$1 {
         });
     }
 }
-BankAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BankAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountService, decorators: [{
+BankAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankAccountService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BankAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankAccountService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankAccountService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -10859,9 +10815,9 @@ class BankTransactionService extends RestService$1 {
         });
     }
 }
-BankTransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BankTransactionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionService, decorators: [{
+BankTransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankTransactionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BankTransactionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankTransactionService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankTransactionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -10889,9 +10845,9 @@ class BankService extends RestService$1 {
         }));
     }
 }
-BankService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BankService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankService, decorators: [{
+BankService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BankService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -10911,9 +10867,9 @@ class ChartAccountsDepreciationService extends RestService$1 {
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
 }
-ChartAccountsDepreciationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChartAccountsDepreciationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ChartAccountsDepreciationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChartAccountsDepreciationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChartAccountsDepreciationService, decorators: [{
+ChartAccountsDepreciationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ChartAccountsDepreciationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+ChartAccountsDepreciationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ChartAccountsDepreciationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ChartAccountsDepreciationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -10941,7 +10897,7 @@ class ChartAccountsService extends RestService$1 {
                 .filter((ca) => categories.includes(ca.category));
             const headings = [];
             filteredChartAccounts.forEach((ca) => {
-                let heading = headings.find((h) => { var _a; return h.id === ((_a = ca.heading) === null || _a === void 0 ? void 0 : _a.id); });
+                let heading = headings.find((h) => h.id === ca.heading?.id);
                 if (!heading) {
                     heading = plainToClass(ChartAccountsHeading, ca.heading);
                     heading.chartAccounts = [];
@@ -10953,9 +10909,9 @@ class ChartAccountsService extends RestService$1 {
         }));
     }
 }
-ChartAccountsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChartAccountsService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ChartAccountsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChartAccountsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChartAccountsService, decorators: [{
+ChartAccountsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ChartAccountsService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+ChartAccountsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ChartAccountsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ChartAccountsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11018,15 +10974,15 @@ class ChatService extends RestService$1 {
         this.listenCSE(Message, ['post'], (messages) => {
             const message = messages[0];
             const cache = this.cache.toArray();
-            const updatedChat = cache.find((chat) => { var _a; return (chat === null || chat === void 0 ? void 0 : chat.id) === ((_a = message.chat) === null || _a === void 0 ? void 0 : _a.id); });
-            updatedChat.updatedAt = message === null || message === void 0 ? void 0 : message.createdAt;
+            const updatedChat = cache.find((chat) => chat?.id === message.chat?.id);
+            updatedChat.updatedAt = message?.createdAt;
             this.handleResponse([updatedChat], 'put');
         });
     }
 }
-ChatService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChatService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
-ChatService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChatService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ChatService, decorators: [{
+ChatService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ChatService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
+ChatService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ChatService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ChatService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11083,9 +11039,9 @@ class MessageService extends RestService$1 {
         });
     }
 }
-MessageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
-MessageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageService, decorators: [{
+MessageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: MessageService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
+MessageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: MessageService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: MessageService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11118,9 +11074,8 @@ class MessageDocumentService extends RestService$1 {
      */
     listenMessages() {
         this.listenCSE(Message, ['post'], (messages) => {
-            var _a;
             const message = messages[0];
-            if ((_a = message.documents) === null || _a === void 0 ? void 0 : _a.length) {
+            if (message.documents?.length) {
                 const array = this.cache.toArray();
                 const documentsIds = this.cache.getIds();
                 message.documents.forEach((document) => {
@@ -11157,9 +11112,9 @@ class MessageDocumentService extends RestService$1 {
         }));
     }
 }
-MessageDocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-MessageDocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageDocumentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: MessageDocumentService, decorators: [{
+MessageDocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: MessageDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+MessageDocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: MessageDocumentService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: MessageDocumentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11284,9 +11239,9 @@ class DepreciationService extends RestService$1 {
         });
     }
 }
-DepreciationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-DepreciationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationService, decorators: [{
+DepreciationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DepreciationService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+DepreciationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DepreciationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DepreciationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11338,9 +11293,9 @@ class DepreciationCapitalProjectService {
         }));
     }
 }
-DepreciationCapitalProjectService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationCapitalProjectService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-DepreciationCapitalProjectService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationCapitalProjectService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationCapitalProjectService, decorators: [{
+DepreciationCapitalProjectService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DepreciationCapitalProjectService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+DepreciationCapitalProjectService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DepreciationCapitalProjectService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DepreciationCapitalProjectService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11406,9 +11361,9 @@ class ReceiptService {
         return plainToClass(this.modelClass, data);
     }
 }
-ReceiptService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ReceiptService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
-ReceiptService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ReceiptService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ReceiptService, decorators: [{
+ReceiptService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ReceiptService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+ReceiptService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ReceiptService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ReceiptService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11437,9 +11392,9 @@ class DepreciationReceiptService extends ReceiptService {
         this.listenEvents();
     }
 }
-DepreciationReceiptService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationReceiptService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
-DepreciationReceiptService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationReceiptService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DepreciationReceiptService, decorators: [{
+DepreciationReceiptService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DepreciationReceiptService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+DepreciationReceiptService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DepreciationReceiptService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DepreciationReceiptService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11653,9 +11608,9 @@ class RestService {
      */
     listenEvents() { }
 }
-RestService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
-RestService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RestService, decorators: [{
+RestService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: RestService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+RestService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: RestService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: RestService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11672,9 +11627,9 @@ class DocumentService extends RestService {
         this.modelClass = Document;
     }
 }
-DocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-DocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentService, decorators: [{
+DocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+DocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DocumentService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DocumentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11740,9 +11695,9 @@ class DocumentFolderService extends RestService {
         }));
     }
 }
-DocumentFolderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentFolderService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-DocumentFolderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentFolderService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: DocumentFolderService, decorators: [{
+DocumentFolderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DocumentFolderService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+DocumentFolderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DocumentFolderService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DocumentFolderService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11763,17 +11718,15 @@ class FacebookService {
         this.isLoggedInSubject = new BehaviorSubject(!this.jwtService.isTokenExpired());
         this.isFacebookEnabled = !!environment['facebookAppId'];
     }
-    login(redirectUrl = '/client') {
-        return __awaiter(this, void 0, void 0, function* () {
-            const accessToken = yield this.getAccessToken();
-            this.http.post(`${this.environment.apiV2}/users/authentication/facebook`, { accessToken })
-                .subscribe((response) => {
-                this.setAuth(response);
-                this.router.navigate([redirectUrl]);
-            }, (error) => {
-                this.toastService.error(error.error.violations[0].message);
-                this.logout();
-            });
+    async login(redirectUrl = '/client') {
+        const accessToken = await this.getAccessToken();
+        this.http.post(`${this.environment.apiV2}/users/authentication/facebook`, { accessToken })
+            .subscribe((response) => {
+            this.setAuth(response);
+            this.router.navigate([redirectUrl]);
+        }, (error) => {
+            this.toastService.error(error.error.violations[0].message);
+            this.logout();
         });
     }
     /**
@@ -11819,9 +11772,9 @@ FacebookService.authOptions = {
     auth_type: 'rerequest',
     return_scopes: true
 };
-FacebookService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FacebookService, deps: [{ token: i1.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i1$1.Router }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-FacebookService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FacebookService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FacebookService, decorators: [{
+FacebookService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FacebookService, deps: [{ token: i1.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i1$1.Router }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+FacebookService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FacebookService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FacebookService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11847,9 +11800,9 @@ class FileService extends RestService$1 {
             .pipe(map((fileBase) => plainToClass(AppFile, fileBase)));
     }
 }
-FileService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FileService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-FileService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FileService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FileService, decorators: [{
+FileService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FileService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+FileService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FileService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FileService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11866,9 +11819,9 @@ class ClientIncomeTypesService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];
     }
 }
-ClientIncomeTypesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientIncomeTypesService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ClientIncomeTypesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientIncomeTypesService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientIncomeTypesService, decorators: [{
+ClientIncomeTypesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientIncomeTypesService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+ClientIncomeTypesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientIncomeTypesService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientIncomeTypesService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -11983,9 +11936,9 @@ class ClientInviteService extends RestService {
         });
     }
 }
-ClientInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ClientInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientInviteService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientInviteService, decorators: [{
+ClientInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+ClientInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientInviteService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientInviteService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12064,9 +12017,9 @@ class ClientMovementService extends RestService {
         });
     }
 }
-ClientMovementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ClientMovementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientMovementService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientMovementService, decorators: [{
+ClientMovementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+ClientMovementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientMovementService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientMovementService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12095,9 +12048,9 @@ class EmployeeService extends RestService {
         }));
     }
 }
-EmployeeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EmployeeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-EmployeeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EmployeeService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EmployeeService, decorators: [{
+EmployeeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EmployeeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+EmployeeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EmployeeService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EmployeeService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12140,9 +12093,9 @@ class EmployeeInviteService extends RestService {
         }));
     }
 }
-EmployeeInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EmployeeInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-EmployeeInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EmployeeInviteService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EmployeeInviteService, decorators: [{
+EmployeeInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EmployeeInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+EmployeeInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EmployeeInviteService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EmployeeInviteService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12167,9 +12120,9 @@ class ClientPortfolioReportService {
         }));
     }
 }
-ClientPortfolioReportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientPortfolioReportService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-ClientPortfolioReportService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientPortfolioReportService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ClientPortfolioReportService, decorators: [{
+ClientPortfolioReportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientPortfolioReportService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+ClientPortfolioReportService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientPortfolioReportService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ClientPortfolioReportService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12239,9 +12192,9 @@ class FirmService {
         }));
     }
 }
-FirmService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FirmService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-FirmService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FirmService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: FirmService, decorators: [{
+FirmService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FirmService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+FirmService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FirmService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: FirmService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12314,9 +12267,9 @@ class IncomeSourceForecastService extends RestService {
         }).flat();
     }
 }
-IncomeSourceForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-IncomeSourceForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceForecastService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceForecastService, decorators: [{
+IncomeSourceForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: IncomeSourceForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+IncomeSourceForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: IncomeSourceForecastService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: IncomeSourceForecastService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12386,9 +12339,9 @@ class SalaryForecastService extends RestService {
         }).flat();
     }
 }
-SalaryForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SalaryForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SalaryForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SalaryForecastService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SalaryForecastService, decorators: [{
+SalaryForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SalaryForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SalaryForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SalaryForecastService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SalaryForecastService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12464,9 +12417,9 @@ class SoleForecastService extends RestService {
         });
     }
 }
-SoleForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleForecastService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleForecastService, decorators: [{
+SoleForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleForecastService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleForecastService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12565,9 +12518,9 @@ class IncomeSourceService extends RestService {
         });
     }
 }
-IncomeSourceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-IncomeSourceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IncomeSourceService, decorators: [{
+IncomeSourceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: IncomeSourceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+IncomeSourceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: IncomeSourceService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: IncomeSourceService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12630,9 +12583,9 @@ class BorrowingExpenseService {
         }));
     }
 }
-BorrowingExpenseService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BorrowingExpenseService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-BorrowingExpenseService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BorrowingExpenseService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BorrowingExpenseService, decorators: [{
+BorrowingExpenseService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BorrowingExpenseService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+BorrowingExpenseService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BorrowingExpenseService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BorrowingExpenseService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12714,9 +12667,9 @@ class LoanService extends RestService$1 {
         }));
     }
 }
-LoanService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LoanService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-LoanService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LoanService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LoanService, decorators: [{
+LoanService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: LoanService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+LoanService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: LoanService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: LoanService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12735,9 +12688,9 @@ class PropertyCategoryService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
 }
-PropertyCategoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyCategoryService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyCategoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyCategoryService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyCategoryService, decorators: [{
+PropertyCategoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyCategoryService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+PropertyCategoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyCategoryService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyCategoryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12753,9 +12706,9 @@ class PropertyCategoryMovementService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
 }
-PropertyCategoryMovementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyCategoryMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyCategoryMovementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyCategoryMovementService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyCategoryMovementService, decorators: [{
+PropertyCategoryMovementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyCategoryMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+PropertyCategoryMovementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyCategoryMovementService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyCategoryMovementService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12797,9 +12750,9 @@ class PropertyDocumentService extends RestService$1 {
         });
     }
 }
-PropertyDocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyDocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyDocumentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyDocumentService, decorators: [{
+PropertyDocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+PropertyDocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyDocumentService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyDocumentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12816,9 +12769,9 @@ class TaxExemptionService extends RestService$1 {
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
 }
-TaxExemptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxExemptionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-TaxExemptionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxExemptionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxExemptionService, decorators: [{
+TaxExemptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxExemptionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+TaxExemptionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxExemptionService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxExemptionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12834,9 +12787,9 @@ class PropertySaleService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
 }
-PropertySaleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertySaleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertySaleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertySaleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertySaleService, decorators: [{
+PropertySaleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertySaleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+PropertySaleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertySaleService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertySaleService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12883,9 +12836,9 @@ class PropertyShareService extends RestService$1 {
         this.listenCSE(PropertySale, ['post', 'delete'], this.resetCache);
     }
 }
-PropertyShareService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyShareService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyShareService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyShareService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyShareService, decorators: [{
+PropertyShareService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyShareService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+PropertyShareService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyShareService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyShareService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12982,9 +12935,9 @@ class PropertyService extends RestService$1 {
         }));
     }
 }
-PropertyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyService, decorators: [{
+PropertyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+PropertyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13028,9 +12981,9 @@ class ServiceNotificationService extends RestService {
         });
     }
 }
-ServiceNotificationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceNotificationService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
-ServiceNotificationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceNotificationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceNotificationService, decorators: [{
+ServiceNotificationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServiceNotificationService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
+ServiceNotificationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServiceNotificationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServiceNotificationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13079,9 +13032,9 @@ class SoleBusinessService extends RestService {
         }));
     }
 }
-SoleBusinessService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleBusinessService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, decorators: [{
+SoleBusinessService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleBusinessService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13096,9 +13049,9 @@ class SoleBusinessActivityService extends RestService {
         this.isHydra = true;
     }
 }
-SoleBusinessActivityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessActivityService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleBusinessActivityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessActivityService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessActivityService, decorators: [{
+SoleBusinessActivityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessActivityService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleBusinessActivityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessActivityService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessActivityService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13124,9 +13077,9 @@ class SoleBusinessLossService extends RestService {
         });
     }
 }
-SoleBusinessLossService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessLossService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleBusinessLossService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessLossService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessLossService, decorators: [{
+SoleBusinessLossService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessLossService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleBusinessLossService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessLossService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessLossService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13144,9 +13097,9 @@ class SoleBusinessLossOffsetRuleService extends RestService {
         this.isHydra = true;
     }
 }
-SoleBusinessLossOffsetRuleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessLossOffsetRuleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleBusinessLossOffsetRuleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessLossOffsetRuleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessLossOffsetRuleService, decorators: [{
+SoleBusinessLossOffsetRuleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessLossOffsetRuleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleBusinessLossOffsetRuleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessLossOffsetRuleService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleBusinessLossOffsetRuleService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13161,9 +13114,9 @@ class SoleContactService extends RestService {
         this.isHydra = true;
     }
 }
-SoleContactService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleContactService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleContactService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleContactService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleContactService, decorators: [{
+SoleContactService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleContactService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleContactService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleContactService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleContactService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13219,9 +13172,9 @@ class SoleDepreciationMethodService {
         });
     }
 }
-SoleDepreciationMethodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDepreciationMethodService, deps: [{ token: i1.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
-SoleDepreciationMethodService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDepreciationMethodService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDepreciationMethodService, decorators: [{
+SoleDepreciationMethodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleDepreciationMethodService, deps: [{ token: i1.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+SoleDepreciationMethodService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleDepreciationMethodService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleDepreciationMethodService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13274,9 +13227,9 @@ class SoleDetailsService {
         }));
     }
 }
-SoleDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, deps: [{ token: i1.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
-SoleDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleDetailsService, decorators: [{
+SoleDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleDetailsService, deps: [{ token: i1.HttpClient }, { token: 'environment' }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
+SoleDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleDetailsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleDetailsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13334,11 +13287,10 @@ class SoleInvoiceService extends RestService {
      * Basically needed to create a new invoice to show its number when the invoice has not yet been sent to the backend
      */
     getNewInvoiceNumber() {
-        var _a, _b;
         if (!this.cache) {
             return 0;
         }
-        const number = (_b = (_a = last(this.cache)) === null || _a === void 0 ? void 0 : _a.number) !== null && _b !== void 0 ? _b : 0;
+        const number = last(this.cache)?.number ?? 0;
         return number + 1;
     }
     listenAllocations() {
@@ -13350,9 +13302,9 @@ class SoleInvoiceService extends RestService {
         });
     }
 }
-SoleInvoiceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleInvoiceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceService, decorators: [{
+SoleInvoiceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleInvoiceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleInvoiceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleInvoiceService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleInvoiceService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13367,9 +13319,9 @@ class SoleInvoiceTemplateService extends RestService {
         this.isHydra = true;
     }
 }
-SoleInvoiceTemplateService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceTemplateService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleInvoiceTemplateService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceTemplateService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleInvoiceTemplateService, decorators: [{
+SoleInvoiceTemplateService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleInvoiceTemplateService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+SoleInvoiceTemplateService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleInvoiceTemplateService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SoleInvoiceTemplateService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13384,9 +13336,9 @@ class BasReportService extends RestService {
         this.isHydra = true;
     }
 }
-BasReportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasReportService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BasReportService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasReportService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BasReportService, decorators: [{
+BasReportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasReportService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+BasReportService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasReportService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BasReportService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13406,9 +13358,9 @@ class ServicePriceService extends RestService$1 {
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
 }
-ServicePriceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServicePriceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ServicePriceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServicePriceService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServicePriceService, decorators: [{
+ServicePriceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServicePriceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+ServicePriceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServicePriceService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServicePriceService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13434,9 +13386,9 @@ class ServicePaymentService extends RestService$1 {
         return this.http.get(`${this.environment.apiV2}/service-payments/${payment.id}/invoice-url`);
     }
 }
-ServicePaymentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServicePaymentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ServicePaymentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServicePaymentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServicePaymentService, decorators: [{
+ServicePaymentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServicePaymentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+ServicePaymentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServicePaymentService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServicePaymentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13485,18 +13437,16 @@ class SubscriptionService extends RestService$1 {
      * @TODO remove
      * redirect to stripe payment page
      */
-    checkoutRedirect(subscription) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stripe = yield loadStripe(this.environment.stripePk);
-            this.http.post(`${this.environment.apiV2}/stripe/checkout-session`, {
-                items: subscription.items,
-                successUrl: window.location.href,
-                cancelUrl: window.location.href
-            })
-                .subscribe((session) => {
-                // @Todo remove user TRIAL status
-                stripe.redirectToCheckout({ sessionId: session });
-            });
+    async checkoutRedirect(subscription) {
+        const stripe = await loadStripe(this.environment.stripePk);
+        this.http.post(`${this.environment.apiV2}/stripe/checkout-session`, {
+            items: subscription.items,
+            successUrl: window.location.href,
+            cancelUrl: window.location.href
+        })
+            .subscribe((session) => {
+            // @Todo remove user TRIAL status
+            stripe.redirectToCheckout({ sessionId: session });
         });
     }
     /**
@@ -13549,9 +13499,9 @@ class SubscriptionService extends RestService$1 {
         });
     }
 }
-SubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SubscriptionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: ToastService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-SubscriptionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SubscriptionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SubscriptionService, decorators: [{
+SubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SubscriptionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: ToastService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+SubscriptionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SubscriptionService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: SubscriptionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13571,9 +13521,9 @@ class ServiceProductService extends RestService$1 {
         this.isApiPlatform = true;
     }
 }
-ServiceProductService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceProductService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ServiceProductService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceProductService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ServiceProductService, decorators: [{
+ServiceProductService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServiceProductService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+ServiceProductService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServiceProductService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServiceProductService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13605,9 +13555,9 @@ class TaxReviewHistoryService extends RestService {
         });
     }
 }
-TaxReviewHistoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewHistoryService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-TaxReviewHistoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewHistoryService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewHistoryService, decorators: [{
+TaxReviewHistoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxReviewHistoryService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+TaxReviewHistoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxReviewHistoryService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxReviewHistoryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13696,9 +13646,9 @@ class TaxReviewService extends RestService {
         });
     }
 }
-TaxReviewService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-TaxReviewService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxReviewService, decorators: [{
+TaxReviewService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxReviewService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+TaxReviewService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxReviewService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxReviewService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13755,9 +13705,9 @@ class TaxSummaryService {
         });
     }
 }
-TaxSummaryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxSummaryService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-TaxSummaryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxSummaryService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TaxSummaryService, decorators: [{
+TaxSummaryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxSummaryService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+TaxSummaryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxSummaryService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TaxSummaryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13851,9 +13801,9 @@ class TransactionAllocationService extends RestService {
         });
     }
 }
-TransactionAllocationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionAllocationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-TransactionAllocationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionAllocationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionAllocationService, decorators: [{
+TransactionAllocationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionAllocationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+TransactionAllocationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionAllocationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionAllocationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13879,9 +13829,9 @@ class TransactionReceiptService extends ReceiptService {
         this.listenEvents();
     }
 }
-TransactionReceiptService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionReceiptService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
-TransactionReceiptService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionReceiptService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionReceiptService, decorators: [{
+TransactionReceiptService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionReceiptService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable });
+TransactionReceiptService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionReceiptService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionReceiptService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13964,8 +13914,7 @@ class TransactionService extends RestService {
         return this.get()
             .pipe(map((transactions) => {
             return transactions.filter((transaction) => {
-                var _a;
-                return ((_a = transaction.property) === null || _a === void 0 ? void 0 : _a.id) === propertyId;
+                return transaction.property?.id === propertyId;
             });
         }));
     }
@@ -14100,7 +14049,6 @@ class TransactionService extends RestService {
         return this.http.delete(`${this.environment.apiV2}/${this.url}/${model.id}`)
             .pipe(map(() => {
             this.cache = this.cache.filter((transaction) => {
-                var _a;
                 // when delete transfer we delete actually 2 transactions
                 if (model.isTransfer) {
                     const ids = [model.id];
@@ -14115,7 +14063,7 @@ class TransactionService extends RestService {
                     }
                     return !ids.includes(transaction.id);
                 }
-                return transaction.id !== model.id && ((_a = transaction.parentTransaction) === null || _a === void 0 ? void 0 : _a.id) !== model.id;
+                return transaction.id !== model.id && transaction.parentTransaction?.id !== model.id;
             });
             this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.TRANSACTION_DELETED, model));
             this.updateCache();
@@ -14201,9 +14149,9 @@ class TransactionService extends RestService {
         });
     }
 }
-TransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: TransactionReceiptService }], target: i0.ɵɵFactoryTarget.Injectable });
-TransactionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionService, decorators: [{
+TransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: TransactionReceiptService }], target: i0.ɵɵFactoryTarget.Injectable });
+TransactionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14232,9 +14180,9 @@ class TutorialVideoService {
 }
 TutorialVideoService.googleUrl = `https://www.googleapis.com/drive/v3/files?fields=*&mimeType='video/mp4'&orderBy=name`;
 TutorialVideoService.parents = '1uLMLzi8WUy2go9xhfzJEwgFwOM43dukM';
-TutorialVideoService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TutorialVideoService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-TutorialVideoService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TutorialVideoService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TutorialVideoService, decorators: [{
+TutorialVideoService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TutorialVideoService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+TutorialVideoService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TutorialVideoService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TutorialVideoService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14254,9 +14202,9 @@ class VehicleService extends RestService {
         this.modelClass = Vehicle;
     }
 }
-VehicleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-VehicleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleService, decorators: [{
+VehicleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+VehicleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14322,15 +14270,15 @@ class VehicleClaimService extends RestService {
         // @TODO Vik (TT-2210): need batch endpoint for this update
         // @TODO Alex (TT-2210): fix frontend when endpoint ready
         const batch$ = this.cache.map((claim) => {
-            const claimToUpdate = plainToClass(VehicleClaim, Object.assign({}, claim, { workUsage: bestPeriod === null || bestPeriod === void 0 ? void 0 : bestPeriod.getWorkUsageByClaim(claim) }));
+            const claimToUpdate = plainToClass(VehicleClaim, Object.assign({}, claim, { workUsage: bestPeriod?.getWorkUsageByClaim(claim) }));
             return this.update(claimToUpdate);
         });
         combineLatest(batch$).subscribe();
     }
 }
-VehicleClaimService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-VehicleClaimService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, decorators: [{
+VehicleClaimService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+VehicleClaimService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleClaimService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleClaimService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14407,9 +14355,9 @@ class VehicleClaimDetailsService {
         this.update(vehicleClaimDetails).subscribe();
     }
 }
-VehicleClaimDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimDetailsService, deps: [{ token: 'environment' }, { token: i1.HttpClient }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
-VehicleClaimDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimDetailsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimDetailsService, decorators: [{
+VehicleClaimDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleClaimDetailsService, deps: [{ token: 'environment' }, { token: i1.HttpClient }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
+VehicleClaimDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleClaimDetailsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleClaimDetailsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14429,9 +14377,9 @@ class VehicleLogbookService extends RestService {
         this.modelClass = VehicleLogbook;
     }
 }
-VehicleLogbookService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-VehicleLogbookService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleLogbookService, decorators: [{
+VehicleLogbookService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleLogbookService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+VehicleLogbookService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleLogbookService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: VehicleLogbookService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14464,9 +14412,9 @@ class OccupationService {
         return this.occupationsSubject.asObservable();
     }
 }
-OccupationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: OccupationService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-OccupationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: OccupationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: OccupationService, decorators: [{
+OccupationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: OccupationService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+OccupationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: OccupationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: OccupationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14510,9 +14458,9 @@ class UserEventSettingService extends RestService {
         }));
     }
 }
-UserEventSettingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventSettingService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-UserEventSettingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventSettingService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventSettingService, decorators: [{
+UserEventSettingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserEventSettingService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+UserEventSettingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserEventSettingService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserEventSettingService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14527,9 +14475,9 @@ class UserEventTypeService extends RestService {
         this.isHydra = true;
     }
 }
-UserEventTypeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventTypeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-UserEventTypeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventTypeService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UserEventTypeService, decorators: [{
+UserEventTypeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserEventTypeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+UserEventTypeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserEventTypeService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UserEventTypeService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14546,9 +14494,9 @@ class UsersInviteService extends RestService {
         this.url = 'users/invite';
     }
 }
-UsersInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UsersInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-UsersInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UsersInviteService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: UsersInviteService, decorators: [{
+UsersInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UsersInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+UsersInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UsersInviteService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: UsersInviteService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14739,9 +14687,9 @@ class AccountSetupService {
         }));
     }
 }
-AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }], target: i0.ɵɵFactoryTarget.Injectable });
-AccountSetupService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AccountSetupService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AccountSetupService, decorators: [{
+AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }], target: i0.ɵɵFactoryTarget.Injectable });
+AccountSetupService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AccountSetupService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AccountSetupService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14767,9 +14715,9 @@ class RewardfulService {
         });
     }
 }
-RewardfulService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RewardfulService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-RewardfulService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RewardfulService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: RewardfulService, decorators: [{
+RewardfulService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: RewardfulService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+RewardfulService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: RewardfulService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: RewardfulService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14814,9 +14762,9 @@ class AssetsService {
         return this.http.delete(`${this.environment.apiV2}/${asset.entityType}/${entityId}/${asset.type}/${asset.id}`);
     }
 }
-AssetsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AssetsService, deps: [{ token: i1.HttpClient }, { token: UserSwitcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-AssetsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AssetsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: AssetsService, decorators: [{
+AssetsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AssetsService, deps: [{ token: i1.HttpClient }, { token: UserSwitcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+AssetsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AssetsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AssetsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14879,9 +14827,9 @@ class BankTransactionCalculationService {
         return allocations.getByBankTransactionsIds(bankTransactions.debitTransactions.getIds()).amount;
     }
 }
-BankTransactionCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BankTransactionCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionCalculationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankTransactionCalculationService, decorators: [{
+BankTransactionCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankTransactionCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+BankTransactionCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankTransactionCalculationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankTransactionCalculationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14910,9 +14858,9 @@ class BankAccountCalculationService {
         return bankAccounts.currentBalance - this.getTaxTankBalance(bankAccounts.getLoanAccounts(), bankTransactions, allocations);
     }
 }
-BankAccountCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountCalculationService, deps: [{ token: BankTransactionCalculationService }], target: i0.ɵɵFactoryTarget.Injectable });
-BankAccountCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountCalculationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: BankAccountCalculationService, decorators: [{
+BankAccountCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankAccountCalculationService, deps: [{ token: BankTransactionCalculationService }], target: i0.ɵɵFactoryTarget.Injectable });
+BankAccountCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankAccountCalculationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: BankAccountCalculationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14937,9 +14885,9 @@ class ExportFormatterService {
         }));
     }
 }
-ExportFormatterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ExportFormatterService, deps: [{ token: i1$2.CurrencyPipe }, { token: i1$2.DatePipe }], target: i0.ɵɵFactoryTarget.Injectable });
-ExportFormatterService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ExportFormatterService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: ExportFormatterService, decorators: [{
+ExportFormatterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ExportFormatterService, deps: [{ token: i1$2.CurrencyPipe }, { token: i1$2.DatePipe }], target: i0.ɵɵFactoryTarget.Injectable });
+ExportFormatterService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ExportFormatterService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ExportFormatterService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14960,9 +14908,9 @@ class HeaderTitleService {
         }), filter((route) => route.outlet === 'primary'), mergeMap((route) => route.data));
     }
 }
-HeaderTitleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: HeaderTitleService, deps: [{ token: i1$1.Router }, { token: i1$1.ActivatedRoute }], target: i0.ɵɵFactoryTarget.Injectable });
-HeaderTitleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: HeaderTitleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: HeaderTitleService, decorators: [{
+HeaderTitleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HeaderTitleService, deps: [{ token: i1$1.Router }, { token: i1$1.ActivatedRoute }], target: i0.ɵɵFactoryTarget.Injectable });
+HeaderTitleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HeaderTitleService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HeaderTitleService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14996,9 +14944,9 @@ class IntercomService {
         window.Intercom('boot', connectionCredentials);
     }
 }
-IntercomService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IntercomService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-IntercomService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IntercomService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: IntercomService, decorators: [{
+IntercomService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: IntercomService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+IntercomService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: IntercomService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: IntercomService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15060,9 +15008,9 @@ class PdfFromDomElementService {
             .then((blob) => new File([blob], filename, { type: 'application/pdf' })));
     }
 }
-PdfFromDomElementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromDomElementService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PdfFromDomElementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromDomElementService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromDomElementService, decorators: [{
+PdfFromDomElementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromDomElementService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+PdfFromDomElementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromDomElementService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromDomElementService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15141,9 +15089,9 @@ class PdfFromTableService {
         doc.addImage(logo, 'PNG', doc.internal.pageSize.width - FILE_SETTINGS.logo.positionX, FILE_SETTINGS.logo.positionY, FILE_SETTINGS.logo.width, FILE_SETTINGS.logo.height);
     }
 }
-PdfFromTableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromTableService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PdfFromTableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromTableService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromTableService, decorators: [{
+PdfFromTableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromTableService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+PdfFromTableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromTableService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromTableService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15170,14 +15118,19 @@ class PdfFromDataTableService extends PdfFromTableService {
         this.setDocumentTitle(pdf, title);
         this.setDocumentLogo(pdf);
         dataTables.forEach((dataTable) => {
-            autoTable(pdf, Object.assign({ head: [dataTable.header], body: this.formatter.format(dataTable.body), foot: this.formatter.format(dataTable.footer) }, this.setTableOptions(pdf, dataTable.caption)));
+            autoTable(pdf, {
+                head: [dataTable.header],
+                body: this.formatter.format(dataTable.body),
+                foot: this.formatter.format(dataTable.footer),
+                ...this.setTableOptions(pdf, dataTable.caption)
+            });
         });
         return pdf;
     }
 }
-PdfFromDataTableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromDataTableService, deps: [{ token: ExportFormatterService }], target: i0.ɵɵFactoryTarget.Injectable });
-PdfFromDataTableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromDataTableService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromDataTableService, decorators: [{
+PdfFromDataTableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromDataTableService, deps: [{ token: ExportFormatterService }], target: i0.ɵɵFactoryTarget.Injectable });
+PdfFromDataTableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromDataTableService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromDataTableService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15205,14 +15158,17 @@ class PdfFromHtmlTableService extends PdfFromTableService {
                 table.createCaption();
                 table.caption.innerText = '';
             }
-            autoTable(pdf, Object.assign({ html: table }, this.setTableOptions(pdf, table.caption.innerText)));
+            autoTable(pdf, {
+                html: table,
+                ...this.setTableOptions(pdf, table.caption.innerText)
+            });
         });
         return pdf;
     }
 }
-PdfFromHtmlTableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromHtmlTableService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PdfFromHtmlTableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromHtmlTableService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PdfFromHtmlTableService, decorators: [{
+PdfFromHtmlTableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromHtmlTableService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+PdfFromHtmlTableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromHtmlTableService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PdfFromHtmlTableService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15245,9 +15201,9 @@ class EquityPositionChartService {
         }));
     }
 }
-EquityPositionChartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EquityPositionChartService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-EquityPositionChartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EquityPositionChartService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: EquityPositionChartService, decorators: [{
+EquityPositionChartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EquityPositionChartService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+EquityPositionChartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EquityPositionChartService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: EquityPositionChartService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15298,8 +15254,7 @@ class PropertyCalculationService {
         return properties.items.reduce((totalAmount, property) => {
             return totalAmount + bankAccounts.items
                 .reduce((propertyAmount, bankAccount) => {
-                var _a;
-                return propertyAmount + bankAccount.getPropertyPercentage(property.id) * (((_a = loans.getByBankAccountId(bankAccount.id)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
+                return propertyAmount + bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.amount || 0);
             }, 0);
         }, 0);
     }
@@ -15419,9 +15374,9 @@ class PropertyCalculationService {
         }
     }
 }
-PropertyCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PropertyCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyCalculationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyCalculationService, decorators: [{
+PropertyCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+PropertyCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyCalculationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyCalculationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15478,9 +15433,9 @@ class PropertyTransactionReportService {
         }));
     }
 }
-PropertyTransactionReportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyTransactionReportService, deps: [{ token: PropertyService }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }], target: i0.ɵɵFactoryTarget.Injectable });
-PropertyTransactionReportService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyTransactionReportService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: PropertyTransactionReportService, decorators: [{
+PropertyTransactionReportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyTransactionReportService, deps: [{ token: PropertyService }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }], target: i0.ɵɵFactoryTarget.Injectable });
+PropertyTransactionReportService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyTransactionReportService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: PropertyTransactionReportService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15550,9 +15505,9 @@ class TransactionCalculationService {
         return bankTransactions.sumBy('amount') - allocations.getByBankTransactionsIds(bankTransactions.getIds()).sumBy('amount');
     }
 }
-TransactionCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-TransactionCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionCalculationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: TransactionCalculationService, decorators: [{
+TransactionCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+TransactionCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionCalculationService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionCalculationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15585,7 +15540,7 @@ class LogbookBestPeriodService {
                 .subscribe(([details, logbooks]) => {
                 let period;
                 // calculate current initial best period
-                if ((details === null || details === void 0 ? void 0 : details.isManual) || !(details === null || details === void 0 ? void 0 : details.isLogbookMethod()) || !logbooks.isBestPeriodExist()) {
+                if (details?.isManual || !details?.isLogbookMethod() || !logbooks.isBestPeriodExist()) {
                     period = null;
                 }
                 else {
@@ -15612,9 +15567,9 @@ class LogbookBestPeriodService {
         });
     }
 }
-LogbookBestPeriodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LogbookBestPeriodService, deps: [{ token: VehicleClaimDetailsService }, { token: VehicleClaimService }, { token: VehicleLogbookService }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
-LogbookBestPeriodService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LogbookBestPeriodService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: LogbookBestPeriodService, decorators: [{
+LogbookBestPeriodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: LogbookBestPeriodService, deps: [{ token: VehicleClaimDetailsService }, { token: VehicleClaimService }, { token: VehicleLogbookService }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
+LogbookBestPeriodService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: LogbookBestPeriodService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: LogbookBestPeriodService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15655,9 +15610,9 @@ class XlsxService {
         return xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });
     }
 }
-XlsxService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: XlsxService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-XlsxService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: XlsxService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: XlsxService, decorators: [{
+XlsxService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: XlsxService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+XlsxService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: XlsxService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: XlsxService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15746,7 +15701,7 @@ function taxReviewFilterPredicate(data, filter) {
  * @TODO rename to AbstractFormGroup
  * @TODO Alex TT-2190: refactor: check and improve logic
  */
-class AbstractForm extends FormGroup {
+class AbstractForm extends UntypedFormGroup {
     constructor(controls, model, validatorOrOpts, asyncValidator) {
         super(controls, validatorOrOpts, asyncValidator);
         /**
@@ -15807,240 +15762,70 @@ class AbstractForm extends FormGroup {
 }
 
 /**
- * Check if at least one form field is true, otherwise form is invalid.
- * Use with groups of boolean form controls (checkbox, toggle, etc.)
- */
-function atLeastOneCheckedValidator() {
-    return (formGroup) => {
-        return Object.values(formGroup.controls)
-            .find((control) => control.value) ? null : { nothingChecked: true };
-    };
-}
-
-/**
- * Validation function for autocomplete fields. Checks that the user should select a value from a list rather than type in input field
- * @TODO Alex: create class AppValidators with static methods and move there all custom validators (line Angular Validators)
+ * Validator for address, check if corelogic suggestion selected correctly
  */
-function autocompleteValidator() {
-    return (control) => {
-        return (!control.value || (typeof control.value === 'object')) ? null : { notFromList: true };
-    };
-}
-
-function conditionalValidator(condition, validator) {
-    return function (control) {
-        revalidateOnChanges(control);
-        if (control && control.parent) {
-            if (condition(control.parent)) {
-                return validator(control);
-            }
+function addressCorelogicValidator() {
+    return (form) => {
+        // we are interested in corelogic ids only for Australian addresses
+        if (!form.isAustraliaSelected()) {
+            return null;
+        }
+        // we need at least corelogic locality id to get growth percent
+        const locIdControl = form.get('corelogicLocId');
+        if (locIdControl.enabled && locIdControl.hasError('required')) {
+            return { address: 'City, state or postal code not specified' };
         }
         return null;
     };
 }
-/**
- * Conditional validator depends on other fields and should be updated on each form value change
- */
-function revalidateOnChanges(control) {
-    if (control && control.parent && !control['_revalidateOnChanges']) {
-        control['_revalidateOnChanges'] = true;
-        control.parent.valueChanges.pipe(distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)))
-            .subscribe(() => {
-            control.updateValueAndValidity({ emitEvent: false });
-        });
-    }
-    return;
-}
 
 /**
- * Regular expressions that are used to check password strength and valid values
+ * Address form. Works with corelogic or manual address
  */
-const PASSWORD_REGEXPS = {
-    medium: /(((?=.*[a-z])(?=.*[A-Z]))|((?=.*[a-z])(?=.*[0-9]))|((?=.*[A-Z])(?=.*[0-9])))(?=.{6,})/,
-    strong: /(((?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&*]))|((?=.*[a-z])(?=.*[0-9])(?=.*[!@#$%^&*]))|((?=.*[A-Z])(?=.*[0-9]))(?=.*[!@#$%^&*]))(?=.{8,})/,
-    format: /^[0-9a-zA-Z!@$!%*?&#]*$/
-};
-function passwordValidator() {
-    return (control) => {
-        if (!PASSWORD_REGEXPS.format.test(control.value)) {
-            return { passwordInvalid: true };
+class AddressForm extends AbstractForm {
+    constructor(
+    // no default value because Address form is always a child form. That's mean address value always passed and then default value never work.
+    // even if null passed, default value will not work
+    address) {
+        super({
+            // prefill search input with address string for edit case
+            searchQuery: new UntypedFormControl(address?.address ? address.nameLong : null, Validators.required),
+            type: new UntypedFormControl(address?.type || AddressTypeEnum.STREET, Validators.required),
+            // corelogic fields (required for Australia and disabled for other countries)
+            corelogicLocId: new UntypedFormControl({ value: address?.corelogicLocId, disabled: true }, Validators.required),
+            corelogicRefId: new UntypedFormControl({ value: address?.corelogicRefId, disabled: true }),
+            // manual fields (using when address not found in corelogic)
+            unitNumber: new UntypedFormControl({ value: address?.unitNumber, disabled: true }),
+            address: new UntypedFormControl({ value: address?.address, disabled: true }, Validators.required),
+            streetNumber: new UntypedFormControl({ value: address?.streetNumber, disabled: true }, [Validators.required, Validators.pattern(AddressForm.streetNumberPattern)]),
+            street: new UntypedFormControl({ value: address?.street, disabled: true }, Validators.required),
+            city: new UntypedFormControl({ value: address?.city, disabled: true }, Validators.required),
+            state: new UntypedFormControl({ value: address?.state, disabled: true }, Validators.required),
+            postcode: new UntypedFormControl({ value: address?.postcode, disabled: true }, Validators.required),
+            country: new UntypedFormControl({ value: address?.country || Country.australia, disabled: true }, Validators.required)
+        }, address, addressCorelogicValidator());
+        /**
+         * Emit event to search address in corelogic when user filled enough data for corelogic
+         */
+        this.onSearch = new EventEmitter();
+        if (this.isAustraliaSelected()) {
+            this.enableCorelogicFields();
         }
-        if (!PASSWORD_REGEXPS.medium.test(control.value)) {
-            return { passwordWeak: true };
+        this.listenEvents();
+    }
+    /**
+     * Get search query for corelogic location search based on manual fields values
+     */
+    get manualSearchQuery() {
+        // nothing to search when manual fields are invalid or when selected country is not Australia because we don't need to use corelogic for other countries
+        if (!this.isManualSearchAvailable() || !this.isAustraliaSelected()) {
+            return '';
         }
-        return null;
-    };
-}
-
-function passwordMatchValidator(newPassControlName, confirmPassControlName) {
-    return (group) => {
-        const passwordControl = group.get(newPassControlName);
-        const confirmControl = group.get(confirmPassControlName);
-        if (confirmControl.errors && !confirmControl.hasError('passwordMismatch')) {
-            // return if another validator has already found an error on the confirmControl
-            return this;
-        }
-        if (passwordControl.value !== confirmControl.value) {
-            confirmControl.setErrors({ passwordMismatch: true });
-        }
-        else {
-            confirmControl.setErrors(null);
-        }
-    };
-}
-
-var MessagesEnum$1;
-(function (MessagesEnum) {
-    MessagesEnum["INVALID_DATE"] = "The date should not be before $1";
-})(MessagesEnum$1 || (MessagesEnum$1 = {}));
-
-/**
- * Validation function, that checks If date form value is more than provided date
- */
-function minDateValidator(date, message = MessagesEnum$1.INVALID_DATE.replace('$1', new DatePipe('en-US').transform(date))) {
-    return (control) => {
-        if (!control.value) {
-            return null;
-        }
-        // form control value can be as a Moment object - we wrap it in "new Date()" to work with it like with JS Date
-        if (new Date(control.value) >= new Date(date)) {
-            return null;
-        }
-        return { minDate: message };
-    };
-}
-
-/**
- * Validator that check if sum amount of provided fields is greater than provided sum
- * @param field to check in each formArray element
- * @param summary to compare with fields sum
- * @param fieldAlias to show it in error message
- */
-function fieldsSumValidator(field, summary = 100, fieldAlias) {
-    return (formArray) => {
-        // calculate sum of desired fields in formArray control
-        const fieldsSum = formArray['controls']
-            .reduce((acc, group) => acc += group.get(field).value, 0);
-        if (fieldsSum <= summary) {
-            return null;
-        }
-        else {
-            return {
-                fieldsSum: {
-                    name: field,
-                    alias: fieldAlias,
-                    summary
-                }
-            };
-        }
-    };
-}
-
-/**
- * Validation function, that checks If provided date is within a current financial year
- */
-function currentFinYearValidator() {
-    const currentFinYear = new FinancialYear();
-    return (control) => {
-        if (!control.value || control.value >= currentFinYear.startDate && control.value <= currentFinYear.endDate) {
-            return null;
-        }
-        return { notCurrentFinYear: true };
-    };
-}
-
-const MAX_SIZE = 4194304;
-class FileValidator {
-    // File max size check
-    static fileMaxSize(maxSize = MAX_SIZE) {
-        const validatorFn = (file) => {
-            return file.size > maxSize ? { fileMaxSize: { maxSize } } : null;
-        };
-        return FileValidator.fileValidation(validatorFn);
-    }
-    // File extension check
-    static fileExtensions(allowedExtensions = DOCUMENT_FILE_TYPES.all) {
-        const validatorFn = (file) => {
-            return allowedExtensions.includes(file.type) ? null : { fileExtension: { allowedExtensions: allowedExtensions.join() } };
-        };
-        return FileValidator.fileValidation(validatorFn);
-    }
-    static fileValidation(validatorFn) {
-        return (formControl) => {
-            if (!formControl.value) {
-                return null;
-            }
-            return validatorFn(formControl.value);
-        };
-    }
-}
-
-/**
- * Validator for address, check if corelogic suggestion selected correctly
- */
-function addressCorelogicValidator() {
-    return (form) => {
-        if (form.isCorelogicRequired) {
-            if (form.get('corelogicLocId').hasError('required')) {
-                return { address: 'Street, city, state or postal code not specified' };
-            }
-            if (form.get('corelogicRefId').hasError('required')) {
-                return { address: 'Unit/House number not specified' };
-            }
-        }
-        return null;
-    };
-}
-
-/**
- * Address form. Works with corelogic or manual address
- */
-class AddressForm extends AbstractForm {
-    /**
-     * @param address instance which should be created/edited
-     * @param isCorelogicRequired for example, for property we need corelogic location even for manual address,
-     * so we have to search corelogic location based on manual fields values
-     */
-    constructor(address = plainToClass(Address, {}), isCorelogicRequired = false) {
-        super({
-            // prefill search input with address string for edit case
-            searchQuery: new FormControl(address.address ? address.nameLong : null, Validators.required),
-            type: new FormControl(address.type | AddressTypeEnum.STREET, Validators.required),
-            // Corelogic fields
-            corelogicLocId: new FormControl(address.corelogicLocId),
-            corelogicRefId: new FormControl(address.corelogicRefId),
-            // manual fields
-            unitNumber: new FormControl({ value: address.unitNumber, disabled: true }),
-            address: new FormControl({ value: address.address, disabled: true }, Validators.required),
-            streetNumber: new FormControl({ value: address.streetNumber, disabled: true }, [Validators.required, Validators.pattern(AddressForm.streetNumberPattern)]),
-            street: new FormControl({ value: address.street, disabled: true }, Validators.required),
-            city: new FormControl({ value: address.city, disabled: true }, Validators.required),
-            state: new FormControl({ value: address.state, disabled: true }, Validators.required),
-            postcode: new FormControl({ value: address.postcode, disabled: true }, Validators.required),
-            country: new FormControl({ value: address.country || Country.australia, disabled: true }, conditionalValidator(() => !isCorelogicRequired, Validators.required))
-        }, address, addressCorelogicValidator());
-        this.isCorelogicRequired = isCorelogicRequired;
-        /**
-         * Emit event to search address in corelogic when user filled enough data for corelogic
-         */
-        this.onSearch = new EventEmitter();
-        this.listenEvents();
-    }
-    /**
-     * Get search query for corelogic location search based on manual fields values
-     */
-    get manualSearchQuery() {
-        if (!this.isManualSearchAvailable()) {
-            return '';
-        }
-        return this.currentValue.nameLong;
+        // for manual mode we search corelogic for city (location) and ignore street
+        return `${this.get('city').value} ${this.get('state').value} ${this.get('postcode').value}`;
     }
     listenEvents() {
         this.listenSearchQueryChanges();
-        // no need to search corelogic locality when corelogic is not required
-        if (this.isCorelogicRequired) {
-            this.listenManualFieldsChanges();
-        }
     }
     /**
      * Handle corelogic suggestion select
@@ -16056,25 +15841,29 @@ class AddressForm extends AbstractForm {
             corelogicRefId: suggestion.propertyId
         });
     }
+    /**
+     * Check if Australia is selected in country field
+     */
+    isAustraliaSelected() {
+        return this.get('country').value?.id === Country.australia.id;
+    }
     /**
      * Enable manual mode
      */
     switchToManual() {
         this.isManual = true;
         this.get('searchQuery').disable();
+        this.get('unitNumber').enable();
         this.get('address').enable();
         this.get('streetNumber').enable();
         this.get('street').enable();
-        this.get('unitNumber').enable();
         this.get('city').enable();
         this.get('state').enable();
         this.get('postcode').enable();
-        if (!this.isCorelogicRequired) {
-            this.get('country').enable();
-            this.get('corelogicLocId').disable();
-            this.get('corelogicRefId').disable();
-        }
+        this.get('country').enable();
+        this.listenManualFieldsChanges();
         this.listenStreetFieldsChanges();
+        this.listenCountryChanges();
     }
     /**
      * Emit event to search address in corelogic when search field changes
@@ -16106,7 +15895,7 @@ class AddressForm extends AbstractForm {
      * Check if all fields required for manual corelogic search are filled before request sending
      */
     isManualSearchAvailable() {
-        return this.get('address').valid && this.get('city').valid && this.get('state').valid && this.get('postcode').valid;
+        return this.get('city').valid && this.get('state').valid && this.get('postcode').valid;
     }
     /**
      * When corelogic is required we have to search address even for manual address
@@ -16118,7 +15907,7 @@ class AddressForm extends AbstractForm {
         // delay to avoid search request for each value change
         debounceTime(AddressForm.searchDelay), 
         // do nothing when not all required fields filled
-        filter(() => this.isManualSearchAvailable()), map(() => this.manualSearchQuery), 
+        filter(() => this.isManualSearchAvailable() && this.isAustraliaSelected()), map(() => this.manualSearchQuery), 
         // skip when value not changed
         distinctUntilChanged())
             .subscribe(() => {
@@ -16136,6 +15925,26 @@ class AddressForm extends AbstractForm {
             this.get('address').setValue(`${this.get('streetNumber').value} ${this.get('street').value}`);
         });
     }
+    enableCorelogicFields() {
+        this.get('corelogicLocId').enable();
+        this.get('corelogicRefId').enable();
+    }
+    disableCorelogicFields() {
+        this.get('corelogicLocId').disable();
+        this.get('corelogicRefId').disable();
+    }
+    /**
+     * Corelogic loc id is required for Australian addresses
+     */
+    listenCountryChanges() {
+        this.get('country').valueChanges.subscribe(() => {
+            if (this.isAustraliaSelected()) {
+                this.enableCorelogicFields();
+                return;
+            }
+            this.disableCorelogicFields();
+        });
+    }
 }
 /**
  * Min search query required length
@@ -16157,19 +15966,19 @@ AddressForm.streetNumberPattern = /^[^\s]+$/;
 class LoanForm extends AbstractForm {
     constructor(loan = plainToClass(Loan, {})) {
         super({
-            type: new FormControl(loan.type, Validators.required),
-            amount: new FormControl(loan.amount, Validators.required),
-            interestRate: new FormControl(loan.interestRate, [Validators.required, Validators.min(0), Validators.max(100)]),
-            commencementDate: new FormControl(loan.commencementDate, Validators.required),
-            repaymentAmount: new FormControl(loan.repaymentAmount, Validators.required),
-            repaymentFrequency: new FormControl(loan.repaymentFrequency, Validators.required),
-            term: new FormControl(loan.term, Validators.required),
+            type: new UntypedFormControl(loan.type, Validators.required),
+            amount: new UntypedFormControl(loan.amount, Validators.required),
+            interestRate: new UntypedFormControl(loan.interestRate, [Validators.required, Validators.min(0), Validators.max(100)]),
+            commencementDate: new UntypedFormControl(loan.commencementDate, Validators.required),
+            repaymentAmount: new UntypedFormControl(loan.repaymentAmount, Validators.required),
+            repaymentFrequency: new UntypedFormControl(loan.repaymentFrequency, Validators.required),
+            term: new UntypedFormControl(loan.term, Validators.required),
             // interestType is predefined for vehicle loans
-            interestType: new FormControl({ value: loan.interestType, disabled: !loan.bankAccount }, Validators.required),
+            interestType: new UntypedFormControl({ value: loan.interestType, disabled: !loan.bankAccount }, Validators.required),
             // availableRedraw is predefined for vehicle loans
-            availableRedraw: new FormControl({ value: loan.availableRedraw, disabled: !loan.bankAccount }, Validators.required),
+            availableRedraw: new UntypedFormControl({ value: loan.availableRedraw, disabled: !loan.bankAccount }, Validators.required),
             // repaymentType is predefined for vehicle loans
-            repaymentType: new FormControl({ value: loan.repaymentType, disabled: !loan.bankAccount }, Validators.required),
+            repaymentType: new UntypedFormControl({ value: loan.repaymentType, disabled: !loan.bankAccount }, Validators.required),
         }, loan);
         this.loan = loan;
         // Set data which always the same for vehicle loans
@@ -16231,17 +16040,186 @@ class LoanForm extends AbstractForm {
 }
 LoanForm.mortgageLoanTypes = [LoanTypeEnum.MORTGAGE, LoanTypeEnum.HOME_EQUITY_LINE_OF_CREDIT, LoanTypeEnum.HOME_LOAN];
 
+/**
+ * Check if at least one form field is true, otherwise form is invalid.
+ * Use with groups of boolean form controls (checkbox, toggle, etc.)
+ */
+function atLeastOneCheckedValidator() {
+    return (formGroup) => {
+        return Object.values(formGroup.controls)
+            .find((control) => control.value) ? null : { nothingChecked: true };
+    };
+}
+
+/**
+ * Validation function for autocomplete fields. Checks that the user should select a value from a list rather than type in input field
+ * @TODO Alex: create class AppValidators with static methods and move there all custom validators (line Angular Validators)
+ */
+function autocompleteValidator() {
+    return (control) => {
+        return (!control.value || (typeof control.value === 'object')) ? null : { notFromList: true };
+    };
+}
+
+function conditionalValidator(condition, validator) {
+    return function (control) {
+        revalidateOnChanges(control);
+        if (control && control.parent) {
+            if (condition(control.parent)) {
+                return validator(control);
+            }
+        }
+        return null;
+    };
+}
+/**
+ * Conditional validator depends on other fields and should be updated on each form value change
+ */
+function revalidateOnChanges(control) {
+    if (control && control.parent && !control['_revalidateOnChanges']) {
+        control['_revalidateOnChanges'] = true;
+        control.parent.valueChanges.pipe(distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)))
+            .subscribe(() => {
+            control.updateValueAndValidity({ emitEvent: false });
+        });
+    }
+    return;
+}
+
+/**
+ * Regular expressions that are used to check password strength and valid values
+ */
+const PASSWORD_REGEXPS = {
+    medium: /(((?=.*[a-z])(?=.*[A-Z]))|((?=.*[a-z])(?=.*[0-9]))|((?=.*[A-Z])(?=.*[0-9])))(?=.{6,})/,
+    strong: /(((?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&*]))|((?=.*[a-z])(?=.*[0-9])(?=.*[!@#$%^&*]))|((?=.*[A-Z])(?=.*[0-9]))(?=.*[!@#$%^&*]))(?=.{8,})/,
+    format: /^[0-9a-zA-Z!@$!%*?&#]*$/
+};
+function passwordValidator() {
+    return (control) => {
+        if (!PASSWORD_REGEXPS.format.test(control.value)) {
+            return { passwordInvalid: true };
+        }
+        if (!PASSWORD_REGEXPS.medium.test(control.value)) {
+            return { passwordWeak: true };
+        }
+        return null;
+    };
+}
+
+function passwordMatchValidator(newPassControlName, confirmPassControlName) {
+    return (group) => {
+        const passwordControl = group.get(newPassControlName);
+        const confirmControl = group.get(confirmPassControlName);
+        if (confirmControl.errors && !confirmControl.hasError('passwordMismatch')) {
+            // return if another validator has already found an error on the confirmControl
+            return this;
+        }
+        if (passwordControl.value !== confirmControl.value) {
+            confirmControl.setErrors({ passwordMismatch: true });
+        }
+        else {
+            confirmControl.setErrors(null);
+        }
+    };
+}
+
+var MessagesEnum$1;
+(function (MessagesEnum) {
+    MessagesEnum["INVALID_DATE"] = "The date should not be before $1";
+})(MessagesEnum$1 || (MessagesEnum$1 = {}));
+
+/**
+ * Validation function, that checks If date form value is more than provided date
+ */
+function minDateValidator(date, message = MessagesEnum$1.INVALID_DATE.replace('$1', new DatePipe('en-US').transform(date))) {
+    return (control) => {
+        if (!control.value) {
+            return null;
+        }
+        // form control value can be as a Moment object - we wrap it in "new Date()" to work with it like with JS Date
+        if (new Date(control.value) >= new Date(date)) {
+            return null;
+        }
+        return { minDate: message };
+    };
+}
+
+/**
+ * Validator that check if sum amount of provided fields is greater than provided sum
+ * @param field to check in each formArray element
+ * @param summary to compare with fields sum
+ * @param fieldAlias to show it in error message
+ */
+function fieldsSumValidator(field, summary = 100, fieldAlias) {
+    return (formArray) => {
+        // calculate sum of desired fields in formArray control
+        const fieldsSum = formArray['controls']
+            .reduce((acc, group) => acc += group.get(field).value, 0);
+        if (fieldsSum <= summary) {
+            return null;
+        }
+        else {
+            return {
+                fieldsSum: {
+                    name: field,
+                    alias: fieldAlias,
+                    summary
+                }
+            };
+        }
+    };
+}
+
+/**
+ * Validation function, that checks If provided date is within a current financial year
+ */
+function currentFinYearValidator() {
+    const currentFinYear = new FinancialYear();
+    return (control) => {
+        if (!control.value || control.value >= currentFinYear.startDate && control.value <= currentFinYear.endDate) {
+            return null;
+        }
+        return { notCurrentFinYear: true };
+    };
+}
+
+const MAX_SIZE = 4194304;
+class FileValidator {
+    // File max size check
+    static fileMaxSize(maxSize = MAX_SIZE) {
+        const validatorFn = (file) => {
+            return file.size > maxSize ? { fileMaxSize: { maxSize } } : null;
+        };
+        return FileValidator.fileValidation(validatorFn);
+    }
+    // File extension check
+    static fileExtensions(allowedExtensions = DOCUMENT_FILE_TYPES.all) {
+        const validatorFn = (file) => {
+            return allowedExtensions.includes(file.type) ? null : { fileExtension: { allowedExtensions: allowedExtensions.join() } };
+        };
+        return FileValidator.fileValidation(validatorFn);
+    }
+    static fileValidation(validatorFn) {
+        return (formControl) => {
+            if (!formControl.value) {
+                return null;
+            }
+            return validatorFn(formControl.value);
+        };
+    }
+}
+
 /**
  * Form array with bank account properties
  * @TODO create AbstractFormArray
  */
-class BankAccountPropertiesForm extends FormArray {
+class BankAccountPropertiesForm extends UntypedFormArray {
     constructor(bankAccountProperties) {
-        super(((bankAccountProperties === null || bankAccountProperties === void 0 ? void 0 : bankAccountProperties.length) ? bankAccountProperties : [plainToClass(BankAccountProperty, {})])
+        super((bankAccountProperties?.length ? bankAccountProperties : [plainToClass(BankAccountProperty, {})])
             .map((bankAccountProperty) => {
-            return new FormGroup({
-                property: new FormControl(bankAccountProperty === null || bankAccountProperty === void 0 ? void 0 : bankAccountProperty.property, Validators.required),
-                percent: new FormControl(bankAccountProperty.percent, Validators.required)
+            return new UntypedFormGroup({
+                property: new UntypedFormControl(bankAccountProperty?.property, Validators.required),
+                percent: new UntypedFormControl(bankAccountProperty.percent, Validators.required)
             });
         }), [
             conditionalValidator((control) => control.get('tankType').value === TankTypeEnum.PROPERTY, Validators.required),
@@ -16249,10 +16227,10 @@ class BankAccountPropertiesForm extends FormArray {
         ]);
     }
     add() {
-        this.push(new FormGroup({
-            property: new FormControl(null, Validators.required),
+        this.push(new UntypedFormGroup({
+            property: new UntypedFormControl(null, Validators.required),
             // @TODO disable for loans
-            percent: new FormControl({ value: this.getRemainingPercent(), disabled: !this.at(0).contains('percent') }, Validators.required),
+            percent: new UntypedFormControl({ value: this.getRemainingPercent(), disabled: !this.at(0).contains('percent') }, Validators.required),
             // @TODO enable for loans
             // amount: new FormControl(
             //   {value: this.bankAccount.currentBalance * bankAccountProperty.percent / 100},
@@ -16294,31 +16272,31 @@ class BankAccountPropertiesForm extends FormArray {
 class SoleBusinessForm extends AbstractForm {
     constructor(business = plainToClass(SoleBusiness, {})) {
         super({
-            name: new FormControl(business.name, Validators.required),
-            activity: new FormControl(business.activity, Validators.required),
-            description: new FormControl(business.description),
-            website: new FormControl(business.website)
+            name: new UntypedFormControl(business.name, Validators.required),
+            activity: new UntypedFormControl(business.activity, Validators.required),
+            description: new UntypedFormControl(business.description),
+            website: new UntypedFormControl(business.website)
         }, business);
         this.business = business;
         // User have to create income source with new business.
         // Income source is not able for edit business
         if (!business.id) {
             // @TODO Alex (TT-2304): move to separated form class
-            this.addControl('incomeSource', new FormGroup({
-                type: new FormControl(IncomeSourceTypeEnum.SOLE, Validators.required),
-                name: new FormControl(null, Validators.required),
-                soleForecasts: new FormArray([
-                    new FormGroup({
-                        financialYear: new FormControl(new FinancialYear().year, Validators.required),
-                        amount: new FormControl(null, Validators.required),
-                        taxInstalments: new FormControl(null, Validators.required)
+            this.addControl('incomeSource', new UntypedFormGroup({
+                type: new UntypedFormControl(IncomeSourceTypeEnum.SOLE, Validators.required),
+                name: new UntypedFormControl(null, Validators.required),
+                soleForecasts: new UntypedFormArray([
+                    new UntypedFormGroup({
+                        financialYear: new UntypedFormControl(new FinancialYear().year, Validators.required),
+                        amount: new UntypedFormControl(null, Validators.required),
+                        taxInstalments: new UntypedFormControl(null, Validators.required)
                     })
                 ])
             }));
-            this.addControl('losses', new FormArray([
-                new FormGroup({
-                    financialYear: new FormControl(new FinancialYear().year),
-                    openBalance: new FormControl(null, [Validators.required, Validators.min(0)])
+            this.addControl('losses', new UntypedFormArray([
+                new UntypedFormGroup({
+                    financialYear: new UntypedFormControl(new FinancialYear().year),
+                    openBalance: new UntypedFormControl(null, [Validators.required, Validators.min(0)])
                 })
             ]));
         }
@@ -16359,13 +16337,13 @@ class SoleBusinessForm extends AbstractForm {
  * @TODO create AbstractFormArray
  * @TODO Alex/Vik (TT-2184): copypasted from bank-account-properties.form, improve logic and create common parent class maybe
  */
-class SoleBusinessAllocationsForm extends FormArray {
+class SoleBusinessAllocationsForm extends UntypedFormArray {
     constructor(businessAllocations) {
-        super(((businessAllocations === null || businessAllocations === void 0 ? void 0 : businessAllocations.length) ? businessAllocations : [plainToClass(SoleBusinessAllocation, {})])
+        super((businessAllocations?.length ? businessAllocations : [plainToClass(SoleBusinessAllocation, {})])
             .map((businessAllocation) => {
-            return new FormGroup({
-                business: new FormControl(businessAllocation === null || businessAllocation === void 0 ? void 0 : businessAllocation.business, Validators.required),
-                percent: new FormControl(businessAllocation.percent, Validators.required)
+            return new UntypedFormGroup({
+                business: new UntypedFormControl(businessAllocation?.business, Validators.required),
+                percent: new UntypedFormControl(businessAllocation.percent, Validators.required)
             });
         }), [
             conditionalValidator((control) => control.get('tankType').value === TankTypeEnum.SOLE, Validators.required),
@@ -16373,10 +16351,10 @@ class SoleBusinessAllocationsForm extends FormArray {
         ]);
     }
     add() {
-        this.push(new FormGroup({
-            business: new FormControl(null, Validators.required),
+        this.push(new UntypedFormGroup({
+            business: new UntypedFormControl(null, Validators.required),
             // @TODO disable for loans
-            percent: new FormControl({ value: this.getRemainingPercent(), disabled: !this.at(0).contains('percent') }, Validators.required),
+            percent: new UntypedFormControl({ value: this.getRemainingPercent(), disabled: !this.at(0).contains('percent') }, Validators.required),
             // @TODO enable for loans
             // amount: new FormControl(
             //   {value: this.bankAccount.currentBalance * businessAllocation.percent / 100},
@@ -16417,12 +16395,11 @@ class SoleBusinessAllocationsForm extends FormArray {
 
 class SoleBusinessLossForm extends AbstractForm {
     constructor(loss, profit) {
-        var _a;
         super({
-            openBalance: new FormControl(loss.openBalance, [Validators.required, Validators.min(0)]),
-            offsetRule: new FormControl((_a = loss.offsetRule) === null || _a === void 0 ? void 0 : _a.id),
+            openBalance: new UntypedFormControl(loss.openBalance, [Validators.required, Validators.min(0)]),
+            offsetRule: new UntypedFormControl(loss.offsetRule?.id),
             // sum of depreciations/transactions claim amount - openBalance
-            balance: new FormControl({ value: (profit - loss.openBalance).toFixed(2), disabled: true }),
+            balance: new UntypedFormControl({ value: (profit - loss.openBalance).toFixed(2), disabled: true }),
         }, loss);
         this.loss = loss;
         this.get('openBalance').valueChanges.subscribe((openBalance) => {
@@ -16441,13 +16418,13 @@ class SoleBusinessLossForm extends AbstractForm {
 class SoleContactForm extends AbstractForm {
     constructor(contact = plainToClass(SoleContact, {})) {
         super({
-            name: new FormControl(contact.name, Validators.required),
-            abn: new FormControl(contact.abn, [Validators.minLength(11), Validators.maxLength(11)]),
-            firstName: new FormControl(contact.firstName, Validators.required),
-            lastName: new FormControl(contact.lastName, Validators.required),
-            email: new FormControl(contact.email, [Validators.required, Validators.email]),
-            phone: new FormControl(contact.phone),
-            address: new AddressForm(contact.address || plainToClass(Address, {}))
+            name: new UntypedFormControl(contact.name, Validators.required),
+            abn: new UntypedFormControl(contact.abn, [Validators.minLength(11), Validators.maxLength(11)]),
+            firstName: new UntypedFormControl(contact.firstName, Validators.required),
+            lastName: new UntypedFormControl(contact.lastName, Validators.required),
+            email: new UntypedFormControl(contact.email, [Validators.required, Validators.email]),
+            phone: new UntypedFormControl(contact.phone),
+            address: new UntypedFormControl(contact.address)
         }, contact);
     }
 }
@@ -16455,7 +16432,7 @@ class SoleContactForm extends AbstractForm {
 class SoleDepreciationMethodForm extends AbstractForm {
     constructor(soleDepreciationMethod) {
         super({
-            method: new FormControl(soleDepreciationMethod.method)
+            method: new UntypedFormControl(soleDepreciationMethod.method)
         }, soleDepreciationMethod);
     }
 }
@@ -16475,21 +16452,20 @@ function requiredLengthValidator(length) {
 class SoleDetailsForm extends AbstractForm {
     constructor(soleDetails) {
         super({
-            abn: new FormControl(soleDetails.abn, [Validators.required, requiredLengthValidator(11)]),
-            isGST: new FormControl(soleDetails.isGST || false)
+            abn: new UntypedFormControl(soleDetails.abn, [Validators.required, requiredLengthValidator(11)]),
+            isGST: new UntypedFormControl(soleDetails.isGST || false)
         }, soleDetails);
     }
 }
 
 class SoleInvoiceItemForm extends AbstractForm {
     constructor(item) {
-        var _a;
         super({
-            description: new FormControl(item.description, [Validators.required, Validators.maxLength(SoleInvoiceItemForm.maxDescriptionLength)]),
-            quantity: new FormControl(item.quantity, Validators.required),
-            price: new FormControl(item.price, Validators.required),
-            isGST: new FormControl({ value: item.isGST || false, disabled: !((_a = item.chartAccounts) === null || _a === void 0 ? void 0 : _a.isGST) }),
-            chartAccounts: new FormControl(item.chartAccounts, Validators.required),
+            description: new UntypedFormControl(item.description, [Validators.required, Validators.maxLength(SoleInvoiceItemForm.maxDescriptionLength)]),
+            quantity: new UntypedFormControl(item.quantity, Validators.required),
+            price: new UntypedFormControl(item.price, Validators.required),
+            isGST: new UntypedFormControl({ value: item.isGST || false, disabled: !item.chartAccounts?.isGST }),
+            chartAccounts: new UntypedFormControl(item.chartAccounts, Validators.required),
         }, item);
     }
 }
@@ -16504,22 +16480,22 @@ class SoleInvoiceForm extends AbstractForm {
     // default template to be preselected
     defaultTemplate) {
         super({
-            commonData: new FormGroup({
-                dateFrom: new FormControl(invoice.dateFrom || new Date(), Validators.required),
-                dateTo: new FormControl(invoice.dateTo, Validators.required),
-                payer: new FormControl(invoice.payer, Validators.required),
-                taxType: new FormControl(invoice.taxType, Validators.required),
-                bankAccount: new FormControl(invoice.bankAccount, Validators.required),
-                reference: new FormControl(invoice.reference)
+            commonData: new UntypedFormGroup({
+                dateFrom: new UntypedFormControl(invoice.dateFrom || new Date(), Validators.required),
+                dateTo: new UntypedFormControl(invoice.dateTo, Validators.required),
+                payer: new UntypedFormControl(invoice.payer, Validators.required),
+                taxType: new UntypedFormControl(invoice.taxType, Validators.required),
+                bankAccount: new UntypedFormControl(invoice.bankAccount, Validators.required),
+                reference: new UntypedFormControl(invoice.reference)
             }),
-            items: new FormArray((invoice.items || [plainToClass(SoleInvoiceItem, {})]).map((item) => new SoleInvoiceItemForm(item))),
+            items: new UntypedFormArray((invoice.items || [plainToClass(SoleInvoiceItem, {})]).map((item) => new SoleInvoiceItemForm(item))),
         }, invoice);
         this.invoice = invoice;
         this.soleDetailsGST = soleDetailsGST;
         this.defaultTemplate = defaultTemplate;
         // we need invoice template only for new invoices
         if (!invoice.id) {
-            (this.commonData).addControl('template', new FormControl(this.defaultTemplate));
+            (this.commonData).addControl('template', new UntypedFormControl(this.defaultTemplate));
             // user can have no template, but he can add it from this form
             if (this.defaultTemplate) {
                 this.updateTemplateRelatedFields(this.defaultTemplate);
@@ -16591,7 +16567,7 @@ class SoleInvoiceForm extends AbstractForm {
             this.items.controls.forEach((itemForm) => {
                 const chartAccounts = itemForm.get('chartAccounts').value;
                 // Item GST is available when invoice.taxType !== NONE ('No Tax')
-                if (type !== SoleInvoiceTaxTypeEnum.NO_TAX && (chartAccounts === null || chartAccounts === void 0 ? void 0 : chartAccounts.isGST)) {
+                if (type !== SoleInvoiceTaxTypeEnum.NO_TAX && chartAccounts?.isGST) {
                     this.enableItemGST(itemForm);
                     return;
                 }
@@ -16643,19 +16619,19 @@ class SoleInvoiceForm extends AbstractForm {
      */
     get currentValue() {
         const formRawValue = this.getRawValue();
-        return plainToClass(SoleInvoice, Object.assign({}, this.model, Object.assign(Object.assign({}, formRawValue.commonData), { items: formRawValue.items })));
+        return plainToClass(SoleInvoice, Object.assign({}, this.model, { ...formRawValue.commonData, items: formRawValue.items }));
     }
 }
 
 class SoleInvoiceTemplateForm extends AbstractForm {
     constructor(invoiceTemplate) {
         super({
-            name: new FormControl(invoiceTemplate.name, Validators.required),
+            name: new UntypedFormControl(invoiceTemplate.name, Validators.required),
             // taxType is always 'No Tax' when soleDetails.isGST === false
-            taxType: new FormControl(invoiceTemplate.taxType, Validators.required),
+            taxType: new UntypedFormControl(invoiceTemplate.taxType, Validators.required),
             // 32767 - max value because we have small int data type in database for this field, but we don't have actual max validation for term
-            term: new FormControl(invoiceTemplate.term, [Validators.required, Validators.min(0), Validators.max(32767)]),
-            bankAccount: new FormControl(invoiceTemplate.bankAccount, [Validators.required]),
+            term: new UntypedFormControl(invoiceTemplate.term, [Validators.required, Validators.min(0), Validators.max(32767)]),
+            bankAccount: new UntypedFormControl(invoiceTemplate.bankAccount, [Validators.required]),
         }, invoiceTemplate);
     }
 }
@@ -16667,18 +16643,18 @@ class SoleInvoiceTemplateForm extends AbstractForm {
 class BasReportForm extends AbstractForm {
     constructor(report, transactions, allocations, depreciations) {
         super({
-            dateFrom: new FormControl(report.dateFrom, Validators.required),
-            dateTo: new FormControl(report.dateTo, Validators.required),
-            income: new FormControl({ value: report.income, disabled: true }),
-            incomeGST: new FormControl({ value: report.incomeGST, disabled: true }, Validators.required),
-            expenseGST: new FormControl({ value: report.expenseGST, disabled: true }, Validators.required),
-            salary: new FormControl(report.salary, Validators.required),
-            taxWithheldSalary: new FormControl(report.taxWithheldSalary, Validators.required),
-            taxWithheldNoABN: new FormControl(report.taxWithheldNoABN, Validators.required),
-            taxWithheldTotal: new FormControl({ value: report.taxWithheldTotal || 0, disabled: true }),
-            paygTaxInstalment: new FormControl(report.paygTaxInstalment, Validators.required),
-            fuelTaxCredit: new FormControl(report.fuelTaxCredit, Validators.required),
-            gst: new FormControl({ value: report.gst, disabled: true }),
+            dateFrom: new UntypedFormControl(report.dateFrom, Validators.required),
+            dateTo: new UntypedFormControl(report.dateTo, Validators.required),
+            income: new UntypedFormControl({ value: report.income, disabled: true }),
+            incomeGST: new UntypedFormControl({ value: report.incomeGST, disabled: true }, Validators.required),
+            expenseGST: new UntypedFormControl({ value: report.expenseGST, disabled: true }, Validators.required),
+            salary: new UntypedFormControl(report.salary, Validators.required),
+            taxWithheldSalary: new UntypedFormControl(report.taxWithheldSalary, Validators.required),
+            taxWithheldNoABN: new UntypedFormControl(report.taxWithheldNoABN, Validators.required),
+            taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal || 0, disabled: true }),
+            paygTaxInstalment: new UntypedFormControl(report.paygTaxInstalment, Validators.required),
+            fuelTaxCredit: new UntypedFormControl(report.fuelTaxCredit, Validators.required),
+            gst: new UntypedFormControl({ value: report.gst, disabled: true }),
         }, report);
         this.report = report;
         // prefill income/expense data based on transactions/depreciations filtered by specified date
@@ -16717,13 +16693,13 @@ class BasReportForm extends AbstractForm {
 class BankAccountAllocationForm extends AbstractForm {
     constructor(bankAccount, controls) {
         super(merge(controls, {
-            tankType: new FormControl(bankAccount ? bankAccount.tankType : null, Validators.required)
+            tankType: new UntypedFormControl(bankAccount ? bankAccount.tankType : null, Validators.required)
         }), plainToClass(BankAccount, bankAccount || {}));
         this.bankAccount = bankAccount;
-        if (bankAccount === null || bankAccount === void 0 ? void 0 : bankAccount.isPropertyTank()) {
+        if (bankAccount?.isPropertyTank()) {
             this.addControl('bankAccountProperties', new BankAccountPropertiesForm(bankAccount.bankAccountProperties));
         }
-        if (bankAccount === null || bankAccount === void 0 ? void 0 : bankAccount.isSoleTank()) {
+        if (bankAccount?.isSoleTank()) {
             this.addControl('businessAllocations', new SoleBusinessAllocationsForm(bankAccount.businessAllocations));
         }
         this.listenEvents();
@@ -16733,15 +16709,14 @@ class BankAccountAllocationForm extends AbstractForm {
     }
     listenTankTypeChanges() {
         this.get('tankType').valueChanges.subscribe((tankType) => {
-            var _a, _b;
             this.removeControl('bankAccountProperties');
             this.removeControl('businessAllocations');
             switch (tankType) {
                 case TankTypeEnum.PROPERTY:
-                    this.addControl('bankAccountProperties', new BankAccountPropertiesForm((_a = this.bankAccount) === null || _a === void 0 ? void 0 : _a.bankAccountProperties));
+                    this.addControl('bankAccountProperties', new BankAccountPropertiesForm(this.bankAccount?.bankAccountProperties));
                     break;
                 case TankTypeEnum.SOLE:
-                    this.addControl('businessAllocations', new SoleBusinessAllocationsForm((_b = this.bankAccount) === null || _b === void 0 ? void 0 : _b.businessAllocations));
+                    this.addControl('businessAllocations', new SoleBusinessAllocationsForm(this.bankAccount?.businessAllocations));
                     break;
             }
         });
@@ -16778,10 +16753,10 @@ class BankAccountImportForm extends BankAccountAllocationForm {
 class BankAccountAddManualForm extends BankAccountAllocationForm {
     constructor(connection) {
         super(null, {
-            type: new FormControl(null, Validators.required),
-            accountName: new FormControl(null, Validators.required),
-            currentBalance: new FormControl(null, Validators.required),
-            accountNumber: new FormControl(null, [Validators.required, Validators.pattern(BankAccountAddManualForm.accountNumberPattern)])
+            type: new UntypedFormControl(null, Validators.required),
+            accountName: new UntypedFormControl(null, Validators.required),
+            currentBalance: new UntypedFormControl(null, Validators.required),
+            accountNumber: new UntypedFormControl(null, [Validators.required, Validators.pattern(BankAccountAddManualForm.accountNumberPattern)])
         });
         this.connection = connection;
     }
@@ -16851,9 +16826,9 @@ function atLeastOneEnabledValidator(arrayName) {
 class BankAccountsImportForm extends AbstractForm {
     constructor(bankAccounts) {
         super({
-            migrateFrom: new FormControl(BankAccountsImportForm.minDate, [Validators.required, dateRangeValidator(BankAccountsImportForm.minDate, BankAccountsImportForm.maxDate)]),
-            migrateTo: new FormControl(BankAccountsImportForm.maxDate, [Validators.required, dateRangeValidator(BankAccountsImportForm.minDate, BankAccountsImportForm.maxDate)]),
-            bankAccounts: new FormArray(bankAccounts.map((bankAccount) => new BankAccountImportForm(bankAccount)))
+            migrateFrom: new UntypedFormControl(BankAccountsImportForm.minDate, [Validators.required, dateRangeValidator(BankAccountsImportForm.minDate, BankAccountsImportForm.maxDate)]),
+            migrateTo: new UntypedFormControl(BankAccountsImportForm.maxDate, [Validators.required, dateRangeValidator(BankAccountsImportForm.minDate, BankAccountsImportForm.maxDate)]),
+            bankAccounts: new UntypedFormArray(bankAccounts.map((bankAccount) => new BankAccountImportForm(bankAccount)))
         }, [], {
             validators: [atLeastOneEnabledValidator('bankAccounts')]
         });
@@ -16899,7 +16874,7 @@ class BankLoginForm extends AbstractForm {
         this.connection = connection;
         // Each Basiq banks has its own set of login fields, so we need to add these controls dynamically depended on the bank
         Object.keys(connection.bank.loginFields).forEach((key) => {
-            this.addControl(key, new FormControl(null, Validators.required));
+            this.addControl(key, new UntypedFormControl(null, Validators.required));
         });
     }
 }
@@ -16907,10 +16882,10 @@ class BankLoginForm extends AbstractForm {
 class ClientIncomeTypesForm extends AbstractForm {
     constructor(clientIncomeTypes = plainToClass(ClientIncomeTypes, {})) {
         super({
-            work: new FormControl(clientIncomeTypes.work || false),
-            property: new FormControl(clientIncomeTypes.property || false),
-            sole: new FormControl(clientIncomeTypes.sole || false),
-            holdings: new FormControl({ value: clientIncomeTypes.holdings || false, disabled: true })
+            work: new UntypedFormControl(clientIncomeTypes.work || false),
+            property: new UntypedFormControl(clientIncomeTypes.property || false),
+            sole: new UntypedFormControl(clientIncomeTypes.sole || false),
+            holdings: new UntypedFormControl({ value: clientIncomeTypes.holdings || false, disabled: true })
         }, clientIncomeTypes, atLeastOneCheckedValidator());
         this.clientIncomeTypes = clientIncomeTypes;
     }
@@ -16919,8 +16894,8 @@ class ClientIncomeTypesForm extends AbstractForm {
 class LoginForm extends AbstractForm {
     constructor() {
         super({
-            email: new FormControl(null, [Validators.required, Validators.email]),
-            password: new FormControl(null, Validators.required)
+            email: new UntypedFormControl(null, [Validators.required, Validators.email]),
+            password: new UntypedFormControl(null, Validators.required)
         });
     }
 }
@@ -16938,12 +16913,13 @@ function phoneNumberValidator() {
 
 class PhoneForm extends AbstractForm {
     constructor(
-    // no default value because this form is always built-in, so phone passed from parent form
+    // no default value because Address form is always a child form. That's mean address value always passed and then default value never work.
+    // even if null passed, default value will not work
     phone) {
         super({
-            type: new FormControl((phone === null || phone === void 0 ? void 0 : phone.type) || PhoneTypeEnum.MOBILE, Validators.required),
-            country: new FormControl((phone === null || phone === void 0 ? void 0 : phone.country) || Country.australia, Validators.required),
-            number: new FormControl((phone === null || phone === void 0 ? void 0 : phone.number) || null, [Validators.required, phoneNumberValidator()])
+            type: new UntypedFormControl(phone?.type || PhoneTypeEnum.MOBILE, Validators.required),
+            country: new UntypedFormControl(phone?.country || Country.australia, Validators.required),
+            number: new UntypedFormControl(phone?.number || null, [Validators.required, phoneNumberValidator()])
         }, phone);
     }
 }
@@ -16952,8 +16928,8 @@ class PhoneForm extends AbstractForm {
 class PasswordForm extends AbstractForm {
     constructor() {
         super({
-            password: new FormControl(null, [Validators.required, passwordValidator()]),
-            confirm: new FormControl(null, Validators.required),
+            password: new UntypedFormControl(null, [Validators.required, passwordValidator()]),
+            confirm: new UntypedFormControl(null, Validators.required),
         }, { password: null, confirm: null }, passwordMatchValidator('password', 'confirm'));
     }
 }
@@ -16962,27 +16938,26 @@ class PasswordForm extends AbstractForm {
 class RegisterClientForm extends AbstractForm {
     constructor(referenceCode) {
         super({
-            firstName: new FormControl('', [Validators.required]),
-            lastName: new FormControl('', [Validators.required]),
-            email: new FormControl('', [Validators.required, Validators.email]),
+            firstName: new UntypedFormControl('', [Validators.required]),
+            lastName: new UntypedFormControl('', [Validators.required]),
+            email: new UntypedFormControl('', [Validators.required, Validators.email]),
             password: new PasswordForm(),
-            referenceCode: new FormControl(referenceCode)
+            referenceCode: new UntypedFormControl(referenceCode)
         });
     }
     submit(data = {}) {
-        var _a;
-        return super.submit({ password: (_a = this.get('password').submit()) === null || _a === void 0 ? void 0 : _a.password });
+        return super.submit({ password: this.get('password').submit()?.password });
     }
 }
 
 class RegisterFirmForm extends AbstractForm {
     constructor(firmType, referenceCode) {
         super({
-            name: new FormControl('', Validators.required),
-            abn: new FormControl('', Validators.required),
-            tan: new FormControl({ value: '', disabled: firmType !== FirmTypeEnum.ACCOUNTANT }, Validators.required),
+            name: new UntypedFormControl('', Validators.required),
+            abn: new UntypedFormControl('', Validators.required),
+            tan: new UntypedFormControl({ value: '', disabled: firmType !== FirmTypeEnum.ACCOUNTANT }, Validators.required),
             owner: new RegisterClientForm(referenceCode),
-            type: new FormControl(firmType)
+            type: new UntypedFormControl(firmType)
         }, plainToClass(Firm, {}));
         this.firmType = firmType;
     }
@@ -16995,7 +16970,7 @@ class RegisterFirmForm extends AbstractForm {
 class ResetPasswordForm extends AbstractForm {
     constructor() {
         super({
-            email: new FormControl(null, [Validators.required, Validators.email]),
+            email: new UntypedFormControl(null, [Validators.required, Validators.email]),
         });
     }
 }
@@ -17006,8 +16981,8 @@ class ResetPasswordForm extends AbstractForm {
 class UserInviteForm extends AbstractForm {
     constructor() {
         super({
-            firstName: new FormControl(null, Validators.required),
-            email: new FormControl(null, [Validators.required, Validators.email]),
+            firstName: new UntypedFormControl(null, Validators.required),
+            email: new UntypedFormControl(null, [Validators.required, Validators.email]),
         }, plainToClass(RegistrationInvite, {}));
     }
 }
@@ -17019,17 +16994,17 @@ class UserInviteForm extends AbstractForm {
 class PropertySaleCostBaseForm extends AbstractForm {
     constructor(propertySaleCostBase) {
         super({
-            property: new FormGroup({
-                purchasePrice: new FormControl(propertySaleCostBase.property.purchasePrice, Validators.required),
-                contractDate: new FormControl(propertySaleCostBase.property.contractDate, Validators.required),
-                stampDuty: new FormControl(propertySaleCostBase.property.stampDuty, Validators.required),
-                legalFees: new FormControl(propertySaleCostBase.property.legalFees, Validators.required),
-                otherCapitalCosts: new FormControl(propertySaleCostBase.property.otherCapitalCosts, Validators.required),
+            property: new UntypedFormGroup({
+                purchasePrice: new UntypedFormControl(propertySaleCostBase.property.purchasePrice, Validators.required),
+                contractDate: new UntypedFormControl(propertySaleCostBase.property.contractDate, Validators.required),
+                stampDuty: new UntypedFormControl(propertySaleCostBase.property.stampDuty, Validators.required),
+                legalFees: new UntypedFormControl(propertySaleCostBase.property.legalFees, Validators.required),
+                otherCapitalCosts: new UntypedFormControl(propertySaleCostBase.property.otherCapitalCosts, Validators.required),
             }),
-            sale: new FormGroup({
-                holdingCosts: new FormControl(propertySaleCostBase.sale.holdingCosts),
-                structuralImprovementsWDV: new FormControl(propertySaleCostBase.sale.structuralImprovementsWDV),
-                buildingAtCostClaimed: new FormControl(propertySaleCostBase.sale.buildingAtCostClaimed)
+            sale: new UntypedFormGroup({
+                holdingCosts: new UntypedFormControl(propertySaleCostBase.sale.holdingCosts),
+                structuralImprovementsWDV: new UntypedFormControl(propertySaleCostBase.sale.structuralImprovementsWDV),
+                buildingAtCostClaimed: new UntypedFormControl(propertySaleCostBase.sale.buildingAtCostClaimed)
             })
         }, propertySaleCostBase);
         this.propertySaleCostBase = propertySaleCostBase;
@@ -17052,15 +17027,15 @@ class PropertySaleCostBaseForm extends AbstractForm {
 class PropertySaleCostSaleForm extends AbstractForm {
     constructor(propertySale, property) {
         super({
-            price: new FormControl(propertySale.price, Validators.required),
-            contractDate: new FormControl(propertySale.contractDate, Validators.required),
-            settlementDate: new FormControl(propertySale.settlementDate, Validators.required),
-            commission: new FormControl(propertySale.commission || 0, Validators.required),
-            legalFees: new FormControl(propertySale.legalFees || 0, Validators.required),
-            otherCost: new FormControl(propertySale.otherCost || 0, Validators.required),
-            capitalLoss: new FormControl(propertySale.capitalLoss || 0, Validators.required),
-            grossCGT: new FormControl({ value: propertySale.grossCGT, disabled: true }, Validators.required),
-            grossCGTAfterLoss: new FormControl({ value: propertySale.grossCGTAfterLoss, disabled: true }, Validators.required),
+            price: new UntypedFormControl(propertySale.price, Validators.required),
+            contractDate: new UntypedFormControl(propertySale.contractDate, Validators.required),
+            settlementDate: new UntypedFormControl(propertySale.settlementDate, Validators.required),
+            commission: new UntypedFormControl(propertySale.commission || 0, Validators.required),
+            legalFees: new UntypedFormControl(propertySale.legalFees || 0, Validators.required),
+            otherCost: new UntypedFormControl(propertySale.otherCost || 0, Validators.required),
+            capitalLoss: new UntypedFormControl(propertySale.capitalLoss || 0, Validators.required),
+            grossCGT: new UntypedFormControl({ value: propertySale.grossCGT, disabled: true }, Validators.required),
+            grossCGTAfterLoss: new UntypedFormControl({ value: propertySale.grossCGTAfterLoss, disabled: true }, Validators.required),
         }, propertySale);
         this.propertySale = propertySale;
         this.property = property;
@@ -17127,11 +17102,10 @@ class PropertySaleCostSaleForm extends AbstractForm {
  */
 class PropertySaleExemptionsForm extends AbstractForm {
     constructor(propertySale, property, taxExemptions) {
-        var _a, _b;
         super({
-            taxExemption: new FormControl(taxExemptions.findBy('id', (_b = (_a = propertySale.taxExemption) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : property.getCGTExemption(propertySale))),
-            taxExemptionMetadata: new FormArray([]),
-            netCGT: new FormControl(propertySale.netCGT)
+            taxExemption: new UntypedFormControl(taxExemptions.findBy('id', propertySale.taxExemption?.id ?? property.getCGTExemption(propertySale))),
+            taxExemptionMetadata: new UntypedFormArray([]),
+            netCGT: new UntypedFormControl(propertySale.netCGT)
         }, propertySale);
         this.propertySale = propertySale;
         this.property = property;
@@ -17184,9 +17158,9 @@ class PropertySaleExemptionsForm extends AbstractForm {
                 // ppr days can't be more than ownership days
                 metadata.id === TaxExemptionMetadataEnum.PPR_DAYS && Validators.max(this.property.getOwnershipDuration(this.propertySale))
             ].filter(Boolean);
-            formArray.push(new FormGroup({
-                metadata: new FormControl(metadata),
-                value: new FormControl(metadataValue, validators)
+            formArray.push(new UntypedFormGroup({
+                metadata: new UntypedFormControl(metadata),
+                value: new UntypedFormControl(metadataValue, validators)
             }));
         });
     }
@@ -17194,19 +17168,18 @@ class PropertySaleExemptionsForm extends AbstractForm {
 
 class MyTaxBusinessDetailsForm extends AbstractForm {
     constructor(businessDetails) {
-        var _a;
         super({
-            vehicleClaimMethod: new FormControl({
-                value: (_a = businessDetails.vehicleClaimDetails) === null || _a === void 0 ? void 0 : _a.method,
+            vehicleClaimMethod: new UntypedFormControl({
+                value: businessDetails.vehicleClaimDetails?.method,
                 disabled: true
             }),
-            businessType: new FormControl({ value: BusinessTypeEnum.SOLE_TRADER, disabled: true }),
+            businessType: new UntypedFormControl({ value: BusinessTypeEnum.SOLE_TRADER, disabled: true }),
             // business details
-            mainBusinessActivity: new FormControl(businessDetails.businessActivities[0]),
-            mainBusinessName: new FormControl({ value: businessDetails.businesses.first.name, disabled: true }),
-            mainBusinessABN: new FormControl({ value: businessDetails.businessABN, disabled: true }),
-            mainBusinessAddress: new FormControl({ value: businessDetails.businessAddress, disabled: true }),
-            numberOfBusinessActivities: new FormControl(businessDetails.businessActivities.length)
+            mainBusinessActivity: new UntypedFormControl(businessDetails.businessActivities[0]),
+            mainBusinessName: new UntypedFormControl({ value: businessDetails.businesses.first.name, disabled: true }),
+            mainBusinessABN: new UntypedFormControl({ value: businessDetails.businessABN, disabled: true }),
+            mainBusinessAddress: new UntypedFormControl({ value: businessDetails.businessAddress, disabled: true }),
+            numberOfBusinessActivities: new UntypedFormControl(businessDetails.businessActivities.length)
         });
         this.businessDetails = businessDetails;
         this.listenEvents();
@@ -17227,72 +17200,72 @@ class MyTaxBusinessIncomeForm extends AbstractForm {
             // Set in "false" if user has PSI income
             // https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form
             // ("Business income or losses" section, "P1. Did you satisfy the results test?" field)
-            isTestResultsSatisfied: new FormControl(!businessIncome.psiIncomeAmount),
-            psiVoluntaryAgreementAmount: new FormControl({
+            isTestResultsSatisfied: new UntypedFormControl(!businessIncome.psiIncomeAmount),
+            psiVoluntaryAgreementAmount: new UntypedFormControl({
                 value: businessIncome.psiVoluntaryAgreementAmount,
                 disabled: true
             }),
-            psiABNNotQuotedAmount: new FormControl({
+            psiABNNotQuotedAmount: new UntypedFormControl({
                 value: businessIncome.psiABNNotQuotedAmount,
                 disabled: true
             }),
-            psiLabourHireOrOtherAmount: new FormControl({
+            psiLabourHireOrOtherAmount: new UntypedFormControl({
                 value: businessIncome.psiLabourHireOrOtherAmount,
                 disabled: true
             }),
-            psiOtherAmount: new FormControl({
+            psiOtherAmount: new UntypedFormControl({
                 value: businessIncome.psiOtherAmount,
                 disabled: true
             }),
-            psiDeductionAssociatesAmount: new FormControl({
+            psiDeductionAssociatesAmount: new UntypedFormControl({
                 value: businessIncome.psiDeductionAssociatesAmount,
                 disabled: true
             }),
-            psiDeductionOtherAmount: new FormControl({
+            psiDeductionOtherAmount: new UntypedFormControl({
                 value: businessIncome.psiDeductionOtherAmount,
                 disabled: true
             }),
-            psiVoluntaryAgreementTax: new FormControl({
+            psiVoluntaryAgreementTax: new UntypedFormControl({
                 value: businessIncome.psiVoluntaryAgreementTax,
                 disabled: true
             }),
-            psiABNNotQuotedTax: new FormControl({
+            psiABNNotQuotedTax: new UntypedFormControl({
                 value: businessIncome.psiABNNotQuotedTax,
                 disabled: true
             }),
-            psiLabourHireOrOtherTax: new FormControl({
+            psiLabourHireOrOtherTax: new UntypedFormControl({
                 value: businessIncome.psiLabourHireOrOtherTax,
                 disabled: true
             }),
-            grossPaymentsNoAbsGivenAmount: new FormControl({
+            grossPaymentsNoAbsGivenAmount: new UntypedFormControl({
                 value: businessIncome.grossPaymentsNoAbsGivenAmount,
                 disabled: true
             }),
-            grossPaymentsVoluntaryAgreementAmount: new FormControl({
+            grossPaymentsVoluntaryAgreementAmount: new UntypedFormControl({
                 value: businessIncome.grossPaymentsVoluntaryAgreementAmount,
                 disabled: true
             }),
-            grossPaymentsLabourHireAmount: new FormControl({
+            grossPaymentsLabourHireAmount: new UntypedFormControl({
                 value: businessIncome.grossPaymentsLabourHireAmount,
                 disabled: true
             }),
-            assessibleGovernmentPaymentsAmount: new FormControl({
+            assessibleGovernmentPaymentsAmount: new UntypedFormControl({
                 value: businessIncome.assessibleGovernmentPaymentsAmount,
                 disabled: true
             }),
-            otherBusinessIncomeAmount: new FormControl({
+            otherBusinessIncomeAmount: new UntypedFormControl({
                 value: businessIncome.otherBusinessIncomeAmount,
                 disabled: true
             }),
-            grossPaymentsNoAbsGivenTax: new FormControl({
+            grossPaymentsNoAbsGivenTax: new UntypedFormControl({
                 value: businessIncome.grossPaymentsNoAbsGivenTax,
                 disabled: true
             }),
-            grossPaymentsVoluntaryAgreementTax: new FormControl({
+            grossPaymentsVoluntaryAgreementTax: new UntypedFormControl({
                 value: businessIncome.grossPaymentsVoluntaryAgreementTax,
                 disabled: true
             }),
-            grossPaymentsLabourHireTax: new FormControl({
+            grossPaymentsLabourHireTax: new UntypedFormControl({
                 value: businessIncome.grossPaymentsLabourHireTax,
                 disabled: true
             }),
@@ -17302,78 +17275,77 @@ class MyTaxBusinessIncomeForm extends AbstractForm {
 
 class MyTaxBusinessLossesForm extends AbstractForm {
     constructor(businessLosses) {
-        var _a, _b;
         super({
-            purchasesAndOtherCostsAmount: new FormControl({
+            purchasesAndOtherCostsAmount: new UntypedFormControl({
                 value: businessLosses.purchasesAndOtherCostsAmount,
                 disabled: true
             }),
-            contractorsAndCommissionAmount: new FormControl({
+            contractorsAndCommissionAmount: new UntypedFormControl({
                 value: businessLosses.contractorsAndCommissionAmount,
                 disabled: true
             }),
-            superannuationAmount: new FormControl({
+            superannuationAmount: new UntypedFormControl({
                 value: businessLosses.superannuationAmount,
                 disabled: true
             }),
-            badDebtAmount: new FormControl({
+            badDebtAmount: new UntypedFormControl({
                 value: businessLosses.badDebtAmount,
                 disabled: true
             }),
-            leaseExpensesCommercialAmount: new FormControl({
+            leaseExpensesCommercialAmount: new UntypedFormControl({
                 value: businessLosses.leaseExpensesCommercialAmount,
                 disabled: true
             }),
-            rentExpensesCommercialPremisesAmount: new FormControl({
+            rentExpensesCommercialPremisesAmount: new UntypedFormControl({
                 value: businessLosses.rentExpensesCommercialPremisesAmount,
                 disabled: true
             }),
-            interestExpensesAustraliaAmount: new FormControl({
+            interestExpensesAustraliaAmount: new UntypedFormControl({
                 value: businessLosses.interestExpensesAustraliaAmount,
                 disabled: true
             }),
-            interestExpensesOverseasAmount: new FormControl({
+            interestExpensesOverseasAmount: new UntypedFormControl({
                 value: businessLosses.interestExpensesOverseasAmount,
                 disabled: true
             }),
-            kmsTravelledExpensesAmount: new FormControl({
+            kmsTravelledExpensesAmount: new UntypedFormControl({
                 value: businessLosses.kmsTravelledExpensesAmount,
                 disabled: true
             }),
-            logbookExpensesAmount: new FormControl({
+            logbookExpensesAmount: new UntypedFormControl({
                 value: businessLosses.logbookExpensesAmount,
                 disabled: true
             }),
-            otherExpensesAmount: new FormControl({
+            otherExpensesAmount: new UntypedFormControl({
                 value: businessLosses.otherExpensesAmount,
                 disabled: true
             }),
-            totalNonPrimaryProductionExpensesAmount: new FormControl({
+            totalNonPrimaryProductionExpensesAmount: new UntypedFormControl({
                 value: businessLosses.totalNonPrimaryProductionExpensesAmount,
                 disabled: true
             }),
             // depreciations
-            depreciationExpensesAmount: new FormControl({
+            depreciationExpensesAmount: new UntypedFormControl({
                 value: businessLosses.depreciationExpensesAmount,
                 disabled: true
             }),
-            deductionsForCertainAssetsAmount: new FormControl({
+            deductionsForCertainAssetsAmount: new UntypedFormControl({
                 value: businessLosses.deductionsForCertainAssetsAmount,
                 disabled: true
             }),
-            deductionsForGeneralSmallBusinessPoolAmount: new FormControl({
+            deductionsForGeneralSmallBusinessPoolAmount: new UntypedFormControl({
                 value: businessLosses.deductionsForGeneralSmallBusinessPoolAmount,
                 disabled: true
             }),
-            currentYearNetNonPrimaryIncomeOrLossesAmount: new FormControl({
+            currentYearNetNonPrimaryIncomeOrLossesAmount: new UntypedFormControl({
                 value: businessLosses.currentYearNetNonPrimaryIncomeOrLossesAmount,
                 disabled: true
             }),
-            priorYearsNonPrimaryLossesAmount: new FormControl({
+            priorYearsNonPrimaryLossesAmount: new UntypedFormControl({
                 value: businessLosses.priorYearsNonPrimaryLossesAmount,
                 disabled: true
             }),
-            lossType: new FormControl((_b = (_a = businessLosses.currentLoss) === null || _a === void 0 ? void 0 : _a.offsetRule) === null || _b === void 0 ? void 0 : _b.id, Validators.required),
+            lossType: new UntypedFormControl(businessLosses.currentLoss?.offsetRule?.id, Validators.required),
         });
     }
 }
@@ -17391,18 +17363,18 @@ class MyTaxBusinessIncomeOrLossesForm extends AbstractForm {
 class MyTaxCgtForm extends AbstractForm {
     constructor(gainsOrLosses) {
         super({
-            hasCapitalGain: new FormControl(gainsOrLosses.hasCapitalGain),
-            hasExemption: new FormControl(gainsOrLosses.hasExemption),
-            exemptionType: new FormControl(null, conditionalValidator(() => this.get('hasExemption').value, Validators.required)),
-            netCapitalGain: new FormControl({
+            hasCapitalGain: new UntypedFormControl(gainsOrLosses.hasCapitalGain),
+            hasExemption: new UntypedFormControl(gainsOrLosses.hasExemption),
+            exemptionType: new UntypedFormControl(null, conditionalValidator(() => this.get('hasExemption').value, Validators.required)),
+            netCapitalGain: new UntypedFormControl({
                 value: gainsOrLosses.netCapitalGain,
                 disabled: true
             }),
-            grossCapitalGain: new FormControl({
+            grossCapitalGain: new UntypedFormControl({
                 value: gainsOrLosses.grossCapitalGain,
                 disabled: true
             }),
-            netCapitalLoss: new FormControl({
+            netCapitalLoss: new UntypedFormControl({
                 value: gainsOrLosses.netCapitalLoss,
                 disabled: true
             })
@@ -17412,80 +17384,79 @@ class MyTaxCgtForm extends AbstractForm {
 
 class MyTaxDeductionsForm extends AbstractForm {
     constructor(deductions) {
-        var _a;
         super({
-            vehicleClaimMethod: new FormControl({
-                value: (_a = deductions.vehicleClaimDetails) === null || _a === void 0 ? void 0 : _a.method,
+            vehicleClaimMethod: new UntypedFormControl({
+                value: deductions.vehicleClaimDetails?.method,
                 disabled: true
             }),
-            vehicleExpensesTotalAmount: new FormControl({
+            vehicleExpensesTotalAmount: new UntypedFormControl({
                 value: deductions.vehicleExpensesTotalAmount,
                 disabled: true
             }),
-            workRelatedTravelExpensesTotalAmount: new FormControl({
+            workRelatedTravelExpensesTotalAmount: new UntypedFormControl({
                 value: deductions.workRelatedTravelExpensesTotalAmount,
                 disabled: true
             }),
-            workRelatedClothingType: new FormControl(deductions.workRelatedClothingType, conditionalValidator(() => !!deductions.workRelatedClothingTotalAmount, Validators.required)),
-            workRelatedClothingTotalAmount: new FormControl({
+            workRelatedClothingType: new UntypedFormControl(deductions.workRelatedClothingType, conditionalValidator(() => !!deductions.workRelatedClothingTotalAmount, Validators.required)),
+            workRelatedClothingTotalAmount: new UntypedFormControl({
                 value: deductions.workRelatedClothingTotalAmount,
                 disabled: true
             }),
-            workRelatedSelfEducationType: new FormControl(deductions.workRelatedSelfEducationType, conditionalValidator(() => !!deductions.workRelatedSelfEducationTotalAmount, Validators.required)),
-            workRelatedSelfEducationTotalAmount: new FormControl({
+            workRelatedSelfEducationType: new UntypedFormControl(deductions.workRelatedSelfEducationType, conditionalValidator(() => !!deductions.workRelatedSelfEducationTotalAmount, Validators.required)),
+            workRelatedSelfEducationTotalAmount: new UntypedFormControl({
                 value: deductions.workRelatedSelfEducationTotalAmount,
                 disabled: true
             }),
-            otherWorkRelatedSelfEducationTotalAmount: new FormControl({
+            otherWorkRelatedSelfEducationTotalAmount: new UntypedFormControl({
                 value: deductions.otherWorkRelatedExpensesTotalAmount,
                 disabled: true
             }),
-            lowValuePoolDeductionTotalAmount: new FormControl({
+            lowValuePoolDeductionTotalAmount: new UntypedFormControl({
                 value: deductions.lowValuePoolDeductionTotalAmount,
                 disabled: true
             }),
-            interestExpensesTotalAmount: new FormControl({
+            interestExpensesTotalAmount: new UntypedFormControl({
                 value: deductions.interestExpensesTotalAmount,
                 disabled: true
             }),
-            dividendExpensesTotalAmount: new FormControl({
+            dividendExpensesTotalAmount: new UntypedFormControl({
                 value: deductions.dividendExpensesTotalAmount,
                 disabled: true
             }),
-            donationsTotalAmount: new FormControl({
+            donationsTotalAmount: new UntypedFormControl({
                 value: deductions.donationsTotalAmount,
                 disabled: true
             }),
-            interestsChargedByATOTotalAmount: new FormControl({
+            interestsChargedByATOTotalAmount: new UntypedFormControl({
                 value: deductions.interestsChargedByATOTotalAmount,
                 disabled: true
             }),
-            litigationCostsTotalAmount: new FormControl({
+            litigationCostsTotalAmount: new UntypedFormControl({
                 value: deductions.litigationCostsTotalAmount,
                 disabled: true
             }),
-            otherManagingCostsTotalAmount: new FormControl({
+            otherManagingCostsTotalAmount: new UntypedFormControl({
                 value: deductions.otherManagingCostsTotalAmount,
                 disabled: true
             }),
-            fundName: new FormControl(''),
-            hasFund: new FormControl(true),
-            fundABN: new FormControl(''),
-            fundTFN: new FormControl(''),
-            fundAccountNumber: new FormControl(''),
-            personalSuperContributionsTotalAmount: new FormControl({
+            fundName: new UntypedFormControl(''),
+            hasFund: new UntypedFormControl(true),
+            fundABN: new UntypedFormControl(''),
+            fundTFN: new UntypedFormControl(''),
+            fundAccountNumber: new UntypedFormControl(''),
+            personalSuperContributionsTotalAmount: new UntypedFormControl({
                 value: deductions.personalSuperContributionsTotalAmount,
                 disabled: true
             }),
-            forestryManagedInvestmentSchemesDeductionsTotalAmount: new FormControl({
+            forestryManagedInvestmentSchemesDeductionsTotalAmount: new UntypedFormControl({
                 value: deductions.forestryManagedInvestmentSchemesDeductionsTotalAmount,
                 disabled: true
             }),
-            otherDeductionsTotalAmount: new FormControl({
+            otherDeductionsTotalAmount: new UntypedFormControl({
                 value: deductions.otherDeductionsTotalAmount,
                 disabled: true
             }),
-            depreciationAndCapitalAllowancesTotalAmount: new FormControl({
+            depreciationAndCapitalAllowancesTotalAmount: new UntypedFormControl({
                 value: deductions.depreciationAndCapitalAllowancesTotalAmount,
                 disabled: true
             })
@@ -17496,20 +17467,20 @@ class MyTaxDeductionsForm extends AbstractForm {
 class MyTaxDividendsForm extends AbstractForm {
     constructor(dividends) {
         super({
-            dividendsUnfrankedAmount: new FormControl({
+            dividendsUnfrankedAmount: new UntypedFormControl({
                 value: dividends.dividendsUnfrankedAmount,
                 disabled: true
             }),
-            dividendsFrankedAmount: new FormControl({
+            dividendsFrankedAmount: new UntypedFormControl({
                 value: dividends.dividendsFrankedAmount,
                 disabled: true
             }),
-            dividendsFrankingCreditsAmount: new FormControl({
+            dividendsFrankingCreditsAmount: new UntypedFormControl({
                 value: dividends.dividendsFrankingCreditsAmount,
                 disabled: true
             }),
-            dividendsTotalTax: new FormControl({ value: dividends.dividendsTotalTax, disabled: true }),
-            isForeignResident: new FormControl(false),
+            dividendsTotalTax: new UntypedFormControl({ value: dividends.dividendsTotalTax, disabled: true }),
+            isForeignResident: new UntypedFormControl(false),
         });
     }
 }
@@ -17517,84 +17488,84 @@ class MyTaxDividendsForm extends AbstractForm {
 class MyTaxIncomeStatementsForm extends AbstractForm {
     constructor(incomeStatements, user) {
         super({
-            occupation: new FormControl(user.clientDetails.occupation, [Validators.required, autocompleteValidator()]),
-            allowanceTotalAmount: new FormControl({
+            occupation: new UntypedFormControl(user.clientDetails.occupation, [Validators.required, autocompleteValidator()]),
+            allowanceTotalAmount: new UntypedFormControl({
                 value: incomeStatements.allowanceTotalAmount,
                 disabled: true
             }),
-            allowanceTotalTax: new FormControl({
+            allowanceTotalTax: new UntypedFormControl({
                 value: incomeStatements.allowanceTotalTax,
                 disabled: true
             }),
-            lumpATransactionsTotalAmount: new FormControl({
+            lumpATransactionsTotalAmount: new UntypedFormControl({
                 value: incomeStatements.lumpATransactionsTotalAmount,
                 disabled: true
             }),
-            lumpATransactionsTotalTax: new FormControl({
+            lumpATransactionsTotalTax: new UntypedFormControl({
                 value: incomeStatements.lumpATransactionsTotalTax,
                 disabled: true
             }),
-            hasGenuineLumpATransactions: new FormControl({
+            hasGenuineLumpATransactions: new UntypedFormControl({
                 value: incomeStatements.hasGenuineLumpATransactions,
                 disabled: true
             }),
-            hasOtherLumpATransactions: new FormControl({
+            hasOtherLumpATransactions: new UntypedFormControl({
                 value: incomeStatements.hasOtherLumpATransactions,
                 disabled: true
             }),
-            lumpBTransactionsTotalAmount: new FormControl({
+            lumpBTransactionsTotalAmount: new UntypedFormControl({
                 value: incomeStatements.lumpBTransactionsTotalAmount,
                 disabled: true
             }),
-            lumpBTransactionsTotalTax: new FormControl({
+            lumpBTransactionsTotalTax: new UntypedFormControl({
                 value: incomeStatements.lumpBTransactionsTotalTax,
                 disabled: true
             }),
-            australianAllowancesAndPaymentsTotalAmount: new FormControl({
+            australianAllowancesAndPaymentsTotalAmount: new UntypedFormControl({
                 value: incomeStatements.australianAllowancesAndPaymentsTotalAmount,
                 disabled: true
             }),
-            australianAllowancesAndPaymentsTotalTax: new FormControl({
+            australianAllowancesAndPaymentsTotalTax: new UntypedFormControl({
                 value: incomeStatements.australianAllowancesAndPaymentsTotalTax,
                 disabled: true
             }),
-            australianPensionsAndAllowancesTotalAmount: new FormControl({
+            australianPensionsAndAllowancesTotalAmount: new UntypedFormControl({
                 value: incomeStatements.australianPensionsAndAllowancesTotalAmount,
                 disabled: true
             }),
-            australianPensionsAndAllowancesTotalTax: new FormControl({
+            australianPensionsAndAllowancesTotalTax: new UntypedFormControl({
                 value: incomeStatements.australianPensionsAndAllowancesTotalTax,
                 disabled: true
             }),
-            australianAnnuitiesSuperannuationIncomesTotalTax: new FormControl({
+            australianAnnuitiesSuperannuationIncomesTotalTax: new UntypedFormControl({
                 value: incomeStatements.australianAnnuitiesSuperannuationIncomesTotalTax,
                 disabled: true
             }),
-            australianAnnuityPaymentsTaxed: new FormControl({
+            australianAnnuityPaymentsTaxed: new UntypedFormControl({
                 value: incomeStatements.australianAnnuityPaymentsTaxed,
                 disabled: true
             }),
-            australianAnnuityPaymentsUntaxed: new FormControl({
+            australianAnnuityPaymentsUntaxed: new UntypedFormControl({
                 value: incomeStatements.australianAnnuityPaymentsUntaxed,
                 disabled: true
             }),
-            assessableCappedDefinedBenefitTotalAmount: new FormControl({
+            assessableCappedDefinedBenefitTotalAmount: new UntypedFormControl({
                 value: incomeStatements.assessableCappedDefinedBenefitTotalAmount,
                 disabled: true
             }),
-            superannuationIncomeStreamsTotalTaxed: new FormControl({
+            superannuationIncomeStreamsTotalTaxed: new UntypedFormControl({
                 value: incomeStatements.superannuationIncomeStreamsTotalTaxed,
                 disabled: true
             }),
-            superannuationIncomeStreamsTotalUntaxed: new FormControl({
+            superannuationIncomeStreamsTotalUntaxed: new UntypedFormControl({
                 value: incomeStatements.superannuationIncomeStreamsTotalUntaxed,
                 disabled: true
             }),
-            attributablePsiTransactionsTotalAmount: new FormControl({
+            attributablePsiTransactionsTotalAmount: new UntypedFormControl({
                 value: incomeStatements.attributablePsiTransactionsTotalAmount,
                 disabled: true
             }),
-            attributablePsiTransactionsTotalTax: new FormControl({
+            attributablePsiTransactionsTotalTax: new UntypedFormControl({
                 value: incomeStatements.attributablePsiTransactionsTotalTax,
                 disabled: true
             }),
@@ -17615,9 +17586,9 @@ class MyTaxIncomeTestsForm extends AbstractForm {
 class MyTaxInterestForm extends AbstractForm {
     constructor(interest) {
         super({
-            interestEarnedTotalAmount: new FormControl(interest.interestEarnedTotalAmount),
-            interestEarnedTotalTax: new FormControl(interest.interestEarnedTotalTax),
-            interestPaidTotalAmount: new FormControl(interest.interestPaidTotalAmount)
+            interestEarnedTotalAmount: new UntypedFormControl(interest.interestEarnedTotalAmount),
+            interestEarnedTotalTax: new UntypedFormControl(interest.interestEarnedTotalTax),
+            interestPaidTotalAmount: new UntypedFormControl(interest.interestPaidTotalAmount)
         });
     }
 }
@@ -17625,8 +17596,8 @@ class MyTaxInterestForm extends AbstractForm {
 class MyTaxLossesForm extends AbstractForm {
     constructor(losses) {
         super({
-            businessLossDeferred: new FormControl(losses.businessLossDeferred),
-            businessLossApplied: new FormControl(losses.businessLossApplied)
+            businessLossDeferred: new UntypedFormControl(losses.businessLossDeferred),
+            businessLossApplied: new UntypedFormControl(losses.businessLossApplied)
         });
     }
 }
@@ -17634,11 +17605,11 @@ class MyTaxLossesForm extends AbstractForm {
 class MyTaxMedicareForm extends AbstractForm {
     constructor(user) {
         super({
-            hasDependants: new FormControl(!!user.clientDetails.dependants),
-            dependants: new FormControl(user.clientDetails.dependants, Validators.required),
-            privateHealthCare: new FormControl(user.clientDetails.privateHealthCare),
-            hasMedicareExemption: new FormControl(!!user.clientDetails.medicareExemption),
-            medicareExemption: new FormControl(user.clientDetails.medicareExemption, Validators.required),
+            hasDependants: new UntypedFormControl(!!user.clientDetails.dependants),
+            dependants: new UntypedFormControl(user.clientDetails.dependants, Validators.required),
+            privateHealthCare: new UntypedFormControl(user.clientDetails.privateHealthCare),
+            hasMedicareExemption: new UntypedFormControl(!!user.clientDetails.medicareExemption),
+            medicareExemption: new UntypedFormControl(user.clientDetails.medicareExemption, Validators.required),
         });
         this.listenEvents();
     }
@@ -17674,37 +17645,37 @@ class MyTaxOffsetsForm extends AbstractForm {
 class MyTaxOtherIncomeForm extends AbstractForm {
     constructor(otherIncome) {
         super({
-            eligibleForReductionAmount: new FormControl(otherIncome.eligibleForReductionAmount),
-            notEligibleForReductionAmount: new FormControl(otherIncome.notEligibleForReductionAmount),
-            discountFromDeferredSchemeAmount: new FormControl(otherIncome.discountFromDeferredSchemeAmount),
-            totalAssessableDiscountAmount: new FormControl(otherIncome.totalAssessableDiscountAmount),
-            shareSchemesTotalTax: new FormControl(otherIncome.shareSchemesTotalTax),
-            bonusesTotalAmount: new FormControl({
+            eligibleForReductionAmount: new UntypedFormControl(otherIncome.eligibleForReductionAmount),
+            notEligibleForReductionAmount: new UntypedFormControl(otherIncome.notEligibleForReductionAmount),
+            discountFromDeferredSchemeAmount: new UntypedFormControl(otherIncome.discountFromDeferredSchemeAmount),
+            totalAssessableDiscountAmount: new UntypedFormControl(otherIncome.totalAssessableDiscountAmount),
+            shareSchemesTotalTax: new UntypedFormControl(otherIncome.shareSchemesTotalTax),
+            bonusesTotalAmount: new UntypedFormControl({
                 value: otherIncome.bonusesTotalAmount,
                 disabled: true
             }),
-            forestryManagedInvestmentSchemesIncomeTotalAmount: new FormControl({
+            forestryManagedInvestmentSchemesIncomeTotalAmount: new UntypedFormControl({
                 value: otherIncome.forestryManagedInvestmentSchemesIncomeTotalAmount,
                 disabled: true
             }),
-            lumpSumPaymentsInArrearsTotalTax: new FormControl({
+            lumpSumPaymentsInArrearsTotalTax: new UntypedFormControl({
                 value: otherIncome.lumpSumPaymentsInArrearsTotalTax,
                 disabled: true
             }),
-            specialProfessionIncomeTotalAmount: new FormControl({
+            specialProfessionIncomeTotalAmount: new UntypedFormControl({
                 value: otherIncome.specialProfessionIncomeTotalAmount,
                 disabled: true
             }),
-            category1TotalIncome: new FormControl({
+            category1TotalIncome: new UntypedFormControl({
                 value: otherIncome.category1TotalIncome,
                 disabled: true
             }),
-            hasLumpSumPaymentsInArrearsTransactions: new FormControl(!!otherIncome.lumpSumPaymentsInArrearsTransactions.length),
-            atoInterestPaidTotalAmount: new FormControl({
+            hasLumpSumPaymentsInArrearsTransactions: new UntypedFormControl(!!otherIncome.lumpSumPaymentsInArrearsTransactions.length),
+            atoInterestPaidTotalAmount: new UntypedFormControl({
                 value: otherIncome.atoInterestPaidTotalAmount,
                 disabled: true
             }),
-            gainOnSaleOfVehiclePreviouslyDepreciatedTotalAmount: new FormControl({
+            gainOnSaleOfVehiclePreviouslyDepreciatedTotalAmount: new UntypedFormControl({
                 value: otherIncome.gainOnSaleOfVehiclePreviouslyDepreciatedTotalAmount,
                 disabled: true
             })
@@ -17715,31 +17686,31 @@ class MyTaxOtherIncomeForm extends AbstractForm {
 class MyTaxPartnershipsAndTrustsForm extends AbstractForm {
     constructor(partnershipsAndTrusts) {
         super({
-            partnershipsIncomeTotalAmount: new FormControl({
+            partnershipsIncomeTotalAmount: new UntypedFormControl({
                 value: partnershipsAndTrusts.partnershipsIncomeTotalAmount,
                 disabled: true
             }),
-            partnershipsExpenseTotalAmount: new FormControl({
+            partnershipsExpenseTotalAmount: new UntypedFormControl({
                 value: partnershipsAndTrusts.partnershipsExpenseTotalAmount,
                 disabled: true
             }),
-            trustsIncomeTotalAmount: new FormControl({
+            trustsIncomeTotalAmount: new UntypedFormControl({
                 value: partnershipsAndTrusts.trustsIncomeTotalAmount,
                 disabled: true
             }),
-            trustsExpenseTotalAmount: new FormControl({
+            trustsExpenseTotalAmount: new UntypedFormControl({
                 value: partnershipsAndTrusts.trustsExpenseTotalAmount,
                 disabled: true
             }),
-            trustsIncomeTotalTax: new FormControl({
+            trustsIncomeTotalTax: new UntypedFormControl({
                 value: partnershipsAndTrusts.trustsIncomeTotalTax,
                 disabled: true
             }),
-            frankingCreditsTotal: new FormControl({
+            frankingCreditsTotal: new UntypedFormControl({
                 value: partnershipsAndTrusts.frankingCreditsTotal,
                 disabled: true
             }),
-            taxOffsetNRASTotalAmount: new FormControl({
+            taxOffsetNRASTotalAmount: new UntypedFormControl({
                 value: partnershipsAndTrusts.taxOffsetNRASTotalAmount,
                 disabled: true
             })
@@ -17750,10 +17721,10 @@ class MyTaxPartnershipsAndTrustsForm extends AbstractForm {
 class MyTaxRentForm extends AbstractForm {
     constructor(rent) {
         super({
-            grossRentAmount: new FormControl(rent.grossRentAmount),
-            interestDeductions: new FormControl(rent.interestDeductionsAmount),
-            capitalWorksDeductions: new FormControl(rent.capitalWorksDeductionsAmount),
-            otherRentalDeductionsAmount: new FormControl(rent.otherRentalDeductionsAmount)
+            grossRentAmount: new UntypedFormControl(rent.grossRentAmount),
+            interestDeductions: new UntypedFormControl(rent.interestDeductionsAmount),
+            capitalWorksDeductions: new UntypedFormControl(rent.capitalWorksDeductionsAmount),
+            otherRentalDeductionsAmount: new UntypedFormControl(rent.otherRentalDeductionsAmount)
         });
     }
 }
@@ -17764,7 +17735,7 @@ class MyTaxRentForm extends AbstractForm {
 class VehicleForm extends AbstractForm {
     constructor(vehicle = plainToClass(Vehicle, {})) {
         super({
-            name: new FormControl(vehicle.name, [Validators.required, Validators.maxLength(VehicleForm.maxNameLength)])
+            name: new UntypedFormControl(vehicle.name, [Validators.required, Validators.maxLength(VehicleForm.maxNameLength)])
         }, vehicle);
         this.vehicle = vehicle;
     }
@@ -17781,11 +17752,11 @@ class VehicleClaimForm extends AbstractForm {
      */
     constructor(vehicleClaim, details) {
         super({
-            kilometers: new FormControl({
+            kilometers: new UntypedFormControl({
                 value: vehicleClaim.kilometers,
                 disabled: !details.isManual || details.isLogbookMethod()
             }),
-            workUsage: new FormControl({
+            workUsage: new UntypedFormControl({
                 value: vehicleClaim.workUsage,
                 disabled: !details.isManual || details.isKmsMethod()
             })
@@ -17804,8 +17775,8 @@ class VehicleClaimForm extends AbstractForm {
 class VehicleClaimDetailsForm extends AbstractForm {
     constructor(vehicleClaimDetails, isBestPeriodExist) {
         super({
-            method: new FormControl(vehicleClaimDetails.method, Validators.required),
-            isManual: new FormControl({
+            method: new UntypedFormControl(vehicleClaimDetails.method, Validators.required),
+            isManual: new UntypedFormControl({
                 value: vehicleClaimDetails.isManual,
                 disabled: !isBestPeriodExist
             }),
@@ -17827,12 +17798,12 @@ class VehicleLogbookForm extends AbstractForm {
      */
     constructor(logbook, logbooks) {
         super({
-            description: new FormControl(logbook.description, [Validators.required, Validators.maxLength(VehicleLogbookForm.maxDescriptionLength)]),
-            isPersonal: new FormControl(logbook.isPersonal),
-            date: new FormControl(logbook.date, Validators.required),
-            odometerStart: new FormControl(logbook.odometerStart, Validators.required),
-            odometerEnd: new FormControl(logbook.odometerEnd, Validators.required),
-            business: new FormControl(logbook.business)
+            description: new UntypedFormControl(logbook.description, [Validators.required, Validators.maxLength(VehicleLogbookForm.maxDescriptionLength)]),
+            isPersonal: new UntypedFormControl(logbook.isPersonal),
+            date: new UntypedFormControl(logbook.date, Validators.required),
+            odometerStart: new UntypedFormControl(logbook.odometerStart, Validators.required),
+            odometerEnd: new UntypedFormControl(logbook.odometerEnd, Validators.required),
+            business: new UntypedFormControl(logbook.business)
         }, logbook);
         this.logbook = logbook;
         this.logbooks = logbooks;
@@ -17890,21 +17861,20 @@ var FormValidationsEnum;
  */
 class TransactionBaseForm extends AbstractForm {
     constructor(transaction, registeredForGst, controls = {}) {
-        var _a;
         super(Object.assign({
-            chartAccounts: new FormControl(transaction.chartAccounts, [Validators.required, autocompleteValidator()]),
-            claimPercent: new FormControl({ value: transaction.claimPercent, disabled: true }, [Validators.required, Validators.min(0), Validators.max(100)]),
-            amount: new FormControl(transaction.amount, Validators.required),
-            amountWithGST: new FormControl(transaction.amountWithGst, Validators.required),
-            isGST: new FormControl({ value: transaction.isGST, disabled: !((_a = transaction.chartAccounts) === null || _a === void 0 ? void 0 : _a.isGST) || !registeredForGst }),
-            gstAmount: new FormControl({ value: transaction.gstAmount, disabled: true }, Validators.required),
-            date: new FormControl(transaction.date, [Validators.required]),
-            description: new FormControl(transaction.description, Validators.maxLength(FormValidationsEnum.TEXT_MAX_LENGTH)),
+            chartAccounts: new UntypedFormControl(transaction.chartAccounts, [Validators.required, autocompleteValidator()]),
+            claimPercent: new UntypedFormControl({ value: transaction.claimPercent, disabled: true }, [Validators.required, Validators.min(0), Validators.max(100)]),
+            amount: new UntypedFormControl(transaction.amount, Validators.required),
+            amountWithGST: new UntypedFormControl(transaction.amountWithGst, Validators.required),
+            isGST: new UntypedFormControl({ value: transaction.isGST, disabled: !transaction.chartAccounts?.isGST || !registeredForGst }),
+            gstAmount: new UntypedFormControl({ value: transaction.gstAmount, disabled: true }, Validators.required),
+            date: new UntypedFormControl(transaction.date, [Validators.required]),
+            description: new UntypedFormControl(transaction.description, Validators.maxLength(FormValidationsEnum.TEXT_MAX_LENGTH)),
             // @TODO Alex: refactor (TT-1996)
-            file: new FormControl(transaction['receipt'], [
+            file: new UntypedFormControl(transaction['receipt'], [
                 FileValidator.fileExtensions(DOCUMENT_FILE_TYPES.all), FileValidator.fileMaxSize(+FormValidationsEnum.FILE_MAX_SIZE)
             ]),
-            property: new FormControl({ value: transaction.property, disabled: transaction.chartAccounts }),
+            property: new UntypedFormControl({ value: transaction.property, disabled: transaction.chartAccounts }),
         }, controls), transaction);
         this.registeredForGst = registeredForGst;
         this.watchChartAccounts();
@@ -17965,14 +17935,13 @@ class TransactionBaseForm extends AbstractForm {
      * can be adjusted only for property/sole expenses
      */
     updateClaimPercent(chartAccounts) {
-        var _a;
         if (chartAccounts.isClaimPercentEditable()) {
             this.get('claimPercent').enable();
         }
         // property claim (ownership% x shared%) for property expenses, taxable percent for others
         let claimPercent = chartAccounts.taxablePercent;
         if (chartAccounts.isPropertyExpense() && chartAccounts.id !== ChartAccountsListEnum.PLATFORM_FEES) {
-            claimPercent *= (_a = this.value.property) === null || _a === void 0 ? void 0 : _a.claimCoefficient;
+            claimPercent *= this.value.property?.claimCoefficient;
         }
         this.get('claimPercent').setValue(claimPercent);
     }
@@ -17986,8 +17955,8 @@ var MessagesEnum;
 class TransactionForm extends TransactionBaseForm {
     constructor(transaction, registeredForGst, allocations, controls = {}) {
         super(transaction, registeredForGst, Object.assign(controls, {
-            transactions: new FormArray([]),
-            source: new FormControl(transaction.source || TransactionSourceEnum.BANK_TRANSACTION, Validators.required)
+            transactions: new UntypedFormArray([]),
+            source: new UntypedFormControl(transaction.source || TransactionSourceEnum.BANK_TRANSACTION, Validators.required)
         }));
         this.get('date').addValidators([currentFinYearValidator()]);
         // convert child transactions to controls
@@ -18009,10 +17978,10 @@ class TransactionForm extends TransactionBaseForm {
         }
     }
     addTransactionControl(transaction = plainToClass(Transaction, {})) {
-        const formGroup = new FormGroup({
-            id: new FormControl(transaction.id),
-            chartAccounts: new FormControl(transaction.chartAccounts, [Validators.required, autocompleteValidator()]),
-            amount: new FormControl(transaction.amount, [Validators.required]),
+        const formGroup = new UntypedFormGroup({
+            id: new UntypedFormControl(transaction.id),
+            chartAccounts: new UntypedFormControl(transaction.chartAccounts, [Validators.required, autocompleteValidator()]),
+            amount: new UntypedFormControl(transaction.amount, [Validators.required]),
         });
         this.get('transactions').push(formGroup);
     }
@@ -18024,18 +17993,15 @@ class TransactionForm extends TransactionBaseForm {
      * Adjustments inherit most of the fields from parent transaction
      */
     buildTransactions(transaction) {
-        return this.get('transactions').value.map((childTransaction) => {
-            var _a, _b, _c;
-            return Object.assign({
-                description: (_a = childTransaction.chartAccounts) === null || _a === void 0 ? void 0 : _a.name,
-                date: transaction.date,
-                claimPercent: (transaction.claimPercent * ((_b = childTransaction.chartAccounts) === null || _b === void 0 ? void 0 : _b.taxablePercent)) / 100,
-                source: TransactionSourceEnum.BANK_TRANSACTION,
-                type: ((_c = childTransaction.chartAccounts) === null || _c === void 0 ? void 0 : _c.isExpense()) ? TransactionTypeEnum.DEBIT : TransactionTypeEnum.CREDIT,
-                incomeSource: transaction.incomeSource,
-                property: transaction.property
-            }, this.model.transactions.find((transaction) => transaction.id === childTransaction['id']) || {}, childTransaction);
-        });
+        return this.get('transactions').value.map((childTransaction) => Object.assign({
+            description: childTransaction.chartAccounts?.name,
+            date: transaction.date,
+            claimPercent: (transaction.claimPercent * childTransaction.chartAccounts?.taxablePercent) / 100,
+            source: TransactionSourceEnum.BANK_TRANSACTION,
+            type: childTransaction.chartAccounts?.isExpense() ? TransactionTypeEnum.DEBIT : TransactionTypeEnum.CREDIT,
+            incomeSource: transaction.incomeSource,
+            property: transaction.property
+        }, this.model.transactions.find((transaction) => transaction.id === childTransaction['id']) || {}, childTransaction));
     }
     submit(data = {}) {
         return super.submit(Object.assign(data, { transactions: this.buildTransactions(this.currentValue) }), true);
@@ -18082,22 +18048,21 @@ class WorkTransactionForm extends TransactionForm {
 
 class WorkIncomeForm extends WorkTransactionForm {
     constructor(transaction, registeredForGst, allocations) {
-        var _a;
         // for work income we need to show netAmount instead of amount (because some adjustments are included in amount)
         transaction.amount = transaction.netAmount;
         super(transaction, registeredForGst, allocations, {
-            tax: new FormControl({
+            tax: new UntypedFormControl({
                 value: transaction.tax,
                 disabled: !transaction.chartAccounts || transaction.chartAccounts.isNRAS(),
             }, Validators.required),
-            incomeSource: new FormControl(transaction.incomeSource, [Validators.required, autocompleteValidator()]),
+            incomeSource: new UntypedFormControl(transaction.incomeSource, [Validators.required, autocompleteValidator()]),
         });
         // forbid to edit some fields for allocated transaction
         if (allocations.length) {
             this.get('chartAccounts').disable();
         }
         // adjustments allowed only for salary
-        if (!((_a = transaction.chartAccounts) === null || _a === void 0 ? void 0 : _a.isSalary())) {
+        if (!transaction.chartAccounts?.isSalary()) {
             this.get('transactions').disable();
         }
         // amount changes are not available for transactions with allocations or during allocate process
@@ -18153,7 +18118,7 @@ class WorkIncomeForm extends WorkTransactionForm {
      */
     getAmount() {
         return this.get('amount').value - new Collection(this.currentValue.transactions)
-            .filter((t) => { var _a; return (_a = t.chartAccounts) === null || _a === void 0 ? void 0 : _a.isSalaryIncluded(); })
+            .filter((t) => t.chartAccounts?.isSalaryIncluded())
             .sumBy('amount');
     }
     submit(data = {}) {
@@ -18183,9 +18148,9 @@ class DepreciationForm extends TransactionBaseForm {
     constructor(depreciation, registeredForGst) {
         super(depreciation, registeredForGst);
         this.get('claimPercent').setValue(depreciation.currentYearForecast.claimPercent);
-        this.addControl('isCloseBalanceCorrect', new FormControl(true));
-        this.addControl('closeBalance', new FormControl({ value: depreciation.closeBalance || 0, disabled: true }, Validators.required));
-        this.addControl('financialYear', new FormControl(depreciation.financialYear || new FinancialYear().year));
+        this.addControl('isCloseBalanceCorrect', new UntypedFormControl(true));
+        this.addControl('closeBalance', new UntypedFormControl({ value: depreciation.closeBalance || 0, disabled: true }, Validators.required));
+        this.addControl('financialYear', new UntypedFormControl(depreciation.financialYear || new FinancialYear().year));
         // forbid to change chartAccounts/claimPercent for existing depreciations
         if (depreciation.id) {
             this.get('chartAccounts').disable({ emitEvent: false });
@@ -18221,4 +18186,4 @@ class DepreciationForm extends TransactionBaseForm {
  */
 
 export { AbstractForm, AbstractModel, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressForm, AddressService, AddressTypeEnum, AllocationGroup, AllocationGroupCollection, AlphabetColorsEnum, AnnualFrequencyEnum, AppEvent, AppEvent2, AppEventTypeEnum, AppFile, AssetEntityTypeEnum, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Badge, BadgeColorEnum, Bank, BankAccount, BankAccountAddManualForm, BankAccountAllocationForm, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountImportForm, BankAccountPropertiesForm, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankAccountsImportForm, BankConnection, BankConnectionService, BankConnectionStatusEnum, BankExternalStats, BankLoginData, BankLoginForm, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasReport, BasReportForm, BasReportService, BasiqConfig, BasiqJob, BasiqJobResponse, BasiqJobStep, BasiqService, BasiqToken, BasiqTokenService, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, BusinessTypeEnum, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, CgtExemptionAndRolloverCodeEnum, ChartAccounts, ChartAccountsCategoryECollection, ChartAccountsCategoryEnum, ChartAccountsCollection, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsKeepSign, ChartAccountsListEnum, ChartAccountsMetadata, ChartAccountsMetadataListEnum, ChartAccountsMetadataTypeEnum, ChartAccountsSalaryAdjustmentsListEnum, ChartAccountsSalaryIncludedListEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartData, ChartSerie, Chat, ChatCollection, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteCollection, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEDUCTION_CATEGORIES, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, DeductionClothingTypeEnum, DeductionSelfEducationTypeEnum, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationForm, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpRateEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReceipt, DepreciationReceiptService, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Dictionary, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderService, DocumentService, DocumentTypeEnum, ENDPOINTS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, ExportFormatterService, ExportableCollection, FacebookService, FileService, FileValidator, FinancialYear, Firm, FirmService, FirmTypeEnum, FormValidationsEnum, HeaderTitleService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastService, IncomeSourceForecastTrustTypeEnum, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, InterceptorsModule, IntercomService, InviteStatusEnum, JwtService, Loan, LoanBankTypeEnum, LoanCollection, LoanForm, LoanFrequencyEnum, LoanInterestTypeEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPaymentCollection, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LogbookBestPeriodService, LogbookPeriod, LoginForm, LossTypeEnum, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, MyTaxBusinessDetails, MyTaxBusinessDetailsForm, MyTaxBusinessIncome, MyTaxBusinessIncomeForm, MyTaxBusinessIncomeOrLossesForm, MyTaxBusinessLosses, MyTaxBusinessLossesForm, MyTaxCgt, MyTaxCgtForm, MyTaxDeductions, MyTaxDeductionsForm, MyTaxDividends, MyTaxDividendsForm, MyTaxEstimate, MyTaxIncomeStatements, MyTaxIncomeStatementsForm, MyTaxIncomeTests, MyTaxIncomeTestsForm, MyTaxInterest, MyTaxInterestForm, MyTaxLosses, MyTaxLossesForm, MyTaxMedicareForm, MyTaxOffsets, MyTaxOffsetsForm, MyTaxOtherIncome, MyTaxOtherIncomeForm, MyTaxPartnershipsAndTrusts, MyTaxPartnershipsAndTrustsForm, MyTaxRent, MyTaxRentForm, Notification, Occupation, OccupationService, PASSWORD_REGEXPS, PasswordForm, PdfFromDataTableService, PdfFromDomElementService, PdfFromHtmlTableService, PdfFromTableService, PdfOrientationEnum, PdfSettings, Phone, PhoneForm, PhoneTypeEnum, PreloaderService, Property, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementCollection, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentService, PropertyEquityChartData, PropertyEquityChartItem, PropertyEquityChartTypeEnum, PropertyForecast, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciation, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleCollection, PropertySaleCostBase, PropertySaleCostBaseForm, PropertySaleCostSaleForm, PropertySaleExemptionsForm, PropertySaleService, PropertySaleTaxExemptionMetadata, PropertySaleTaxExemptionMetadataCollection, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareCollection, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, ReceiptService, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, RestService$1 as RestService, RewardfulService, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentService, ServicePaymentStatusEnum, ServicePrice, ServicePriceCollection, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductCollection, ServiceProductIdEnum, ServiceProductService, ServiceProductStatusEnum, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, ShareFilterOptionsEnum, SoleBusiness, SoleBusinessActivity, SoleBusinessActivityService, SoleBusinessAllocation, SoleBusinessAllocationsForm, SoleBusinessForm, SoleBusinessLoss, SoleBusinessLossForm, SoleBusinessLossOffsetRule, SoleBusinessLossOffsetRuleService, SoleBusinessLossReport, SoleBusinessLossService, SoleBusinessLossesCollection, SoleBusinessService, SoleContact, SoleContactForm, SoleContactService, SoleDepreciationMethod, SoleDepreciationMethodEnum, SoleDepreciationMethodForm, SoleDepreciationMethodService, SoleDetails, SoleDetailsForm, SoleDetailsService, SoleForecast, SoleForecastService, SoleInvoice, SoleInvoiceCollection, SoleInvoiceForm, SoleInvoiceItem, SoleInvoiceItemCollection, SoleInvoiceItemForm, SoleInvoiceService, SoleInvoiceStatusesEnum, SoleInvoiceTaxTypeEnum, SoleInvoiceTemplate, SoleInvoiceTemplateForm, SoleInvoiceTemplateService, SoleInvoiceTemplateTaxTypeEnum, SpareDocumentSpareTypeEnum, SseService, StatesEnum, SubscriptionItemCollection, SubscriptionService, TAX_RETURN_CATEGORIES, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetadata, TaxExemptionMetadataEnum, TaxExemptionService, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionBaseForm, TransactionCalculationService, TransactionCategoryEnum, TransactionCollection, TransactionForm, TransactionMetadata, TransactionOperationEnum, TransactionReceipt, TransactionReceiptService, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, TutorialVideoService, USER_ROLES, USER_WORK_POSITION, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeCollection, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserInviteForm, UserMedicareExemptionEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, UsersInviteService, Vehicle, VehicleClaim, VehicleClaimCollection, VehicleClaimDetails, VehicleClaimDetailsForm, VehicleClaimDetailsMethodEnum, VehicleClaimDetailsService, VehicleClaimForm, VehicleClaimService, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookForm, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleService, WorkExpenseForm, WorkIncomeForm, XlsxService, atLeastOneCheckedValidator, atoLinks, autocompleteValidator, cloneDeep, compare, compareMatOptions, conditionalValidator, createDate, currentFinYearValidator, displayMatOptions, enumToList, fieldsSumValidator, getDocIcon, minDateValidator, passwordMatchValidator, passwordValidator, replace, roundTo, sort, sortDeep, taxReviewFilterPredicate, toArray };
-//# sourceMappingURL=taxtank-core.js.map
+//# sourceMappingURL=taxtank-core.mjs.map