taxtank-core 0.30.40 → 0.30.42

package/fesm2020/taxtank-core.mjs

@@ -25,7 +25,6 @@ import concat from 'lodash/concat';
 import cloneDeep$1 from 'lodash/cloneDeep';
 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';
 import * as i4 from '@angular/router';
 import { NavigationEnd } from '@angular/router';
 import _ from 'lodash';
@@ -38,6 +37,7 @@ import html2pdf from 'html2pdf.js';
 import isEqual from 'lodash/isEqual';
 import * as xlsx from 'xlsx';
 import * as FileSaver from 'file-saver';
+import round from 'lodash/round';
 
 /**
  * https://api-uat.corelogic.asia/property/au/v2/suggest.json
@@ -55,9 +55,7 @@ class CorelogicService {
     getAccessToken(force = false) {
         if (!this._accessToken || force) {
             this.http.get(`${this.environment.coreLogicUrl}/access/oauth/token?grant_type=client_credentials&client_id=${this.environment.coreLogicId}&client_secret=${this.environment.coreLogicSecret}`)
-                .pipe(map((response) => {
-                return response.access_token;
-            }))
+                .pipe(map((response) => response.access_token))
                 .subscribe((token) => {
                 this._accessToken = token;
                 this.accessTokenSubject.next(this._accessToken);
@@ -68,14 +66,12 @@ class CorelogicService {
     getSuggestions(query, country = 'au') {
         // @TODO handle different countries in future
         return this.http.get(`${this.environment.coreLogicUrl}/property/${country}/v2/suggest.json?q=${query}`)
-            .pipe(map((response) => {
-            return response.suggestions.map((item) => plainToClass(CorelogicSuggestion, item));
-        }));
+            .pipe(map((response) => response.suggestions.map((item) => plainToClass(CorelogicSuggestion, item))));
     }
 }
-CorelogicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: CorelogicService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-CorelogicService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: CorelogicService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -103,9 +99,7 @@ class CorelogicInterceptor {
             return next.handle(request);
         }
         return this.corelogicService.getAccessToken()
-            .pipe(mergeMap((token) => {
-            return next.handle(this.addToken(request, token));
-        }));
+            .pipe(mergeMap((token) => next.handle(this.addToken(request, token))));
     }
     addToken(request, token) {
         return request.clone({
@@ -115,9 +109,9 @@ class CorelogicInterceptor {
         });
     }
 }
-CorelogicInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: CorelogicInterceptor, deps: [{ token: CorelogicService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-CorelogicInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: CorelogicInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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 +148,9 @@ class FinancialYearInterceptor {
         return next.handle(clonedReq);
     }
 }
-FinancialYearInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: FinancialYearInterceptor, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-FinancialYearInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: FinancialYearInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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,
@@ -454,9 +448,7 @@ __decorate([
 __decorate([
     Exclude({ toPlainOnly: true }),
     Type(() => Object),
-    Transform(({ obj }) => {
-        return obj.file;
-    })
+    Transform(({ obj }) => obj.file)
 ], TransactionBase.prototype, "file", void 0);
 __decorate([
     Exclude()
@@ -1280,7 +1272,6 @@ class ExportableCollection extends Collection {
     getExportFooter(type) {
         return [];
     }
-    ;
     export(type) {
         return plainToClass(ExportDataTable, {
             header: this.getExportHeader(type),
@@ -1319,26 +1310,22 @@ class LoanPaymentCollection extends ExportableCollection {
         ];
     }
     getExportBody() {
-        return this.items.map((payment) => {
-            return [
-                plainToClass(ExportCell, { value: payment.number, type: ExportCellTypeEnum.STRING }),
-                plainToClass(ExportCell, { value: payment.date, type: ExportCellTypeEnum.DATE }),
-                plainToClass(ExportCell, { value: payment.paymentDue, type: ExportCellTypeEnum.CURRENCY }),
-                plainToClass(ExportCell, { value: payment.interestAccrued, type: ExportCellTypeEnum.CURRENCY }),
-                plainToClass(ExportCell, { value: payment.principalPaid, type: ExportCellTypeEnum.CURRENCY }),
-                plainToClass(ExportCell, { value: payment.principalBalance, type: ExportCellTypeEnum.CURRENCY }),
-                plainToClass(ExportCell, { value: payment.payout, type: ExportCellTypeEnum.CURRENCY }),
-            ];
-        });
+        return this.items.map((payment) => [
+            plainToClass(ExportCell, { value: payment.number, type: ExportCellTypeEnum.STRING }),
+            plainToClass(ExportCell, { value: payment.date, type: ExportCellTypeEnum.DATE }),
+            plainToClass(ExportCell, { value: payment.paymentDue, type: ExportCellTypeEnum.CURRENCY }),
+            plainToClass(ExportCell, { value: payment.interestAccrued, type: ExportCellTypeEnum.CURRENCY }),
+            plainToClass(ExportCell, { value: payment.principalPaid, type: ExportCellTypeEnum.CURRENCY }),
+            plainToClass(ExportCell, { value: payment.principalBalance, type: ExportCellTypeEnum.CURRENCY }),
+            plainToClass(ExportCell, { value: payment.payout, type: ExportCellTypeEnum.CURRENCY }),
+        ]);
     }
     get paymentDue() {
         return this.sumBy('paymentDue');
     }
     getByFinYear(finYear = new FinancialYear()) {
-        return this.filter((payment) => {
-            return new Date(payment.date) >= finYear.startDate &&
-                new Date(payment.date) <= finYear.endDate;
-        });
+        return this.filter((payment) => new Date(payment.date) >= finYear.startDate &&
+            new Date(payment.date) <= finYear.endDate);
     }
     getForCurrentYear() {
         return this.getByFinYear(new FinancialYear());
@@ -1577,9 +1564,7 @@ var ServiceSubscriptionStatusEnum;
 
 class MessageCollection extends Collection {
     getFirstUnreadMessage(user) {
-        return this.items.find((message) => {
-            return !message.isRead() && message.isFromEmployee() !== user.isEmployee();
-        });
+        return this.items.find((message) => !message.isRead() && message.isFromEmployee() !== user.isEmployee());
     }
     /**
      * Get List of unread chats
@@ -1777,9 +1762,7 @@ class PropertyCollection extends Collection {
         return new PropertyCollection(this.items.filter((property) => property.category.isOwnerOccupied()));
     }
     get earliestContractDate() {
-        return this.items.reduce((min, property) => {
-            return min < property.contractDate ? min : property.contractDate;
-        }, new FinancialYear(new Date()).startDate);
+        return this.items.reduce((min, property) => min < property.contractDate ? min : property.contractDate, new FinancialYear(new Date()).startDate);
     }
     /**
      * Get list of unique property categories from collection
@@ -1791,9 +1774,7 @@ class PropertyCollection extends Collection {
      * Get property with the highest growth percent
      */
     getBestPerformanceGrowthProperty() {
-        return this.items.reduce((max, current) => {
-            return max.growthPercent < current.growthPercent ? current : max;
-        }, this.first);
+        return this.items.reduce((max, current) => max.growthPercent < current.growthPercent ? current : max, this.first);
     }
     /**
      * Get property with the lowest tax position
@@ -1833,9 +1814,7 @@ class PropertyCategoryMovementCollection extends Collection {
      */
     getByForecast(property, forecast) {
         const financialYear = new FinancialYear(forecast.financialYear);
-        return this.filterBy('property.id', property.id).filter((movement) => {
-            return movement.fromDate <= financialYear.endDate && !movement.toDate || movement.toDate >= financialYear.startDate;
-        });
+        return this.filterBy('property.id', property.id).filter((movement) => movement.fromDate <= financialYear.endDate && !movement.toDate || movement.toDate >= financialYear.startDate);
     }
     hasCategory(categoryId) {
         return !!this.findBy('propertyCategory.id', categoryId);
@@ -1849,9 +1828,7 @@ class PropertyShareCollection extends Collection {
      * @TODO Alex: rename
      */
     getIncoming() {
-        return this.filter((propertyShare) => {
-            return propertyShare.user?.isLoggedIn() && propertyShare.isPending() && propertyShare.property.user.id !== +localStorage.getItem('userId');
-        });
+        return this.filter((propertyShare) => propertyShare.user?.isLoggedIn() && propertyShare.isPending() && propertyShare.property.user.id !== +localStorage.getItem('userId'));
     }
     /**
      * Get list of outcoming property shares
@@ -3263,7 +3240,6 @@ class SoleForecast extends SoleForecast$1 {
     get netPay() {
         return this.amount;
     }
-    ;
 }
 __decorate([
     Type(() => IncomeSource)
@@ -3454,33 +3430,23 @@ __decorate([
     Type(() => ChartAccounts)
     // @TODO Alex: Create custom decorator for this transform
     ,
-    Transform(({ value }) => {
-        return { id: value.id };
-    }, { toPlainOnly: true })
+    Transform(({ value }) => ({ id: value.id }), { toPlainOnly: true })
 ], AllocationRuleTransaction.prototype, "chartAccounts", void 0);
 __decorate([
     Type(() => Property),
-    Transform(({ value }) => {
-        return value ? { id: value.id } : null;
-    }, { toPlainOnly: true })
+    Transform(({ value }) => value ? { id: value.id } : null, { toPlainOnly: true })
 ], AllocationRuleTransaction.prototype, "property", void 0);
 __decorate([
     Type(() => Loan),
-    Transform(({ value }) => {
-        return value ? { id: value.id } : null;
-    }, { toPlainOnly: true })
+    Transform(({ value }) => value ? { id: value.id } : null, { toPlainOnly: true })
 ], AllocationRuleTransaction.prototype, "loan", void 0);
 __decorate([
     Type(() => IncomeSource),
-    Transform(({ value }) => {
-        return value ? { id: value.id } : null;
-    }, { toPlainOnly: true })
+    Transform(({ value }) => value ? { id: value.id } : null, { toPlainOnly: true })
 ], AllocationRuleTransaction.prototype, "incomeSource", void 0);
 __decorate([
     Type(() => SoleBusiness),
-    Transform(({ value }) => {
-        return value ? { id: value.id } : null;
-    }, { toPlainOnly: true })
+    Transform(({ value }) => value ? { id: value.id } : null, { toPlainOnly: true })
 ], AllocationRuleTransaction.prototype, "business", void 0);
 __decorate([
     Type(() => AllocationRuleTransactionMetaField)
@@ -3557,7 +3523,7 @@ class AllocationRule extends AllocationRule$1 {
      * Rule is matched when all conditions matched
      */
     checkAnd(bankTransaction) {
-        for (let condition of this.conditions) {
+        for (const condition of this.conditions) {
             if (!condition.matchBankTransaction(bankTransaction)) {
                 return false;
             }
@@ -3568,7 +3534,7 @@ class AllocationRule extends AllocationRule$1 {
      * Rule is matched when at least one condition matched
      */
     checkOr(bankTransaction) {
-        for (let condition of this.conditions) {
+        for (const condition of this.conditions) {
             if (condition.matchBankTransaction(bankTransaction)) {
                 return true;
             }
@@ -3600,7 +3566,7 @@ class AllocationRule extends AllocationRule$1 {
 }
 __decorate([
     Type(() => BankAccount),
-    Transform(({ value }) => { return { id: value.id }; }, { toPlainOnly: true })
+    Transform(({ value }) => ({ id: value.id }), { toPlainOnly: true })
 ], AllocationRule.prototype, "bankAccount", void 0);
 __decorate([
     Type(() => AllocationRuleCondition)
@@ -3992,12 +3958,8 @@ class PropertyEquityChartData {
         const items = this.list.filter((item) => item.year <= this.currentYear);
         items.forEach((item) => {
             // increase item values with property actual forecasts for item year
-            item.marketValue = this.properties.items.reduce((sum, property) => {
-                return sum + this.getMarketValueForPropertyByYear(property, item.year);
-            }, 0);
-            item.loanBalance = Math.abs(this.properties.items.reduce((sum, property) => {
-                return sum + this.getLoanBalanceForPropertyByYear(property, item.year);
-            }, 0));
+            item.marketValue = this.properties.items.reduce((sum, property) => sum + this.getMarketValueForPropertyByYear(property, item.year), 0);
+            item.loanBalance = Math.abs(this.properties.items.reduce((sum, property) => sum + this.getLoanBalanceForPropertyByYear(property, item.year), 0));
         });
     }
     /**
@@ -4007,9 +3969,7 @@ class PropertyEquityChartData {
     buildActualItem() {
         const item = this.list.find((i) => i.year === this.currentYear);
         item.marketValue = this.properties.marketValue;
-        item.loanBalance = this.properties.items.reduce((sum, property) => {
-            return sum + Math.abs(this.bankAccounts.getPropertyBalanceAmount(property.id));
-        }, 0);
+        item.loanBalance = this.properties.items.reduce((sum, property) => sum + Math.abs(this.bankAccounts.getPropertyBalanceAmount(property.id)), 0);
     }
     /**
      * collect equity position items with forecasted (future) calculated values
@@ -4041,9 +4001,7 @@ class PropertyEquityChartData {
      * @private
      */
     getLoanBalanceByYear(property, year, bankAccounts, loans) {
-        return bankAccounts.items.reduce((totalSum, bankAccount) => {
-            return totalSum + (bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.getLastPaymentByYear(year)?.totalOwed || 0));
-        }, 0);
+        return bankAccounts.items.reduce((totalSum, bankAccount) => totalSum + (bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.getLastPaymentByYear(year)?.totalOwed || 0)), 0);
     }
     getMarketValueForPropertyByYear(property, year) {
         if (new FinancialYear(property.contractDate).year > year) {
@@ -5077,9 +5035,7 @@ class Transaction extends Transaction$1 {
      * @Todo modify 'metaFields' property from array to Collection
      */
     getMetaFieldValue(field) {
-        return +this.metaFields.find((transactionMetaField) => {
-            return transactionMetaField.chartAccountsMetaField.id === field;
-        })?.value || 0;
+        return +this.metaFields.find((transactionMetaField) => transactionMetaField.chartAccountsMetaField.id === field)?.value || 0;
     }
     isCash() {
         return this.source === TransactionSourceEnum.CASH;
@@ -5270,9 +5226,7 @@ class Depreciation extends Depreciation$1 {
      * @TODO Vik: Research a problem with depreciations without current year forecast
      */
     get currentYearForecast() {
-        return this.forecasts.find((forecast) => {
-            return forecast.financialYear === new FinancialYear().year;
-        }) || plainToClass(DepreciationForecast, {
+        return this.forecasts.find((forecast) => forecast.financialYear === new FinancialYear().year) || plainToClass(DepreciationForecast, {
             financialYear: new FinancialYear().year,
             openBalance: 0,
             closeBalance: 0,
@@ -5281,9 +5235,7 @@ class Depreciation extends Depreciation$1 {
         });
     }
     getForecastByYear(year) {
-        return this.forecasts.find((forecast) => {
-            return forecast.financialYear === year;
-        });
+        return this.forecasts.find((forecast) => forecast.financialYear === year);
     }
     getClaimAmountByYear(year) {
         return this.getForecastByYear(year)?.claimAmount || 0;
@@ -5428,14 +5380,10 @@ class TransactionCollection extends ExportableCollection {
         return this.sumBy('amount');
     }
     getUnallocated(allocations) {
-        return new TransactionCollection(this.items.filter((transaction) => {
-            return !transaction.isAllocated(allocations);
-        }));
+        return new TransactionCollection(this.items.filter((transaction) => !transaction.isAllocated(allocations)));
     }
     getUnallocatedAmount(allocations) {
-        return this.items.reduce((sum, transaction) => {
-            return sum + transaction.getUnallocatedAmount(allocations.filterBy('transaction.id', transaction.id));
-        }, 0);
+        return this.items.reduce((sum, transaction) => sum + transaction.getUnallocatedAmount(allocations.filterBy('transaction.id', transaction.id)), 0);
     }
     /**
      * get date of the last transaction
@@ -5495,9 +5443,7 @@ class TransactionCollection extends ExportableCollection {
      * @param ids Ids of properties for filter
      */
     getByPropertiesIds(ids) {
-        return new TransactionCollection(this.items.filter((transaction) => {
-            return ids.includes(transaction.property?.id);
-        }));
+        return new TransactionCollection(this.items.filter((transaction) => ids.includes(transaction.property?.id)));
     }
     /**
      * Get new collection filtered by income source id
@@ -5532,9 +5478,7 @@ class TransactionCollection extends ExportableCollection {
      * Get transactions related to Vehicle category
      */
     getVehicleTransactions() {
-        return this.create(this.items.filter((transaction) => {
-            return transaction.isVehicleTransaction();
-        }));
+        return this.create(this.items.filter((transaction) => transaction.isVehicleTransaction()));
     }
     /**
      * Get new transaction collection filtered by tank type
@@ -5566,14 +5510,12 @@ class TransactionCollection extends ExportableCollection {
         ];
     }
     getExportBody() {
-        return this.items.map((transaction) => {
-            return [
-                plainToClass(ExportCell, { value: transaction.date, type: ExportCellTypeEnum.DATE }),
-                plainToClass(ExportCell, { value: transaction.description, type: ExportCellTypeEnum.STRING }),
-                plainToClass(ExportCell, { value: transaction.debit, type: ExportCellTypeEnum.CURRENCY }),
-                plainToClass(ExportCell, { value: transaction.credit, type: ExportCellTypeEnum.CURRENCY })
-            ];
-        });
+        return this.items.map((transaction) => [
+            plainToClass(ExportCell, { value: transaction.date, type: ExportCellTypeEnum.DATE }),
+            plainToClass(ExportCell, { value: transaction.description, type: ExportCellTypeEnum.STRING }),
+            plainToClass(ExportCell, { value: transaction.debit, type: ExportCellTypeEnum.CURRENCY }),
+            plainToClass(ExportCell, { value: transaction.credit, type: ExportCellTypeEnum.CURRENCY })
+        ]);
     }
     /**
      * Get list of vehicle transactions filtered by vehicle claim
@@ -5693,29 +5635,19 @@ class DepreciationCollection extends Collection {
         return this.items.reduce((sum, depreciation) => sum + depreciation.amount, 0);
     }
     get claimAmount() {
-        return this.items.reduce((sum, depreciation) => {
-            return sum + depreciation.currentYearForecast.claimAmount;
-        }, 0);
+        return this.items.reduce((sum, depreciation) => sum + depreciation.currentYearForecast.claimAmount, 0);
     }
     getClaimedAmountByYear(year = +localStorage.getItem('financialYear')) {
-        return +Math.round(this.amount - this.items.reduce((sum, depreciation) => {
-            return sum + depreciation.getCloseBalanceByYear(year);
-        }, 0)).toFixed(2);
+        return +Math.round(this.amount - this.items.reduce((sum, depreciation) => sum + depreciation.getCloseBalanceByYear(year), 0)).toFixed(2);
     }
     getClaimAmountByYear(year = +localStorage.getItem('financialYear')) {
-        return this.items.reduce((sum, depreciation) => {
-            return sum + depreciation.getClaimAmountByYear(year);
-        }, 0);
+        return this.items.reduce((sum, depreciation) => sum + depreciation.getClaimAmountByYear(year), 0);
     }
     getCloseBalanceByYear(year = +localStorage.getItem('financialYear')) {
-        return this.items.reduce((sum, depreciation) => {
-            return sum + depreciation.getCloseBalanceByYear(year);
-        }, 0);
+        return this.items.reduce((sum, depreciation) => sum + depreciation.getCloseBalanceByYear(year), 0);
     }
     getCurrentYearForecastAmount() {
-        return this.items.reduce((sum, depreciation) => {
-            return sum + depreciation.currentYearForecast.amount;
-        }, 0);
+        return this.items.reduce((sum, depreciation) => sum + depreciation.currentYearForecast.amount, 0);
     }
     get closeBalance() {
         return this.sumBy('currentYearForecast.closeBalance');
@@ -5757,9 +5689,7 @@ class DepreciationCollection extends Collection {
         return this.filter((depreciation) => depreciation.isSBP());
     }
     getCapitalProjects() {
-        return uniqBy(compact(this.items.map((depreciation) => {
-            return depreciation.depreciationCapitalProject;
-        })), 'id');
+        return uniqBy(compact(this.items.map((depreciation) => depreciation.depreciationCapitalProject)), 'id');
     }
     /**
      * Get a new collection of depreciations related to vehicles
@@ -5838,9 +5768,7 @@ class DepreciationReportItemCollection extends DepreciationCollection {
      * Create new collection from provided depreciations list
      */
     static fromDepreciations(deprectiations) {
-        return new DepreciationReportItemCollection(deprectiations.map((depreciation) => {
-            return plainToClass(DepreciationReportItem, depreciation);
-        }));
+        return new DepreciationReportItemCollection(deprectiations.map((depreciation) => plainToClass(DepreciationReportItem, depreciation)));
     }
 }
 
@@ -5973,9 +5901,7 @@ class VehicleExpenseCollection extends Collection {
     setItems(transactions, depreciations, vehicleClaim) {
         this.items = [];
         const transactionsByChartAccounts = new CollectionDictionary(transactions, 'chartAccounts.name');
-        const transactionExpenses = transactionsByChartAccounts.keys.map((chartAccountsName) => {
-            return new VehicleExpense(transactionsByChartAccounts.get(chartAccountsName).amount, vehicleClaim.workUsage, chartAccountsName);
-        });
+        const transactionExpenses = transactionsByChartAccounts.keys.map((chartAccountsName) => new VehicleExpense(transactionsByChartAccounts.get(chartAccountsName).amount, vehicleClaim.workUsage, chartAccountsName));
         // group all depreciations into one expense item
         const depreciationExpense = new VehicleExpense(depreciations.getCurrentYearForecastAmount(), vehicleClaim.workUsage, 'Depreciation');
         this.items.push(...[depreciationExpense, ...transactionExpenses]);
@@ -6189,14 +6115,10 @@ class ServiceSubscriptionCollection extends Collection {
         return dictionary;
     }
     findByProduct(product) {
-        return this.find((subscription) => {
-            return !!subscription.items.find((item) => item.price.product.id === product.id);
-        });
+        return this.find((subscription) => !!subscription.items.find((item) => item.price.product.id === product.id));
     }
     filterByProduct(product) {
-        return this.filter((subscription) => {
-            return !!subscription.items.find((item) => item.price.product.id === product.id);
-        });
+        return this.filter((subscription) => !!subscription.items.find((item) => item.price.product.id === product.id));
     }
     hasPropertyTank() {
         return !!this.getItems().propertiesItem;
@@ -6212,8 +6134,8 @@ class ReportItemCollection extends Collection {
      * Search items which has details
      */
     getBySection(section) {
-        let result = [];
-        for (let reportItem of this.items) {
+        const result = [];
+        for (const reportItem of this.items) {
             if ((reportItem.details.length || reportItem.amount) && reportItem.taxReturnCategory.section === section) {
                 result.push(reportItem);
             }
@@ -6224,8 +6146,8 @@ class ReportItemCollection extends Collection {
         return this.create(result);
     }
     getByCategory(categoryId) {
-        let result = [];
-        for (let reportItem of this.items) {
+        const result = [];
+        for (const reportItem of this.items) {
             if (reportItem.taxReturnCategory.id === categoryId) {
                 result.push(reportItem);
             }
@@ -6240,7 +6162,7 @@ class ReportItemCollection extends Collection {
      */
     findByCategory(categoryId) {
         let result;
-        for (let reportItem of this.items) {
+        for (const reportItem of this.items) {
             if (result) {
                 break;
             }
@@ -6289,8 +6211,8 @@ class ReportItemCollection extends Collection {
      * @TODO Alex: consider to create and move to ReportItemDetailsCollection
      */
     getDetailsByIncomeSource(incomeSource) {
-        let result = [];
-        for (let reportItem of this.items) {
+        const result = [];
+        for (const reportItem of this.items) {
             if (reportItem.details.length) {
                 result.push(...reportItem.details.filter((details) => details.name === incomeSource.name));
             }
@@ -6648,46 +6570,32 @@ class BankAccountCollection extends Collection {
      */
     getInitialLoanAmount() {
         return this.getByType(TYPE_LOAN)
-            .reduce((sum, bankAccount) => {
-            return sum += bankAccount.balances.length ? bankAccount.getOpeningBalance() : 0;
-        }, 0);
+            .reduce((sum, bankAccount) => sum += bankAccount.balances.length ? bankAccount.getOpeningBalance() : 0, 0);
     }
     /**
      * get amount of current loans
      */
     getCurrentLoanAmount() {
         return this.getByType(TYPE_LOAN)
-            .reduce((sum, bankAccount) => {
-            return sum += bankAccount.currentBalance;
-        }, 0);
+            .reduce((sum, bankAccount) => sum += bankAccount.currentBalance, 0);
     }
     /**
      * get collection filtered by property id
      */
     getByPropertyId(id) {
-        return new BankAccountCollection(this.items.filter((bankAccount) => {
-            return bankAccount.bankAccountProperties.find((bankAccountProperty) => {
-                return bankAccountProperty.property.id === id;
-            });
-        }));
+        return new BankAccountCollection(this.items.filter((bankAccount) => bankAccount.bankAccountProperties.find((bankAccountProperty) => bankAccountProperty.property.id === id)));
     }
     /**
      * get collection filtered by properties ids
      */
     getByPropertiesIds(ids) {
-        return new BankAccountCollection(this.items.filter((bankAccount) => {
-            return bankAccount.bankAccountProperties.find((bankAccountProperty) => {
-                return ids.includes(bankAccountProperty.property.id);
-            });
-        }));
+        return new BankAccountCollection(this.items.filter((bankAccount) => bankAccount.bankAccountProperties.find((bankAccountProperty) => ids.includes(bankAccountProperty.property.id))));
     }
     /**
      * get collection of active bank accounts
      */
     getActiveBankAccounts() {
-        return new BankAccountCollection(this.items.filter((bankAccount) => {
-            return bankAccount.isActive();
-        }));
+        return new BankAccountCollection(this.items.filter((bankAccount) => bankAccount.isActive()));
     }
     /**
      * get reduction of loan (reduction of principle) percentage
@@ -6737,22 +6645,16 @@ class BankAccountCollection extends Collection {
      * Get list of all bank account properties
      */
     getBankAccountPropertiesList() {
-        return flatten(this.items.map((bankAccount) => {
-            return bankAccount.bankAccountProperties;
-        }));
+        return flatten(this.items.map((bankAccount) => bankAccount.bankAccountProperties));
     }
     /**
      * Get lis of unique properties from all bank accounts properties
      */
     getProperties() {
-        return uniqBy(this.getBankAccountPropertiesList().map((bankAccountProperty) => {
-            return bankAccountProperty.property;
-        }), 'id');
+        return uniqBy(this.getBankAccountPropertiesList().map((bankAccountProperty) => bankAccountProperty.property), 'id');
     }
     getPropertyBalanceAmount(propertyId) {
-        return this.items.reduce((sum, bankAccount) => {
-            return sum + bankAccount.getPropertyBalanceAmount(propertyId);
-        }, 0);
+        return this.items.reduce((sum, bankAccount) => sum + bankAccount.getPropertyBalanceAmount(propertyId), 0);
     }
     getOwn() {
         // TODO Alex/Vik: maybe we should get it from jwtToken or think about some localStorageService?
@@ -6830,10 +6732,8 @@ class BankTransactionCollection extends Collection {
      * Find Bank Transaction available for transfer
      */
     findTransfer(bankTransaction) {
-        return this.items.find((item) => {
-            return item.amount + bankTransaction.amount === 0 &&
-                Math.abs(bankTransaction.date.getTime() - item.date.getTime()) < TRANSACTION_TRANSFER_DELAY;
-        });
+        return this.items.find((item) => item.amount + bankTransaction.amount === 0 &&
+            Math.abs(bankTransaction.date.getTime() - item.date.getTime()) < TRANSACTION_TRANSFER_DELAY);
     }
     /**
      * Group bank transactions by transaction id.
@@ -7061,12 +6961,10 @@ class TaxReviewCollection extends Collection {
      */
     getInWork() {
         return this.items
-            .filter((taxReview) => {
-            return taxReview.isInProgress() ||
-                taxReview.isWaitingForClient() ||
-                taxReview.isWaitingForApproval() ||
-                taxReview.isApproved();
-        });
+            .filter((taxReview) => taxReview.isInProgress() ||
+            taxReview.isWaitingForClient() ||
+            taxReview.isWaitingForApproval() ||
+            taxReview.isApproved());
     }
     /**
      * Get percentage of completed reviews of the total review amount
@@ -7163,7 +7061,7 @@ class ServiceSubscription extends ServiceSubscription$1 {
         return !!this.stripeId;
     }
     get initialPrice() {
-        let price = this.items.reduce((sum, item) => sum + item.total, 0);
+        const price = this.items.reduce((sum, item) => sum + item.total, 0);
         return price;
     }
     get discountAmount() {
@@ -7210,14 +7108,10 @@ class ServiceSubscription extends ServiceSubscription$1 {
         return this.items.find((item) => item.price.product.isProperties());
     }
     hasPropertyTank() {
-        return !!this.items.find((subscriptionItem) => {
-            return subscriptionItem.price.product.role.includes(UserRolesEnum.PROPERTY_TANK);
-        });
+        return !!this.items.find((subscriptionItem) => subscriptionItem.price.product.role.includes(UserRolesEnum.PROPERTY_TANK));
     }
     hasWorkTank() {
-        return !!this.items.find((subscriptionItem) => {
-            return subscriptionItem.price.product.role.includes(UserRolesEnum.WORK_TANK);
-        });
+        return !!this.items.find((subscriptionItem) => subscriptionItem.price.product.role.includes(UserRolesEnum.WORK_TANK));
     }
     /**
      * bought before price updates, active for some time to let customer select a new plan
@@ -7473,9 +7367,7 @@ class Property extends Property$1 {
         return this.currentYearForecast?.cashPosition || 0;
     }
     get firstForecastYear() {
-        return this.forecasts.reduce((min, forecast) => {
-            return min > forecast.financialYear ? forecast.financialYear : min;
-        }, new FinancialYear().year);
+        return this.forecasts.reduce((min, forecast) => min > forecast.financialYear ? forecast.financialYear : min, new FinancialYear().year);
     }
     get marketValueGrowth() {
         return (this.marketValue - this.purchasePrice) / this.marketValue;
@@ -7484,9 +7376,7 @@ class Property extends Property$1 {
         return this.shares.find((share) => share.user.id === +localStorage.getItem('userId'));
     }
     get actualValuation() {
-        return this.valuations.reduce((maxDateValuation, valuation) => {
-            return maxDateValuation.date > valuation.date ? maxDateValuation : valuation;
-        }, this.valuations[0]);
+        return this.valuations.reduce((maxDateValuation, valuation) => maxDateValuation.date > valuation.date ? maxDateValuation : valuation, this.valuations[0]);
     }
     get claimPercent() {
         return this.currentYearForecast.claimPercent;
@@ -7889,12 +7779,10 @@ class BankAccountChartData {
      * set value of pie chart data
      */
     getBalancePieChartData() {
-        return this.bankAccounts.map((bankAccount) => {
-            return {
-                name: bankAccount.accountName,
-                data: Math.abs(bankAccount.currentBalance)
-            };
-        });
+        return this.bankAccounts.map((bankAccount) => ({
+            name: bankAccount.accountName,
+            data: Math.abs(bankAccount.currentBalance)
+        }));
     }
     /**
      * set value of bar chart data
@@ -7902,12 +7790,10 @@ class BankAccountChartData {
     getBalanceBarChartData() {
         return [{
                 name: 'Balance',
-                data: this.bankAccounts.map((bankAccount) => {
-                    return {
-                        label: bankAccount.accountName,
-                        value: bankAccount.currentBalance
-                    };
-                })
+                data: this.bankAccounts.map((bankAccount) => ({
+                    label: bankAccount.accountName,
+                    value: bankAccount.currentBalance
+                }))
             }];
     }
 }
@@ -7971,9 +7857,7 @@ class BankTransactionChartData {
             }];
         for (const key in MonthNameShortEnum) {
             if (MonthNameShortEnum.hasOwnProperty(key)) {
-                const bankTransactionsForMonth = this.bankTransactions.filter((bankTransaction) => {
-                    return +bankTransaction.date.getMonth() === +MonthNumberEnum[key];
-                });
+                const bankTransactionsForMonth = this.bankTransactions.filter((bankTransaction) => +bankTransaction.date.getMonth() === +MonthNumberEnum[key]);
                 const cashInForMonth = bankTransactionsForMonth
                     .filter((bankTransaction) => bankTransaction.isCredit())
                     .reduce((sum, bankTransaction) => sum += bankTransaction.allocatedAmount, 0);
@@ -8002,16 +7886,12 @@ class BankTransactionChartData {
             }];
         for (const key in MonthNameShortEnum) {
             if (MonthNameShortEnum.hasOwnProperty(key)) {
-                const bankTransactionsForMonth = this.bankTransactions.filter((bankTransaction) => {
-                    return +bankTransaction.date.getMonth() === +MonthNumberEnum[key];
-                });
+                const bankTransactionsForMonth = this.bankTransactions.filter((bankTransaction) => +bankTransaction.date.getMonth() === +MonthNumberEnum[key]);
                 const balanceForMonth = bankTransactionsForMonth.reduce((sum, bankTransaction) => {
                     if (bankTransaction.isCredit()) {
                         return sum += bankTransaction.allocatedAmount;
                     }
-                    else {
-                        return sum -= bankTransaction.allocatedAmount;
-                    }
+                    return sum -= bankTransaction.allocatedAmount;
                 }, 0);
                 chartData[0].data.push({
                     label: MonthNameShortEnum[key],
@@ -8457,23 +8337,9 @@ __decorate([
 ], HoldingType.prototype, "exchange", void 0);
 
 class HoldingSale extends AbstractModel {
-    getCapitalGain(holding) {
-        if (!this.price || !this.holding) {
-            return 0;
-        }
-        return (this.price - holding.price) * this.quantity;
-    }
-    getNetCapitalGain(holding) {
-        const capitalGain = this.getCapitalGain(holding);
-        // 50% discount for holdings purchased over a year ago
-        if (holding.heldMoreYear()) {
-            return capitalGain / 2;
-        }
-        return capitalGain;
-    }
 }
 __decorate([
-    Transform(({ value }) => { return { id: value.id }; }, { toPlainOnly: true })
+    Transform(({ value }) => ({ id: value.id }), { toPlainOnly: true })
 ], HoldingSale.prototype, "holding", void 0);
 __decorate([
     Type(() => Date)
@@ -8648,12 +8514,10 @@ class ClientPortfolioChartData {
         this.clientsPortfolioReportCollection = clientsPortfolioReportCollection;
     }
     getPieChartData() {
-        return this.clientsPortfolioReportCollection.items.map((clientPortfolioReport) => {
-            return plainToClass(ChartData, {
-                name: clientPortfolioReport.category,
-                data: clientPortfolioReport.count
-            });
-        });
+        return this.clientsPortfolioReportCollection.items.map((clientPortfolioReport) => plainToClass(ChartData, {
+            name: clientPortfolioReport.category,
+            data: clientPortfolioReport.count
+        }));
     }
     getBarChartData() {
         return [
@@ -8729,9 +8593,9 @@ class JwtService extends JwtHelperService {
         return this.getUser().id === userId;
     }
 }
-JwtService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: JwtService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-JwtService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: JwtService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -8766,9 +8630,9 @@ class EventDispatcherService {
         this.eventSubject2.next(event);
     }
 }
-EventDispatcherService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: EventDispatcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-EventDispatcherService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: EventDispatcherService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -8817,9 +8681,9 @@ class AuthService {
         location.replace(url);
     }
 }
-AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: AuthService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -8919,20 +8783,18 @@ class JwtInterceptor {
             return this.tokenSubject.pipe(filter(token => token != null), take(1), switchMap(token => next.handle(this.addToken(req))));
             // refresh token
         }
-        else {
-            // subsequent requests should wait until refresh token is ready
-            this.isRefreshingToken = true;
-            this.tokenSubject.next(null);
-            return this.authService.refresh(this.jwtService.getRefreshToken()).pipe(switchMap((tokens) => {
-                this.tokenSubject.next(tokens.token);
-                return next.handle(this.addToken(req));
-            }), catchError(() => {
-                this.authService.logoutFront();
-                return throwError(err);
-            }), finalize(() => {
-                this.isRefreshingToken = false;
-            }));
-        }
+        // subsequent requests should wait until refresh token is ready
+        this.isRefreshingToken = true;
+        this.tokenSubject.next(null);
+        return this.authService.refresh(this.jwtService.getRefreshToken()).pipe(switchMap((tokens) => {
+            this.tokenSubject.next(tokens.token);
+            return next.handle(this.addToken(req));
+        }), catchError(() => {
+            this.authService.logoutFront();
+            return throwError(err);
+        }), finalize(() => {
+            this.isRefreshingToken = false;
+        }));
     }
     /**
      * Handle error messages
@@ -8954,9 +8816,9 @@ class JwtInterceptor {
         });
     }
 }
-JwtInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: JwtInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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,
@@ -8989,9 +8851,9 @@ class UserSwitcherService {
         window.location.replace('/firm/dashboard');
     }
 }
-UserSwitcherService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UserSwitcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-UserSwitcherService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UserSwitcherService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -9037,9 +8899,9 @@ class UserSwitcherInterceptor {
         return next.handle(this.switch(request, this.userSwitcherService.get()));
     }
 }
-UserSwitcherInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UserSwitcherInterceptor, deps: [{ token: UserSwitcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-UserSwitcherInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UserSwitcherInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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,
@@ -9311,9 +9173,9 @@ class PreloaderService {
         this.activePreloaders.next(activePreloaders);
     }
 }
-PreloaderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PreloaderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PreloaderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PreloaderService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -9329,7 +9191,7 @@ class PreloaderInterceptor {
     }
     intercept(request, next) {
         const endpoint = this.findEndpoint(`${request.method} ${request.url}`);
-        if (!!endpoint) {
+        if (endpoint) {
             this.preloaderService.add(endpoint);
             return next.handle(request).pipe(finalize(() => {
                 this.preloaderService.delete(endpoint);
@@ -9341,9 +9203,9 @@ class PreloaderInterceptor {
         return Object.values(ENDPOINTS).find((endpoint) => endpoint.test(requestPath));
     }
 }
-PreloaderInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PreloaderInterceptor, deps: [{ token: PreloaderService }], target: i0.ɵɵFactoryTarget.Injectable });
-PreloaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PreloaderInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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 }]; } });
 
@@ -9370,9 +9232,9 @@ class DataService {
         this.cache = this.createCollectionInstance(this.collectionClass, data.map((item) => this.createModelInstance(item)));
     }
 }
-DataService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: DataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-DataService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: DataService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: DataService, decorators: [{
+DataService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+DataService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DataService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: DataService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -9406,14 +9268,12 @@ class SseService {
                 this.zone.run(() => observer.next(event));
             };
         })
-            .pipe(map((messageEvent) => {
-            return JSON.parse(messageEvent.data);
-        }));
+            .pipe(map((messageEvent) => JSON.parse(messageEvent.data)));
     }
 }
-SseService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: SseService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -9459,7 +9319,6 @@ let RestService$1 = class RestService extends DataService {
         }
         return this.cacheSubject.asObservable();
     }
-    ;
     getSingle() {
         this.handleAccessError('get');
         return this.get().pipe(map((collection) => collection.first));
@@ -9552,7 +9411,6 @@ let RestService$1 = class RestService extends DataService {
             return this.cache;
         }));
     }
-    ;
     /**
      * Handle response data - update cache and dispatch event if it is needed
      */
@@ -9623,9 +9481,9 @@ let RestService$1 = class RestService extends DataService {
      */
     listenEvents() { }
 };
-RestService$1.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: RestService$1, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -9743,9 +9601,9 @@ class ToastService {
         }));
     }
 }
-ToastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ToastService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-ToastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ToastService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -9796,7 +9654,7 @@ class BankConnectionService extends RestService$1 {
             if (error.status === 400) {
                 this.toastService.error('Please enter the login you used before');
             }
-            return throwError$1(error);
+            return throwError(error);
         }));
     }
     /**
@@ -9835,9 +9693,9 @@ BankConnectionService.userEventTypes = [
     UserEventTypeTypeEnum.BASIQ_NEW_ACCOUNTS,
     UserEventTypeTypeEnum.BASIQ_AUTHORIZATION_FAIL
 ];
-BankConnectionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: BankConnectionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -9947,9 +9805,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: "15.2.8", 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.2.8", ngImport: i0, type: BasiqService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -9984,9 +9842,9 @@ class BasiqTokenService extends RestService$1 {
         return this.cacheSubject.asObservable();
     }
 }
-BasiqTokenService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BasiqTokenService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BasiqTokenService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BasiqTokenService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -10005,9 +9863,7 @@ class BasiqTokenInterceptor {
         if (!request.url.includes(BasiqService.basiqApiUrl)) {
             return next.handle(request);
         }
-        return this.basiqTokenService.getSingle().pipe(mergeMap((token) => {
-            return next.handle(this.addToken(request, token));
-        }));
+        return this.basiqTokenService.getSingle().pipe(mergeMap((token) => next.handle(this.addToken(request, token))));
     }
     addToken(request, token) {
         return request.clone({
@@ -10017,9 +9873,9 @@ class BasiqTokenInterceptor {
         });
     }
 }
-BasiqTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BasiqTokenInterceptor, deps: [{ token: BasiqTokenService }], target: i0.ɵɵFactoryTarget.Injectable });
-BasiqTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BasiqTokenInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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 }]; } });
 
@@ -10120,9 +9976,7 @@ class UserService {
      */
     search(email) {
         return this.http.get(`${this.environment.apiV2}/users/search?email=${email}`)
-            .pipe(map((userBase) => {
-            return plainToClass(User, userBase);
-        }));
+            .pipe(map((userBase) => plainToClass(User, userBase)));
     }
     /**
      * Finish onboarding process
@@ -10195,9 +10049,9 @@ class UserService {
         });
     }
 }
-UserService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: UserService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -10227,17 +10081,17 @@ class BasiqClientIdInterceptor {
         });
     }
 }
-BasiqClientIdInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BasiqClientIdInterceptor, deps: [{ token: UserService }], target: i0.ɵɵFactoryTarget.Injectable });
-BasiqClientIdInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BasiqClientIdInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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: "15.2.8", ngImport: i0, type: InterceptorsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-InterceptorsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.8", ngImport: i0, type: InterceptorsModule });
-InterceptorsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.8", 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,
@@ -10275,7 +10129,7 @@ InterceptorsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", vers
             multi: true
         }
     ] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: InterceptorsModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: InterceptorsModule, decorators: [{
             type: NgModule,
             args: [{
                     providers: [
@@ -10333,12 +10187,12 @@ class TtCoreModule {
         };
     }
 }
-TtCoreModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TtCoreModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-TtCoreModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.8", 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: "15.2.8", ngImport: i0, type: TtCoreModule, imports: [CommonModule,
+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.2.8", ngImport: i0, type: TtCoreModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TtCoreModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [],
@@ -11931,9 +11785,7 @@ class AddressService {
     getCountries() {
         if (!this._countries) {
             this.http.get(`${this.environment.apiV2}/countries`)
-                .pipe(map((response) => {
-                return response['hydra:member'].map((item) => plainToClass(Country, item));
-            }))
+                .pipe(map((response) => response['hydra:member'].map((item) => plainToClass(Country, item))))
                 .subscribe((countries) => {
                 this._countries = countries;
                 this.countriesSubject.next(countries);
@@ -11942,9 +11794,9 @@ class AddressService {
         return this.countriesSubject.asObservable();
     }
 }
-AddressService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AddressService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-AddressService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AddressService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -11998,9 +11850,9 @@ class BankAccountService extends RestService$1 {
         });
     }
 }
-BankAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankAccountService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BankAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankAccountService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12021,16 +11873,13 @@ class BankTransactionService extends RestService$1 {
     listenEvents() {
         this.listenBankTransactionsImport();
     }
-    ;
     /**
      * Get list of bank transactions for provided financial year
      * @TODO VIK/Alex: consider to use one endpoint to get bank transactions for 2 fin years
      */
     getByYear(finYear) {
         return this.http.get(`${this.environment.apiV2}/bank-transactions?financialYear=${finYear}`)
-            .pipe(map((bankTransactionsBase) => {
-            return bankTransactionsBase.map((bankTransaction) => plainToClass(BankTransaction, bankTransaction));
-        }));
+            .pipe(map((bankTransactionsBase) => bankTransactionsBase.map((bankTransaction) => plainToClass(BankTransaction, bankTransaction))));
     }
     /**
      * import bank transactions from csv file
@@ -12065,9 +11914,9 @@ class BankTransactionService extends RestService$1 {
         });
     }
 }
-BankTransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankTransactionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BankTransactionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankTransactionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12088,16 +11937,15 @@ class BankService extends RestService$1 {
     }
     get() {
         return super.get()
-            .pipe(map((banks) => {
-            // exclude basiq banks without login fields (basiq may return broken banks without loginFields)
-            // @TODO Vik/Nikita: do it on backend
-            return banks.filter((bank) => bank.isManual || (!!bank.externalId && !!bank.loginFields));
-        }));
+            .pipe(map((banks) => 
+        // exclude basiq banks without login fields (basiq may return broken banks without loginFields)
+        // @TODO Vik/Nikita: do it on backend
+        banks.filter((bank) => bank.isManual || (!!bank.externalId && !!bank.loginFields))));
     }
 }
-BankService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BankService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12117,9 +11965,9 @@ class ChartAccountsDepreciationService extends RestService$1 {
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
 }
-ChartAccountsDepreciationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ChartAccountsDepreciationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ChartAccountsDepreciationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ChartAccountsDepreciationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12159,9 +12007,9 @@ class ChartAccountsService extends RestService$1 {
         }));
     }
 }
-ChartAccountsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ChartAccountsService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ChartAccountsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ChartAccountsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12191,7 +12039,7 @@ class ChatService extends RestService$1 {
      */
     listenChats() {
         this.sseService.on(`chats`).subscribe((chatBase) => {
-            let array = this.cache.toArray();
+            const array = this.cache.toArray();
             // chat instance from event
             const eventChat = plainToClass(Chat, chatBase);
             // chat instance from cache
@@ -12230,9 +12078,9 @@ class ChatService extends RestService$1 {
         });
     }
 }
-ChatService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: ChatService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12289,9 +12137,9 @@ class MessageService extends RestService$1 {
         });
     }
 }
-MessageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: MessageService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12357,14 +12205,12 @@ class MessageDocumentService extends RestService$1 {
      * Upload multiple files to chat
      */
     addBatch(chatId, files) {
-        return combineLatest(files.map((file) => this.add(chatId, file))).pipe(map((docsBase) => {
-            return docsBase.map((docBase) => plainToClass(MessageDocument, docBase));
-        }));
+        return combineLatest(files.map((file) => this.add(chatId, file))).pipe(map((docsBase) => docsBase.map((docBase) => plainToClass(MessageDocument, docBase))));
     }
 }
-MessageDocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: MessageDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-MessageDocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: MessageDocumentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12424,9 +12270,7 @@ class DepreciationService extends RestService$1 {
     }
     getOpenBalance(depreciation) {
         return this.http.post(`${this.apiUrl}/opening-balance?financialYear=${new FinancialYear().year}`, depreciation)
-            .pipe(map((response) => {
-            return response || 0;
-        }));
+            .pipe(map((response) => response || 0));
     }
     listenReceiptAdded() {
         this.eventDispatcherService.on(AppEventTypeEnum.DEPRECIATION_RECEIPT_CREATED).subscribe((receipt) => {
@@ -12489,9 +12333,9 @@ class DepreciationService extends RestService$1 {
         });
     }
 }
-DepreciationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: DepreciationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12514,9 +12358,7 @@ class DepreciationCapitalProjectService {
         this.cacheSubject.next([]);
         this.http.get(`${this.environment.apiV2}/properties/${propertyId}/depreciation-capital-projects`)
             .subscribe((capitalProjectsBase) => {
-            this.cache = capitalProjectsBase.map((capitalProjectBase) => {
-                return plainToClass(DepreciationCapitalProject, capitalProjectBase);
-            });
+            this.cache = capitalProjectsBase.map((capitalProjectBase) => plainToClass(DepreciationCapitalProject, capitalProjectBase));
             this.cacheSubject.next(this.cache);
         });
         return this.cacheSubject.asObservable();
@@ -12543,9 +12385,9 @@ class DepreciationCapitalProjectService {
         }));
     }
 }
-DepreciationCapitalProjectService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: DepreciationCapitalProjectService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-DepreciationCapitalProjectService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: DepreciationCapitalProjectService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12611,9 +12453,9 @@ class ReceiptService {
         return plainToClass(this.modelClass, data);
     }
 }
-ReceiptService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: ReceiptService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12642,9 +12484,9 @@ class DepreciationReceiptService extends ReceiptService {
         this.listenEvents();
     }
 }
-DepreciationReceiptService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: DepreciationReceiptService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12687,9 +12529,7 @@ class RestService {
      */
     findById(id) {
         return this.get()
-            .pipe(map((items) => {
-            return items.find((item) => item['id'] === id);
-        }));
+            .pipe(map((items) => items.find((item) => item['id'] === id)));
     }
     find(id) {
         return this.cache.find((item) => item['id'] === id);
@@ -12726,7 +12566,7 @@ class RestService {
     postForm(file, params = {}) {
         const formData = new FormData();
         formData.append('file', file);
-        for (let key in params) {
+        for (const key in params) {
             formData.append(key, params[key]);
         }
         return this.create(formData);
@@ -12831,9 +12671,7 @@ class RestService {
         return this.http.get(`${this.environment.apiV2}/${this.url}`)
             .pipe(map((response) => {
             const items = (this.isHydra ? response['hydra:member'] : response)
-                .map((item) => {
-                return this.createModelInstance(item);
-            });
+                .map((item) => this.createModelInstance(item));
             this.cache = items;
             this.updateCache();
             return items;
@@ -12858,9 +12696,9 @@ class RestService {
      */
     listenEvents() { }
 }
-RestService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: RestService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12877,9 +12715,9 @@ class DocumentService extends RestService {
         this.modelClass = Document;
     }
 }
-DocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: DocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-DocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: DocumentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -12945,9 +12783,9 @@ class DocumentFolderService extends RestService {
         }));
     }
 }
-DocumentFolderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: DocumentFolderService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-DocumentFolderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: DocumentFolderService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13022,9 +12860,9 @@ FacebookService.authOptions = {
     auth_type: 'rerequest',
     return_scopes: true
 };
-FacebookService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: FacebookService, deps: [{ token: i1.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i4.Router }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-FacebookService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: FacebookService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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: i4.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'
@@ -13092,9 +12930,9 @@ class GoogleService {
         google.accounts.id.disableAutoSelect();
     }
 }
-GoogleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: GoogleService, deps: [{ token: i1.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i4.Router }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-GoogleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: GoogleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: GoogleService, decorators: [{
+GoogleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: GoogleService, deps: [{ token: i1.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i4.Router }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
+GoogleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: GoogleService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: GoogleService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13119,10 +12957,13 @@ class FileService extends RestService$1 {
         return this.http.post(this.apiUrl, formData)
             .pipe(map((fileBase) => plainToClass(AppFile, fileBase)));
     }
+    download(file) {
+        return this.http.get(`${this.apiUrl}/${file.id}/download`, { responseType: 'blob' });
+    }
 }
-FileService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: FileService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-FileService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: FileService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13139,9 +12980,9 @@ class ClientIncomeTypesService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];
     }
 }
-ClientIncomeTypesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ClientIncomeTypesService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ClientIncomeTypesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ClientIncomeTypesService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13177,9 +13018,7 @@ class ClientInviteService extends RestService {
         const formData = new FormData();
         formData.append('file', file);
         return this.http.post(`${this.environment.apiV2}/${this.url}/import`, formData)
-            .pipe(map((clientInvite) => {
-            return clientInvite;
-        }));
+            .pipe(map((clientInvite) => clientInvite));
     }
     /**
      * Accept client invitation from firm to user
@@ -13256,9 +13095,9 @@ class ClientInviteService extends RestService {
         });
     }
 }
-ClientInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ClientInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ClientInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ClientInviteService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13280,19 +13119,13 @@ class ClientMovementService extends RestService {
      * @TODO BaseRestService should return collection
      */
     getAll() {
-        return this.get().pipe(map((clientMovements) => {
-            return new ClientMovementCollection(clientMovements);
-        }));
+        return this.get().pipe(map((clientMovements) => new ClientMovementCollection(clientMovements)));
     }
     getActive() {
-        return this.getAll().pipe(map((clientMovements) => {
-            return clientMovements.active;
-        }));
+        return this.getAll().pipe(map((clientMovements) => clientMovements.active));
     }
     getActiveByFirmType(type) {
-        return this.getActive().pipe(map((clientMovements) => {
-            return clientMovements.getByFirmType(type);
-        }));
+        return this.getActive().pipe(map((clientMovements) => clientMovements.getByFirmType(type)));
     }
     update(movement) {
         // extend base 'add' method and pass into it movement without id
@@ -13337,9 +13170,9 @@ class ClientMovementService extends RestService {
         });
     }
 }
-ClientMovementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ClientMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ClientMovementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ClientMovementService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13368,9 +13201,9 @@ class EmployeeService extends RestService {
         }));
     }
 }
-EmployeeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: EmployeeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-EmployeeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: EmployeeService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13391,9 +13224,7 @@ class EmployeeInviteService extends RestService {
         const formData = new FormData();
         formData.append('file', file);
         return this.http.post(`${this.environment.apiV2}/${this.url}/import`, formData)
-            .pipe(map((employeeInvite) => {
-            return employeeInvite;
-        }));
+            .pipe(map((employeeInvite) => employeeInvite));
     }
     /**
      * Resend invitation from firm to client
@@ -13413,9 +13244,9 @@ class EmployeeInviteService extends RestService {
         }));
     }
 }
-EmployeeInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: EmployeeInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-EmployeeInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: EmployeeInviteService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13440,9 +13271,9 @@ class ClientPortfolioReportService {
         }));
     }
 }
-ClientPortfolioReportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ClientPortfolioReportService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-ClientPortfolioReportService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ClientPortfolioReportService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13465,16 +13296,12 @@ class FirmService {
      */
     register(data) {
         return this.http.post(`${this.environment.apiV2}/firms/registration`, data)
-            .pipe(map((firm) => {
-            return plainToClass(Firm, firm);
-        }));
+            .pipe(map((firm) => plainToClass(Firm, firm)));
     }
     get() {
         if (!this.firm) {
             this.http.get(`${this.environment.apiV2}/firms/current`)
-                .pipe(map((firm) => {
-                return plainToClass(Firm, firm);
-            }))
+                .pipe(map((firm) => plainToClass(Firm, firm)))
                 .subscribe((firm) => {
                 this.firm = firm;
                 this.firmSubject.next(this.firm);
@@ -13494,14 +13321,10 @@ class FirmService {
      */
     getAll() {
         return this.http.get(`${this.environment.apiV2}/firms`)
-            .pipe(map((response) => {
-            return response['hydra:member'].map((firmBase) => plainToClass(Firm, firmBase));
-        }));
+            .pipe(map((response) => response['hydra:member'].map((firmBase) => plainToClass(Firm, firmBase))));
     }
     getByType(type) {
-        return this.getAll().pipe(map((firms) => {
-            return firms.filter((firm) => firm.type === type);
-        }));
+        return this.getAll().pipe(map((firms) => firms.filter((firm) => firm.type === type)));
     }
     updatePhoto(firm, photo) {
         return this.http.post(`${this.environment.apiV2}/firms/photo?_method=PUT`, photo)
@@ -13512,9 +13335,9 @@ class FirmService {
         }));
     }
 }
-FirmService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: FirmService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-FirmService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: FirmService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13587,9 +13410,9 @@ class IncomeSourceForecastService extends RestService {
         }).flat();
     }
 }
-IncomeSourceForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: IncomeSourceForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-IncomeSourceForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: IncomeSourceForecastService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13659,9 +13482,9 @@ class SalaryForecastService extends RestService {
         }).flat();
     }
 }
-SalaryForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SalaryForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SalaryForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SalaryForecastService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13737,9 +13560,9 @@ class SoleForecastService extends RestService {
         });
     }
 }
-SoleForecastService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleForecastService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleForecastService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleForecastService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13765,9 +13588,7 @@ class IncomeSourceService extends RestService {
      */
     getTaxCalculation(salaryForecast) {
         return this.http.post(`${this.environment.apiV2}/${this.url}/tax-calculation`, salaryForecast)
-            .pipe(map((response) => {
-            return plainToClass(SalaryForecast, response);
-        }));
+            .pipe(map((response) => plainToClass(SalaryForecast, response)));
     }
     /**
      * Add batch of income sources
@@ -13818,9 +13639,7 @@ class IncomeSourceService extends RestService {
         if (!this.incomeSourceTypes) {
             this.incomeSourceTypes = [];
             this.http.get(`${this.environment.apiV2}/income-source-types`)
-                .pipe(map((response) => {
-                return response.map((item) => plainToClass(IncomeSourceType, item));
-            }))
+                .pipe(map((response) => response.map((item) => plainToClass(IncomeSourceType, item))))
                 .subscribe((otherIncomesTypes) => {
                 this.incomeSourceTypes = otherIncomesTypes;
                 this.incomeSourceTypeSubject.next(this.incomeSourceTypes);
@@ -13838,9 +13657,9 @@ class IncomeSourceService extends RestService {
         });
     }
 }
-IncomeSourceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: IncomeSourceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-IncomeSourceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: IncomeSourceService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13862,9 +13681,7 @@ class BorrowingExpenseService {
     get() {
         if (!this._borrowingExpenses) {
             this.http.get(`${this.environment.apiV2}/borrowing-expenses`)
-                .pipe(map((response) => {
-                return response.map((item) => plainToClass(BorrowingExpense, item));
-            }))
+                .pipe(map((response) => response.map((item) => plainToClass(BorrowingExpense, item))))
                 .subscribe((borrowingExpenses) => {
                 this._borrowingExpenses = borrowingExpenses;
                 this.borrowingExpensesSubject.next(this._borrowingExpenses);
@@ -13903,9 +13720,9 @@ class BorrowingExpenseService {
         }));
     }
 }
-BorrowingExpenseService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BorrowingExpenseService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-BorrowingExpenseService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BorrowingExpenseService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -13942,9 +13759,7 @@ class LoanService extends RestService$1 {
      * Calculate loan payments
      */
     calculateLoanPayments(loan) {
-        return this.http.post(`${this.apiUrl}/calculation`, loan).pipe(map((response) => {
-            return plainToClass(Loan, response);
-        }));
+        return this.http.post(`${this.apiUrl}/calculation`, loan).pipe(map((response) => plainToClass(Loan, response)));
     }
     /**
      * Add new loan payout
@@ -13987,9 +13802,9 @@ class LoanService extends RestService$1 {
         }));
     }
 }
-LoanService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: LoanService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-LoanService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: LoanService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14008,9 +13823,9 @@ class PropertyCategoryService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
 }
-PropertyCategoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyCategoryService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyCategoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyCategoryService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14026,9 +13841,9 @@ class PropertyCategoryMovementService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
 }
-PropertyCategoryMovementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyCategoryMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyCategoryMovementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyCategoryMovementService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14070,9 +13885,9 @@ class PropertyDocumentService extends RestService$1 {
         });
     }
 }
-PropertyDocumentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyDocumentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyDocumentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14089,9 +13904,9 @@ class TaxExemptionService extends RestService$1 {
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
 }
-TaxExemptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TaxExemptionService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-TaxExemptionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TaxExemptionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14107,9 +13922,9 @@ class PropertySaleService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
 }
-PropertySaleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertySaleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertySaleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertySaleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14156,9 +13971,9 @@ class PropertyShareService extends RestService$1 {
         this.listenCSE(PropertySale, ['post', 'delete'], this.resetCache);
     }
 }
-PropertyShareService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyShareService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyShareService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyShareService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14255,9 +14070,9 @@ class PropertyService extends RestService$1 {
         }));
     }
 }
-PropertyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PropertyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14301,9 +14116,9 @@ class ServiceNotificationService extends RestService {
         });
     }
 }
-ServiceNotificationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: ServiceNotificationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14348,13 +14163,13 @@ class SoleBusinessService extends RestService {
             if (error.status === 422) {
                 this.toastService.error(error.error.violations[0].message);
             }
-            return throwError$1(error);
+            return throwError(error);
         }));
     }
 }
-SoleBusinessService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleBusinessService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleBusinessService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleBusinessService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14369,9 +14184,9 @@ class SoleBusinessActivityService extends RestService {
         this.isHydra = true;
     }
 }
-SoleBusinessActivityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleBusinessActivityService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleBusinessActivityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleBusinessActivityService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14397,9 +14212,9 @@ class SoleBusinessLossService extends RestService {
         });
     }
 }
-SoleBusinessLossService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleBusinessLossService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleBusinessLossService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleBusinessLossService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14417,9 +14232,9 @@ class SoleBusinessLossOffsetRuleService extends RestService {
         this.isHydra = true;
     }
 }
-SoleBusinessLossOffsetRuleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleBusinessLossOffsetRuleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleBusinessLossOffsetRuleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleBusinessLossOffsetRuleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14434,9 +14249,9 @@ class SoleContactService extends RestService {
         this.isHydra = true;
     }
 }
-SoleContactService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleContactService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleContactService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleContactService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14481,7 +14296,7 @@ class SoleDepreciationMethodService {
             return this.cache;
         }), catchError((error) => {
             this.toastService.error(error.error['hydra:description']);
-            return throwError$1(error);
+            return throwError(error);
         }));
     }
     listenSoleDetailsChanges() {
@@ -14492,9 +14307,9 @@ class SoleDepreciationMethodService {
         });
     }
 }
-SoleDepreciationMethodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: SoleDepreciationMethodService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14547,9 +14362,9 @@ class SoleDetailsService {
         }));
     }
 }
-SoleDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: SoleDetailsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14622,9 +14437,9 @@ class SoleInvoiceService extends RestService {
         });
     }
 }
-SoleInvoiceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleInvoiceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleInvoiceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleInvoiceService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14639,9 +14454,9 @@ class SoleInvoiceTemplateService extends RestService {
         this.isHydra = true;
     }
 }
-SoleInvoiceTemplateService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleInvoiceTemplateService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-SoleInvoiceTemplateService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SoleInvoiceTemplateService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14656,9 +14471,9 @@ class BasReportService extends RestService {
         this.isHydra = true;
     }
 }
-BasReportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BasReportService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-BasReportService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BasReportService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14684,9 +14499,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: "15.2.8", ngImport: i0, type: ServicePaymentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ServicePaymentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ServicePaymentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14734,9 +14549,9 @@ class ServicePaymentMethodService extends RestService$1 {
         });
     }
 }
-ServicePaymentMethodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ServicePaymentMethodService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
-ServicePaymentMethodService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ServicePaymentMethodService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ServicePaymentMethodService, decorators: [{
+ServicePaymentMethodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServicePaymentMethodService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable });
+ServicePaymentMethodService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServicePaymentMethodService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ServicePaymentMethodService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -14759,9 +14574,9 @@ class ServicePriceService extends RestService$1 {
         this.disabledMethods = ['post', 'postBatch', 'put', 'putBatch', 'delete', 'deleteBatch'];
     }
 }
-ServicePriceService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ServicePriceService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ServicePriceService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ServicePriceService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14837,9 +14652,7 @@ class SubscriptionService extends RestService$1 {
      * Get difference between current subscription and selected new subscription
      */
     getProrationCost(subscription) {
-        return this.http.put(`${this.environment.apiV2}/service-subscriptions/${subscription.id}/proration-cost`, subscription).pipe(map((prorationCost) => {
-            return prorationCost;
-        }));
+        return this.http.put(`${this.environment.apiV2}/service-subscriptions/${subscription.id}/proration-cost`, subscription).pipe(map((prorationCost) => prorationCost));
     }
     /**
      * Change subscription plan
@@ -14877,9 +14690,9 @@ class SubscriptionService extends RestService$1 {
         });
     }
 }
-SubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: SubscriptionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14899,9 +14712,9 @@ class ServiceProductService extends RestService$1 {
         this.isApiPlatform = true;
     }
 }
-ServiceProductService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ServiceProductService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-ServiceProductService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ServiceProductService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -14933,9 +14746,9 @@ class TaxReviewHistoryService extends RestService {
         });
     }
 }
-TaxReviewHistoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TaxReviewHistoryService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-TaxReviewHistoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TaxReviewHistoryService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15024,9 +14837,9 @@ class TaxReviewService extends RestService {
         });
     }
 }
-TaxReviewService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TaxReviewService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-TaxReviewService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TaxReviewService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15083,9 +14896,9 @@ class TaxSummaryService {
         });
     }
 }
-TaxSummaryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: TaxSummaryService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15104,9 +14917,9 @@ class AllocationRuleService extends RestService$1 {
         this.isApiPlatform = true;
     }
 }
-AllocationRuleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AllocationRuleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-AllocationRuleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AllocationRuleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AllocationRuleService, decorators: [{
+AllocationRuleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AllocationRuleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+AllocationRuleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AllocationRuleService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AllocationRuleService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15156,9 +14969,7 @@ class TransactionAllocationService extends RestService {
     getByTransactions(transactions) {
         const ids = transactions.map((transaction) => transaction.id);
         return this.get()
-            .pipe(map((transactionAllocations) => {
-            return transactionAllocations.filter((allocation) => ids.includes(allocation.transaction.id));
-        }));
+            .pipe(map((transactionAllocations) => transactionAllocations.filter((allocation) => ids.includes(allocation.transaction.id))));
     }
     listenEvents() {
         this.onTransactionsCreated();
@@ -15197,9 +15008,9 @@ class TransactionAllocationService extends RestService {
         });
     }
 }
-TransactionAllocationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TransactionAllocationService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-TransactionAllocationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TransactionAllocationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15225,9 +15036,9 @@ class TransactionReceiptService extends ReceiptService {
         this.listenEvents();
     }
 }
-TransactionReceiptService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: TransactionReceiptService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15308,41 +15119,31 @@ class TransactionService extends RestService {
      */
     getByPropertyId(propertyId) {
         return this.get()
-            .pipe(map((transactions) => {
-            return transactions.filter((transaction) => {
-                return transaction.property?.id === propertyId;
-            });
-        }));
+            .pipe(map((transactions) => transactions.filter((transaction) => transaction.property?.id === propertyId)));
     }
     /**
      * get list of transactions with tank type 'Work'
      */
     getWorkTransactions() {
         return this.get()
-            .pipe(map((transactions) => {
-            return transactions.filter((transaction) => transaction.isWorkTank());
-        }));
+            .pipe(map((transactions) => transactions.filter((transaction) => transaction.isWorkTank())));
     }
     /**
      * Get list of property holding costs (transactions related to vacant land property)
      */
     getPropertyHoldingCosts(propertyId) {
         return this.get()
-            .pipe(map((transactions) => {
-            return new TransactionCollection(transactions)
-                .filterBy('property.id', propertyId)
-                .filterBy('property.category.id', PropertyCategoryListEnum.VACANT_LAND)
-                .toArray();
-        }));
+            .pipe(map((transactions) => new TransactionCollection(transactions)
+            .filterBy('property.id', propertyId)
+            .filterBy('property.category.id', PropertyCategoryListEnum.VACANT_LAND)
+            .toArray()));
     }
     /**
      * get list of taxable transactions with tank type 'Work'
      */
     getTaxableWorkTransactions() {
         return this.getWorkTransactions()
-            .pipe(map((transactions) => {
-            return transactions.filter((transaction) => !!transaction.chartAccounts.taxReturnItem);
-        }));
+            .pipe(map((transactions) => transactions.filter((transaction) => !!transaction.chartAccounts.taxReturnItem)));
     }
     /**
      * add multiple transactions
@@ -15546,9 +15347,9 @@ class TransactionService extends RestService {
         });
     }
 }
-TransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: TransactionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15577,9 +15378,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: "15.2.8", ngImport: i0, type: TutorialVideoService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-TutorialVideoService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TutorialVideoService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15599,9 +15400,9 @@ class VehicleService extends RestService {
         this.modelClass = Vehicle;
     }
 }
-VehicleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: VehicleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-VehicleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: VehicleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15673,9 +15474,9 @@ class VehicleClaimService extends RestService {
         combineLatest(batch$).subscribe();
     }
 }
-VehicleClaimService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-VehicleClaimService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: VehicleClaimService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15752,9 +15553,9 @@ class VehicleClaimDetailsService {
         this.update(vehicleClaimDetails).subscribe();
     }
 }
-VehicleClaimDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: VehicleClaimDetailsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15774,9 +15575,9 @@ class VehicleLogbookService extends RestService {
         this.modelClass = VehicleLogbook;
     }
 }
-VehicleLogbookService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: VehicleLogbookService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-VehicleLogbookService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: VehicleLogbookService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15793,9 +15594,9 @@ class AnnualClientDetailsService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch', 'delete'];
     }
 }
-AnnualClientDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AnnualClientDetailsService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-AnnualClientDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AnnualClientDetailsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AnnualClientDetailsService, decorators: [{
+AnnualClientDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AnnualClientDetailsService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+AnnualClientDetailsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AnnualClientDetailsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: AnnualClientDetailsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15817,9 +15618,7 @@ class OccupationService {
     getOccupations() {
         if (!this._occupations) {
             this.http.get(`${this.environment.apiV2}/occupations`)
-                .pipe(map((response) => {
-                return response.map((item) => plainToClass(Occupation, item));
-            }))
+                .pipe(map((response) => response.map((item) => plainToClass(Occupation, item))))
                 .subscribe((occupations) => {
                 this._occupations = occupations;
                 this.occupationsSubject.next(occupations);
@@ -15828,9 +15627,9 @@ class OccupationService {
         return this.occupationsSubject.asObservable();
     }
 }
-OccupationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: OccupationService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-OccupationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: OccupationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15874,9 +15673,9 @@ class UserEventSettingService extends RestService {
         }));
     }
 }
-UserEventSettingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UserEventSettingService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-UserEventSettingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UserEventSettingService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15891,9 +15690,9 @@ class UserEventTypeService extends RestService {
         this.isHydra = true;
     }
 }
-UserEventTypeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UserEventTypeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-UserEventTypeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UserEventTypeService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15910,9 +15709,9 @@ class UsersInviteService extends RestService {
         this.url = 'users/invite';
     }
 }
-UsersInviteService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UsersInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-UsersInviteService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: UsersInviteService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -15929,9 +15728,9 @@ class HoldingService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
 }
-HoldingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-HoldingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingService, decorators: [{
+HoldingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+HoldingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15948,9 +15747,9 @@ class HoldingTypeService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
 }
-HoldingTypeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingTypeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-HoldingTypeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingTypeService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingTypeService, decorators: [{
+HoldingTypeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingTypeService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+HoldingTypeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingTypeService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingTypeService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -15967,9 +15766,9 @@ class HoldingSaleService extends RestService$1 {
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
 }
-HoldingSaleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingSaleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-HoldingSaleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingSaleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingSaleService, decorators: [{
+HoldingSaleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingSaleService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
+HoldingSaleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingSaleService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingSaleService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -16064,9 +15863,9 @@ class HoldingTypeExchangeService extends DataService {
         this.setCache(HoldingTypeExchanges);
     }
 }
-HoldingTypeExchangeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingTypeExchangeService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-HoldingTypeExchangeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingTypeExchangeService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HoldingTypeExchangeService, decorators: [{
+HoldingTypeExchangeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingTypeExchangeService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+HoldingTypeExchangeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingTypeExchangeService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HoldingTypeExchangeService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -16297,9 +16096,9 @@ class AccountSetupService {
         }));
     }
 }
-AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }, { token: HoldingService }], target: i0.ɵɵFactoryTarget.Injectable });
-AccountSetupService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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 }, { token: HoldingService }], 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'
@@ -16325,9 +16124,9 @@ class RewardfulService {
         });
     }
 }
-RewardfulService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: RewardfulService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-RewardfulService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: RewardfulService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16372,9 +16171,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: "15.2.8", 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.2.8", ngImport: i0, type: AssetsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16411,18 +16210,14 @@ class BankTransactionCalculationService {
      * @TODO Alex: consider to move to collection
      */
     getAllocatedBankTransactions(bankTransactions, allocations) {
-        return new BankTransactionCollection(bankTransactions.items.filter((bankTransaction) => {
-            return this.isAllocated(bankTransaction, allocations);
-        }));
+        return new BankTransactionCollection(bankTransactions.items.filter((bankTransaction) => this.isAllocated(bankTransaction, allocations)));
     }
     /**
      * Get collection of unallocated bank transactions
      * @TODO Alex: consider to move to collection
      */
     getUnallocated(bankTransactions, allocations) {
-        return new BankTransactionCollection(bankTransactions.items.filter((bankTransaction) => {
-            return !this.isAllocated(bankTransaction, allocations);
-        }));
+        return new BankTransactionCollection(bankTransactions.items.filter((bankTransaction) => !this.isAllocated(bankTransaction, allocations)));
     }
     /**
      * Allocated sum of credit transactions
@@ -16437,9 +16232,9 @@ class BankTransactionCalculationService {
         return allocations.getByBankTransactionsIds(bankTransactions.debitTransactions.getIds()).amount;
     }
 }
-BankTransactionCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankTransactionCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-BankTransactionCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankTransactionCalculationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16468,9 +16263,9 @@ class BankAccountCalculationService {
         return bankAccounts.currentBalance - this.getTaxTankBalance(bankAccounts.getLoanAccounts(), bankTransactions, allocations);
     }
 }
-BankAccountCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankAccountCalculationService, deps: [{ token: BankTransactionCalculationService }], target: i0.ɵɵFactoryTarget.Injectable });
-BankAccountCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: BankAccountCalculationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16495,9 +16290,9 @@ class ExportFormatterService {
         }));
     }
 }
-ExportFormatterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ExportFormatterService, deps: [{ token: i1$1.CurrencyPipe }, { token: i1$1.DatePipe }], target: i0.ɵɵFactoryTarget.Injectable });
-ExportFormatterService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ExportFormatterService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: ExportFormatterService, decorators: [{
+ExportFormatterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: ExportFormatterService, deps: [{ token: i1$1.CurrencyPipe }, { token: i1$1.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'
@@ -16518,9 +16313,9 @@ class HeaderTitleService {
         }), filter((route) => route.outlet === 'primary'), mergeMap((route) => route.data));
     }
 }
-HeaderTitleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HeaderTitleService, deps: [{ token: i4.Router }, { token: i4.ActivatedRoute }], target: i0.ɵɵFactoryTarget.Injectable });
-HeaderTitleService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HeaderTitleService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: HeaderTitleService, decorators: [{
+HeaderTitleService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: HeaderTitleService, deps: [{ token: i4.Router }, { token: i4.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'
@@ -16554,9 +16349,9 @@ class IntercomService {
         window.Intercom('boot', connectionCredentials);
     }
 }
-IntercomService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: IntercomService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-IntercomService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: IntercomService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16626,9 +16421,9 @@ class PdfFromDomElementService {
             .then((blob) => new File([blob], filename, { type: 'application/pdf' })));
     }
 }
-PdfFromDomElementService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PdfFromDomElementService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PdfFromDomElementService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PdfFromDomElementService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16707,9 +16502,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: "15.2.8", ngImport: i0, type: PdfFromTableService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PdfFromTableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PdfFromTableService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16746,9 +16541,9 @@ class PdfFromDataTableService extends PdfFromTableService {
         return pdf;
     }
 }
-PdfFromDataTableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PdfFromDataTableService, deps: [{ token: ExportFormatterService }], target: i0.ɵɵFactoryTarget.Injectable });
-PdfFromDataTableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PdfFromDataTableService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16784,9 +16579,9 @@ class PdfFromHtmlTableService extends PdfFromTableService {
         return pdf;
     }
 }
-PdfFromHtmlTableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PdfFromHtmlTableService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
-PdfFromHtmlTableService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PdfFromHtmlTableService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16804,24 +16599,18 @@ class EquityPositionChartService {
     get() {
         // @TODO refactor backend
         return this.http.get(`${this.environment.apiV2}/properties/categories/equity`)
-            .pipe(map((response) => {
-            return response.map((item) => {
-                return plainToClass(ChartData, {
-                    name: item.category.name,
-                    data: item.equity.map((serie) => {
-                        return plainToClass(ChartSerie, {
-                            label: serie.date,
-                            value: serie.amount
-                        });
-                    })
-                });
-            });
-        }));
+            .pipe(map((response) => response.map((item) => plainToClass(ChartData, {
+            name: item.category.name,
+            data: item.equity.map((serie) => plainToClass(ChartSerie, {
+                label: serie.date,
+                value: serie.amount
+            }))
+        }))));
     }
 }
-EquityPositionChartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: EquityPositionChartService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
-EquityPositionChartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: EquityPositionChartService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -16844,9 +16633,7 @@ class PropertyCalculationService {
         return combineLatest([
             transactions$,
             depreciations$
-        ]).pipe(map(([transactions, depreciations]) => {
-            return this.getTaxPosition(transactions, depreciations);
-        }));
+        ]).pipe(map(([transactions, depreciations]) => this.getTaxPosition(transactions, depreciations)));
     }
     taxPositionGrowth(properties, transactions, depreciations) {
         const forecastedTaxPosition = properties.sumBy('forecastedTaxPosition');
@@ -16861,28 +16648,18 @@ class PropertyCalculationService {
             properties$,
             transactions$,
             depreciations$
-        ]).pipe(map(([properties, transactions, depreciations]) => {
-            return this.taxPositionGrowth(properties, transactions, depreciations);
-        }));
+        ]).pipe(map(([properties, transactions, depreciations]) => this.taxPositionGrowth(properties, transactions, depreciations)));
     }
     getRentalReturn(properties, transactions) {
         return transactions.claimIncome / properties.marketValue;
     }
     getLoanAmount(properties, bankAccounts, loans) {
-        return properties.items.reduce((totalAmount, property) => {
-            return totalAmount + bankAccounts.items
-                .reduce((propertyAmount, bankAccount) => {
-                return propertyAmount + bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.amount || 0);
-            }, 0);
-        }, 0);
+        return properties.items.reduce((totalAmount, property) => totalAmount + bankAccounts.items
+            .reduce((propertyAmount, bankAccount) => propertyAmount + bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.amount || 0), 0), 0);
     }
     getLoanValue(properties, bankAccounts) {
-        return properties.items.reduce((totalAmount, property) => {
-            return totalAmount + bankAccounts.items
-                .reduce((propertyAmount, bankAccount) => {
-                return propertyAmount + bankAccount.getPropertyBalanceAmount(property.id);
-            }, 0);
-        }, 0);
+        return properties.items.reduce((totalAmount, property) => totalAmount + bankAccounts.items
+            .reduce((propertyAmount, bankAccount) => propertyAmount + bankAccount.getPropertyBalanceAmount(property.id), 0), 0);
     }
     /**
      * LVR
@@ -16895,9 +16672,7 @@ class PropertyCalculationService {
         return combineLatest([
             properties$,
             bankAccounts$
-        ]).pipe(map(([properties, bankAccounts]) => {
-            return this.getLvr(properties, bankAccounts);
-        }));
+        ]).pipe(map(([properties, bankAccounts]) => this.getLvr(properties, bankAccounts)));
     }
     getLvrCommencement(properties, loans, bankAccounts) {
         // Math abs is required for correct percentage calculation
@@ -16908,9 +16683,7 @@ class PropertyCalculationService {
             properties$,
             bankAccounts$,
             loans$
-        ]).pipe(map(([properties, bankAccounts, loans]) => {
-            return this.getLvrCommencement(properties, loans, bankAccounts);
-        }));
+        ]).pipe(map(([properties, bankAccounts, loans]) => this.getLvrCommencement(properties, loans, bankAccounts)));
     }
     getLvrGrowth(properties, bankAccounts, loans) {
         const lvr = this.getLvr(properties, bankAccounts);
@@ -16926,9 +16699,7 @@ class PropertyCalculationService {
             properties$,
             bankAccounts$,
             loans$
-        ]).pipe(map(([properties, bankAccounts, loans]) => {
-            return this.getLvrGrowth(properties, bankAccounts, loans);
-        }));
+        ]).pipe(map(([properties, bankAccounts, loans]) => this.getLvrGrowth(properties, bankAccounts, loans)));
     }
     /**
      * Equity position = Market value - current loan value
@@ -16992,9 +16763,9 @@ class PropertyCalculationService {
         }
     }
 }
-PropertyCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PropertyCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: PropertyCalculationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -17020,9 +16791,7 @@ class PropertyTransactionReportService {
             this.getTransactions(),
             this.getDepreciations(),
             this.chartAccountsService.get()
-        ]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => {
-            return new CollectionDictionary(this.create(transactions, depreciations, properties, chartAccounts), 'propertyId');
-        }));
+        ]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => new CollectionDictionary(this.create(transactions, depreciations, properties, chartAccounts), 'propertyId')));
     }
     create(transactions, depreciations, properties, chartAccounts) {
         return new PropertyReportItemCollection([
@@ -17034,26 +16803,22 @@ class PropertyTransactionReportService {
      * Get collection of property transactions
      */
     getTransactions() {
-        return this.transactionService.get().pipe(map((transactions) => {
-            return new TransactionCollection(transactions)
-                .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property);
-        }));
+        return this.transactionService.get().pipe(map((transactions) => new TransactionCollection(transactions)
+            .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)));
     }
     /**
      * Get list of asset & capital property depreciations
      */
     getDepreciations() {
-        return this.depreciationService.get().pipe(map((depreciations) => {
-            return depreciations
-                .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)
-                // we don't need borrowing expenses for this report
-                .getWithoutBorrowingExpenses();
-        }));
+        return this.depreciationService.get().pipe(map((depreciations) => depreciations
+            .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)
+            // we don't need borrowing expenses for this report
+            .getWithoutBorrowingExpenses()));
     }
 }
-PropertyTransactionReportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: PropertyTransactionReportService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -17081,9 +16846,7 @@ class TransactionCalculationService {
      * @TODO Alex: consider to move to collection
      */
     getAllocatedTransactions(transactions, allocations) {
-        return new TransactionCollection(transactions.items.filter((transaction) => {
-            return transaction.isAllocated(allocations);
-        }));
+        return new TransactionCollection(transactions.items.filter((transaction) => transaction.isAllocated(allocations)));
     }
     getUnallocatedInvoices(invoices, allocations) {
         return invoices.filter((invoice) => {
@@ -17123,9 +16886,9 @@ class TransactionCalculationService {
         return bankTransactions.sumBy('amount') - allocations.getByBankTransactionsIds(bankTransactions.getIds()).sumBy('amount');
     }
 }
-TransactionCalculationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TransactionCalculationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-TransactionCalculationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: TransactionCalculationService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -17185,9 +16948,9 @@ class LogbookBestPeriodService {
         });
     }
 }
-LogbookBestPeriodService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", 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.2.8", ngImport: i0, type: LogbookBestPeriodService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -17228,9 +16991,9 @@ class XlsxService {
         return xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });
     }
 }
-XlsxService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: XlsxService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-XlsxService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: XlsxService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", 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'
@@ -17382,6 +17145,9 @@ class AbstractForm extends UntypedFormGroup {
      */
     emitValues() {
         Object.values(this.controls).forEach((control) => {
+            if ([null, undefined].includes(control.value)) {
+                return;
+            }
             control.updateValueAndValidity({ onlySelf: false, emitEvent: true });
         });
     }
@@ -17626,7 +17392,7 @@ class LoanForm extends AbstractForm {
     listenEvents() {
         // We need to set term automatically only for bank loans.
         // For vehicle loans user should fill it manually with validation depended of frequency
-        if (!!this.loan.bankAccount) {
+        if (this.loan.bankAccount) {
             this.listenTypeChanges();
         }
         else {
@@ -17654,7 +17420,7 @@ class LoanForm extends AbstractForm {
      */
     updateTermValidation() {
         // no need terms for bank loans
-        if (!!this.loan.bankAccount) {
+        if (this.loan.bankAccount) {
             return;
         }
         const currentRepaymentFrequency = this.get('repaymentFrequency').value;
@@ -17676,10 +17442,8 @@ LoanForm.mortgageLoanTypes = [LoanTypeEnum.MORTGAGE, LoanTypeEnum.HOME_EQUITY_LI
  * 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 };
-    };
+    return (formGroup) => Object.values(formGroup.controls)
+        .find((control) => control.value) ? null : { nothingChecked: true };
 }
 
 /**
@@ -17687,9 +17451,7 @@ function atLeastOneCheckedValidator() {
  * @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 };
-    };
+    return (control) => (!control.value || (typeof control.value === 'object')) ? null : { notFromList: true };
 }
 
 function conditionalValidator(condition, validator) {
@@ -17789,15 +17551,13 @@ function fieldsSumValidator(field, summary = 100, fieldAlias) {
         if (fieldsSum <= summary) {
             return null;
         }
-        else {
-            return {
-                fieldsSum: {
-                    name: field,
-                    alias: fieldAlias,
-                    summary
-                }
-            };
-        }
+        return {
+            fieldsSum: {
+                name: field,
+                alias: fieldAlias,
+                summary
+            }
+        };
     };
 }
 
@@ -17855,12 +17615,10 @@ class FileValidator {
 class BankAccountPropertiesForm extends UntypedFormArray {
     constructor(bankAccountProperties) {
         super((bankAccountProperties?.length ? bankAccountProperties : [plainToClass(BankAccountProperty, {})])
-            .map((bankAccountProperty) => {
-            return new UntypedFormGroup({
-                property: new UntypedFormControl(bankAccountProperty?.property, Validators.required),
-                percent: new UntypedFormControl(bankAccountProperty.percent, Validators.required)
-            });
-        }), [
+            .map((bankAccountProperty) => 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),
             fieldsSumValidator('percent', 100)
         ]);
@@ -17979,12 +17737,10 @@ class SoleBusinessForm extends AbstractForm {
 class SoleBusinessAllocationsForm extends UntypedFormArray {
     constructor(businessAllocations) {
         super((businessAllocations?.length ? businessAllocations : [plainToClass(SoleBusinessAllocation, {})])
-            .map((businessAllocation) => {
-            return new UntypedFormGroup({
-                business: new UntypedFormControl(businessAllocation?.business, Validators.required),
-                percent: new UntypedFormControl(businessAllocation.percent, Validators.required)
-            });
-        }), [
+            .map((businessAllocation) => 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),
             fieldsSumValidator('percent', 100)
         ]);
@@ -18460,11 +18216,9 @@ function dateRangeValidator(dateStart, dateEnd) {
  * Validator check if at least one control in formArray is enabled
  */
 function atLeastOneEnabledValidator(arrayName) {
-    return (formGroup) => {
-        return !!formGroup.get(arrayName).controls.find((control) => control.enabled)
-            ? null
-            : { arrayControlsDisabled: true };
-    };
+    return (formGroup) => formGroup.get(arrayName).controls.find((control) => control.enabled)
+        ? null
+        : { arrayControlsDisabled: true };
 }
 
 /**
@@ -18488,7 +18242,7 @@ class BankAccountsImportForm extends AbstractForm {
         }
         const bankAccounts = [];
         // form is valid when all selected bank accounts forms are valid
-        for (let bankAccountImportForm of this.get('bankAccounts').controls) {
+        for (const bankAccountImportForm of this.get('bankAccounts').controls) {
             // skip disabled forms
             if (bankAccountImportForm.disabled) {
                 continue;
@@ -18585,9 +18339,7 @@ const phonePattern = /^(((\s*)?([- ()]?\d[- ()]?){0,30}(\s*)?)|)$/;
  * Allowed special symbols"-", "(", ")"
  */
 function phoneNumberValidator() {
-    return (control) => {
-        return phonePattern.test(control.value) ? null : { phoneInvalid: true };
-    };
+    return (control) => phonePattern.test(control.value) ? null : { phoneInvalid: true };
 }
 
 class PhoneForm extends AbstractForm {
@@ -20002,7 +19754,7 @@ function checkDividends(metaFields, formGroup) {
     const frankedAndUnfrankedControls = (formGroup.get('metaFields')).controls
         .filter((control) => frankedAndUnfrankedIds.includes(control.get('chartAccountsMetaField').value.id));
     const frankedAndUnfrankedAmount = frankedAndUnfrankedControls.reduce((sum, control) => sum + (+control.get('value').value), 0);
-    for (let control of frankedAndUnfrankedControls) {
+    for (const control of frankedAndUnfrankedControls) {
         if (control.get('value').value !== null && frankedAndUnfrankedAmount !== amount) {
             return { metaFields: `Field ${control.get('chartAccountsMetaField').value.label} is required` };
         }
@@ -20014,12 +19766,10 @@ class WorkTransactionForm extends TransactionForm {
     constructor(transaction, registeredForGst, allocations, controls = {}) {
         super(transaction, registeredForGst, allocations, Object.assign(controls, {
             // additional data related to work (like tax instalments)
-            metaFields: new FormArray((transaction.metaFields || []).map((transactionMetaField) => {
-                return new FormGroup({
-                    value: new FormControl(transactionMetaField.value),
-                    chartAccountsMetaField: new FormControl(transactionMetaField.chartAccountsMetaField)
-                });
-            }))
+            metaFields: new FormArray((transaction.metaFields || []).map((transactionMetaField) => new FormGroup({
+                value: new FormControl(transactionMetaField.value),
+                chartAccountsMetaField: new FormControl(transactionMetaField.chartAccountsMetaField)
+            })))
         }));
         this.setValidators(transactionsMetaFieldsValidator());
         this.listenEvents();
@@ -20201,31 +19951,36 @@ class HoldingSaleForm extends AbstractForm {
             file: new UntypedFormControl(sale.file)
         }, sale);
         this.holding = holding;
-        if (sale.id) {
-            this.emitValues();
-        }
         this.listenEvents();
+        this.emitValues();
     }
     listenEvents() {
-        this.listenQuantityChanges();
-        this.listenPriceChanges();
+        combineLatest(['date', 'price', 'quantity', 'fee'].map((field) => this.get(field).valueChanges))
+            .subscribe(([date, price, quantity, fee]) => {
+            this.updateGainFields(date, price, quantity, fee);
+        });
     }
     submit() {
         return super.submit({}, true);
     }
-    listenQuantityChanges() {
-        this.get('quantity').valueChanges.subscribe(() => {
-            this.updateGainFields();
-        });
+    updateGainFields(date, price, quantity, fee) {
+        const capitalGain = this.calculateGrossCapitalGain(price, quantity, fee);
+        this.get('grossCapitalGain').setValue(capitalGain);
+        this.get('netCapitalGain').setValue(this.calculateNetCapitalGain(capitalGain, date));
     }
-    listenPriceChanges() {
-        this.get('price').valueChanges.subscribe(() => {
-            this.updateGainFields();
-        });
+    calculateGrossCapitalGain(price, quantity, fee) {
+        const capitalGain = (price - this.holding.price) * quantity - this.holding.fee - fee;
+        return capitalGain < 0 ? 0 : capitalGain;
+    }
+    calculateNetCapitalGain(capitalGain, date) {
+        let netCapitalGain = (capitalGain * this.holding.ownershipPercent) / 100;
+        if (this.isOneYearExemptionApplicable(netCapitalGain, date)) {
+            netCapitalGain = netCapitalGain / 2;
+        }
+        return round(netCapitalGain, 2);
     }
-    updateGainFields() {
-        this.get('grossCapitalGain').setValue(this.currentValue.getCapitalGain(this.holding));
-        this.get('netCapitalGain').setValue(this.currentValue.getNetCapitalGain(this.holding));
+    isOneYearExemptionApplicable(netCapitalGain, date) {
+        return netCapitalGain > 0 && moment(date).diff(moment(this.holding.date), 'year') > 0;
     }
 }