taxtank-core 0.30.41 → 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';
@@ -56,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);
@@ -69,9 +66,7 @@ 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.1.5", ngImport: i0, type: CorelogicService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -104,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({
@@ -455,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()
@@ -1281,7 +1272,6 @@ class ExportableCollection extends Collection {
     getExportFooter(type) {
         return [];
     }
-    ;
     export(type) {
         return plainToClass(ExportDataTable, {
             header: this.getExportHeader(type),
@@ -1320,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());
@@ -1578,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
@@ -1778,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
@@ -1792,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
@@ -1834,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);
@@ -1850,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
@@ -3264,7 +3240,6 @@ class SoleForecast extends SoleForecast$1 {
     get netPay() {
         return this.amount;
     }
-    ;
 }
 __decorate([
     Type(() => IncomeSource)
@@ -3455,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)
@@ -3558,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;
             }
@@ -3569,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;
             }
@@ -3601,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)
@@ -3993,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));
         });
     }
     /**
@@ -4008,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
@@ -4042,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) {
@@ -5078,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;
@@ -5271,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,
@@ -5282,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;
@@ -5429,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
@@ -5496,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
@@ -5533,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
@@ -5567,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
@@ -5694,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');
@@ -5758,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
@@ -5839,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)));
     }
 }
 
@@ -5974,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]);
@@ -6190,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;
@@ -6213,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);
             }
@@ -6225,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);
             }
@@ -6241,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;
             }
@@ -6290,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));
             }
@@ -6649,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
@@ -6738,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?
@@ -6831,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.
@@ -7062,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
@@ -7164,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() {
@@ -7211,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
@@ -7474,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;
@@ -7485,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;
@@ -7890,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
@@ -7903,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
+                }))
             }];
     }
 }
@@ -7972,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);
@@ -8003,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],
@@ -8460,7 +8339,7 @@ __decorate([
 class HoldingSale extends AbstractModel {
 }
 __decorate([
-    Transform(({ value }) => { return { id: value.id }; }, { toPlainOnly: true })
+    Transform(({ value }) => ({ id: value.id }), { toPlainOnly: true })
 ], HoldingSale.prototype, "holding", void 0);
 __decorate([
     Type(() => Date)
@@ -8635,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 [
@@ -8906,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
@@ -9316,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);
@@ -9393,9 +9268,7 @@ 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.1.5", ngImport: i0, type: SseService, deps: [{ token: i0.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -9446,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));
@@ -9539,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
      */
@@ -9783,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);
         }));
     }
     /**
@@ -9992,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({
@@ -10107,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
@@ -11918,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);
@@ -12008,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
@@ -12075,11 +11937,10 @@ 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.1.5", ngImport: i0, type: BankService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
@@ -12178,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
@@ -12344,9 +12205,7 @@ 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.1.5", ngImport: i0, type: MessageDocumentService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
@@ -12411,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) => {
@@ -12501,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();
@@ -12674,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);
@@ -12713,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);
@@ -12818,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;
@@ -13167,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
@@ -13270,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
@@ -13381,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
@@ -13455,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);
@@ -13484,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)
@@ -13755,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
@@ -13808,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);
@@ -13852,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);
@@ -13932,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
@@ -14338,7 +14163,7 @@ class SoleBusinessService extends RestService {
             if (error.status === 422) {
                 this.toastService.error(error.error.violations[0].message);
             }
-            return throwError$1(error);
+            return throwError(error);
         }));
     }
 }
@@ -14471,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() {
@@ -14827,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
@@ -15146,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();
@@ -15298,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
@@ -15807,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);
@@ -16401,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
@@ -16794,19 +16599,13 @@ 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.1.5", ngImport: i0, type: EquityPositionChartService, deps: [{ token: i1.HttpClient }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -16834,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');
@@ -16851,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
@@ -16885,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
@@ -16898,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);
@@ -16916,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
@@ -17010,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([
@@ -17024,21 +16803,17 @@ 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.1.5", ngImport: i0, type: PropertyTransactionReportService, deps: [{ token: PropertyService }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -17071,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) => {
@@ -17619,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 {
@@ -17647,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;
@@ -17669,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 };
 }
 
 /**
@@ -17680,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) {
@@ -17782,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
+            }
+        };
     };
 }
 
@@ -17848,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)
         ]);
@@ -17972,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)
         ]);
@@ -18453,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 };
 }
 
 /**
@@ -18481,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;
@@ -18578,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 {
@@ -19995,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` };
         }
@@ -20007,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();