taxtank-core 0.10.6 → 0.12.0

package/bundles/taxtank-core.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/common/http'), require('rxjs'), require('rxjs/operators'), require('class-transformer'), require('@auth0/angular-jwt'), require('lodash/has'), require('lodash/get'), require('lodash/flatten'), require('lodash/first'), require('lodash/last'), require('lodash/uniqBy'), require('lodash/concat'), require('lodash/compact'), require('moment'), require('moment-range'), require('lodash/cloneDeep'), require('@angular/forms'), require('lodash'), require('event-source-polyfill/src/eventsource.min.js'), require('@angular/router'), require('lodash/clone'), require('jspdf'), require('jspdf-autotable'), require('@stripe/stripe-js'), require('xlsx'), require('file-saver')) :
-    typeof define === 'function' && define.amd ? define('taxtank-core', ['exports', '@angular/core', '@angular/common', '@angular/common/http', 'rxjs', 'rxjs/operators', 'class-transformer', '@auth0/angular-jwt', 'lodash/has', 'lodash/get', 'lodash/flatten', 'lodash/first', 'lodash/last', 'lodash/uniqBy', 'lodash/concat', 'lodash/compact', 'moment', 'moment-range', 'lodash/cloneDeep', '@angular/forms', 'lodash', 'event-source-polyfill/src/eventsource.min.js', '@angular/router', 'lodash/clone', 'jspdf', 'jspdf-autotable', '@stripe/stripe-js', 'xlsx', 'file-saver'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["taxtank-core"] = {}, global.ng.core, global.ng.common, global.ng.common.http, global.rxjs, global.rxjs.operators, global.classTransformer, global.angularJwt, global.has, global.get, global.flatten, global.first, global.last, global.uniqBy, global.concat, global.compact, global.moment, global.momentRange, global.cloneDeep$1, global.ng.forms, global._, global.eventsource_min_js, global.ng.router, global.clone, global.jsPDF, global.autoTable, global.stripeJs, global.xlsx, global.FileSaver));
-})(this, (function (exports, i0, common, i1, rxjs, operators, classTransformer, angularJwt, has, get, flatten, first, last, uniqBy, concat, compact, moment, momentRange, cloneDeep$1, forms, _, eventsource_min_js, i1$1, clone, jsPDF, autoTable, stripeJs, xlsx, FileSaver) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/common/http'), require('rxjs'), require('rxjs/operators'), require('class-transformer'), require('@auth0/angular-jwt'), require('lodash/get'), require('lodash/flatten'), require('lodash/hasIn'), require('lodash/first'), require('lodash/last'), require('lodash/uniqBy'), require('lodash/concat'), require('lodash/compact'), require('moment'), require('moment-range'), require('lodash/cloneDeep'), require('@angular/forms'), require('lodash'), require('event-source-polyfill/src/eventsource.min.js'), require('@angular/router'), require('lodash/clone'), require('jspdf'), require('jspdf-autotable'), require('@stripe/stripe-js'), require('xlsx'), require('file-saver')) :
+    typeof define === 'function' && define.amd ? define('taxtank-core', ['exports', '@angular/core', '@angular/common', '@angular/common/http', 'rxjs', 'rxjs/operators', 'class-transformer', '@auth0/angular-jwt', 'lodash/get', 'lodash/flatten', 'lodash/hasIn', 'lodash/first', 'lodash/last', 'lodash/uniqBy', 'lodash/concat', 'lodash/compact', 'moment', 'moment-range', 'lodash/cloneDeep', '@angular/forms', 'lodash', 'event-source-polyfill/src/eventsource.min.js', '@angular/router', 'lodash/clone', 'jspdf', 'jspdf-autotable', '@stripe/stripe-js', 'xlsx', 'file-saver'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["taxtank-core"] = {}, global.ng.core, global.ng.common, global.ng.common.http, global.rxjs, global.rxjs.operators, global.classTransformer, global.angularJwt, global.get, global.flatten, global.hasIn, global.first, global.last, global.uniqBy, global.concat, global.compact, global.moment, global.momentRange, global.cloneDeep$1, global.ng.forms, global._, global.eventsource_min_js, global.ng.router, global.clone, global.jsPDF, global.autoTable, global.stripeJs, global.xlsx, global.FileSaver));
+})(this, (function (exports, i0, i2, i1, rxjs, operators, classTransformer, angularJwt, get, flatten, hasIn, first, last, uniqBy, concat, compact, moment, momentRange, cloneDeep$1, forms, _, eventsource_min_js, i1$1, clone, jsPDF, autoTable, stripeJs, xlsx, FileSaver) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -25,10 +25,11 @@
     }
 
     var i0__namespace = /*#__PURE__*/_interopNamespace(i0);
+    var i2__namespace = /*#__PURE__*/_interopNamespace(i2);
     var i1__namespace = /*#__PURE__*/_interopNamespace(i1);
-    var has__default = /*#__PURE__*/_interopDefaultLegacy(has);
     var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
     var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
+    var hasIn__default = /*#__PURE__*/_interopDefaultLegacy(hasIn);
     var first__default = /*#__PURE__*/_interopDefaultLegacy(first);
     var last__default = /*#__PURE__*/_interopDefaultLegacy(last);
     var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
@@ -1103,10 +1104,10 @@
         return TtCoreModule;
     }());
     TtCoreModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
-    TtCoreModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [common.CommonModule,
+    TtCoreModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [i2.CommonModule,
             InterceptorsModule] });
     TtCoreModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [[
-                common.CommonModule,
+                i2.CommonModule,
                 InterceptorsModule
             ]] });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, decorators: [{
@@ -1114,7 +1115,7 @@
                 args: [{
                         declarations: [],
                         imports: [
-                            common.CommonModule,
+                            i2.CommonModule,
                             InterceptorsModule
                         ]
                     }]
@@ -1140,8 +1141,8 @@
             if (!collection.length) {
                 return;
             }
-            // Check if the first collection item has property by path
-            if (!has__default["default"](collection.items[0], path)) {
+            // Do nothing if provided path was not found in the 1st collection's item
+            if (!hasIn__default["default"](collection.items[0], path.split('.')[0])) {
                 return;
             }
             this.groupItems(collection, path);
@@ -1358,9 +1359,26 @@
             enumerable: false,
             configurable: true
         });
+        Collection.prototype.getByDateRange = function (from, to, dateField) {
+            if (dateField === void 0) { dateField = 'date'; }
+            return this.create(this.items.filter(function (item) { return item[dateField] >= from && item[dateField] <= to; }));
+        };
         return Collection;
     }());
 
+    var AccountSetupItemCollection = /** @class */ (function (_super) {
+        __extends(AccountSetupItemCollection, _super);
+        function AccountSetupItemCollection(items) {
+            var _this = _super.call(this, items) || this;
+            _this.sortBy('isCompleted', false);
+            return _this;
+        }
+        AccountSetupItemCollection.prototype.isCompleted = function () {
+            return this.getBy('isCompleted', true).length === this.length;
+        };
+        return AccountSetupItemCollection;
+    }(Collection));
+
     exports.BankAccountTypeEnum = void 0;
     (function (BankAccountTypeEnum) {
         BankAccountTypeEnum[BankAccountTypeEnum["TRANSACTION"] = 1] = "TRANSACTION";
@@ -1624,7 +1642,7 @@
         BankTransactionCollection.prototype.groupByTransaction = function (allocations) {
             var _this = this;
             // Group allocations by transaction id
-            var allocationsByTransactions = new CollectionDictionary(allocations, 'transaction');
+            var allocationsByTransactions = new CollectionDictionary(allocations, 'transaction.id');
             // Init an empty dictionary we will fill below
             var bankTransactionsByTransactions = new CollectionDictionary(new BankTransactionCollection([]));
             // Fill dictionary with the same keys as at allocationsByTransactions
@@ -1968,6 +1986,32 @@
         TransactionCollection.prototype.getByAllocations = function (allocations) {
             return new TransactionCollection(this.items.filter(function (transaction) { return allocations.hasTransaction(transaction); }));
         };
+        /**
+         * Get transactions related to Vehicle category
+         */
+        TransactionCollection.prototype.getVehicleTransactions = function () {
+            return this.create(this.items.filter(function (transaction) {
+                return transaction.isVehicleTransaction();
+            }));
+        };
+        /**
+         * Get new transaction collection filtered by tank type
+         */
+        TransactionCollection.prototype.getByTankType = function (tankType) {
+            return this.create(this.items.filter(function (transaction) {
+                switch (tankType) {
+                    case exports.TankTypeEnum.PROPERTY:
+                        return transaction.isPropertyTank();
+                    case exports.TankTypeEnum.WORK:
+                        return transaction.isWorkTank();
+                    case exports.TankTypeEnum.SOLE:
+                        return transaction.isSoleTank();
+                    // Transaction may be not related to any tank type (personal)
+                    default:
+                        return false;
+                }
+            }));
+        };
         return TransactionCollection;
     }(Collection));
 
@@ -2019,15 +2063,6 @@
             enumerable: false,
             configurable: true
         });
-        /**
-         * Get new depreciations collections filtered by tank type
-         */
-        DepreciationCollection.prototype.getByTankType = function (tankType) {
-            if (tankType === exports.TankTypeEnum.PROPERTY) {
-                return new DepreciationCollection(this.items.filter(function (depreciation) { return depreciation.isPropertyTank(); }));
-            }
-            return new DepreciationCollection(this.items.filter(function (depreciation) { return depreciation.isWorkTank(); }));
-        };
         DepreciationCollection.prototype.getByPropertiesIds = function (ids) {
             return new DepreciationCollection(this.items.filter(function (depreciation) { var _a; return ids.includes((_a = depreciation.property) === null || _a === void 0 ? void 0 : _a.id); }));
         };
@@ -2063,6 +2098,29 @@
                 return depreciation.depreciationCapitalProject;
             })), 'id');
         };
+        /**
+         * Get a new collection of depreciations related to vehicles
+         */
+        DepreciationCollection.prototype.getVehicleDepreciations = function () {
+            return this.create(this.items.filter(function (depreciation) {
+                return depreciation.isVehicleDepreciation();
+            }));
+        };
+        DepreciationCollection.prototype.getByTankType = function (tankType) {
+            return this.create(this.items.filter(function (depreciation) {
+                switch (tankType) {
+                    case exports.TankTypeEnum.PROPERTY:
+                        return depreciation.isPropertyTank();
+                    case exports.TankTypeEnum.WORK:
+                        return depreciation.isWorkTank();
+                    case exports.TankTypeEnum.SOLE:
+                        return depreciation.isSoleTank();
+                    // case for other tank or some extra
+                    default:
+                        return false;
+                }
+            }));
+        };
         /**
          * Create TransactionCollection from depreciation items
          */
@@ -2170,6 +2228,48 @@
         return LoanCollection;
     }(Collection));
 
+    var MessageCollection = /** @class */ (function (_super) {
+        __extends(MessageCollection, _super);
+        function MessageCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        MessageCollection.prototype.getFirstUnreadMessage = function (user) {
+            return this.items.find(function (message) {
+                return !message.isRead() && message.isFromEmployee() !== user.isEmployee();
+            });
+        };
+        /**
+         * Get List of unread chats
+         */
+        MessageCollection.prototype.getUnread = function () {
+            return this.items.filter(function (message) { return !message.readAt; });
+        };
+        /**
+         * Check if chat has unread chats
+         */
+        MessageCollection.prototype.hasUnread = function () {
+            return !!this.getUnread().length;
+        };
+        return MessageCollection;
+    }(Collection));
+
+    /**
+     * Collection of MessageDocument instances
+     */
+    var MessageDocumentCollection = /** @class */ (function (_super) {
+        __extends(MessageDocumentCollection, _super);
+        function MessageDocumentCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        /**
+         * get list of documents which are not attached to any message
+         */
+        MessageDocumentCollection.prototype.getUnattached = function () {
+            return new MessageDocumentCollection(this.items.filter(function (doc) { return !doc.message; }));
+        };
+        return MessageDocumentCollection;
+    }(Collection));
+
     var FinancialYear = /** @class */ (function () {
         function FinancialYear(date) {
             this.yearStartDate = '-07-01';
@@ -2219,168 +2319,6 @@
     }());
     FinancialYear.startMonthIndex = 6;
 
-    var LogbookPeriod = /** @class */ (function () {
-        function LogbookPeriod() {
-        }
-        return LogbookPeriod;
-    }());
-    __decorate([
-        classTransformer.Type(function () { return Date; })
-    ], LogbookPeriod.prototype, "from", void 0);
-    __decorate([
-        classTransformer.Type(function () { return Date; })
-    ], LogbookPeriod.prototype, "to", void 0);
-
-    // Class contain array of vehicle logbooks and calculate the best period for logbook claim method
-    var LogbookCollection = /** @class */ (function () {
-        function LogbookCollection(vehicles) {
-            // 12 weeks in milliseconds to check logbooks range
-            this.logbookClaimRange = 12 * 7 * 24 * 3600 * 1000;
-            this.trips = vehicles.map(function (vehicle) { return vehicle.logbook; }).flat();
-            this.financialYear = new FinancialYear();
-            this.setInitialBestPeriod();
-        }
-        Object.defineProperty(LogbookCollection.prototype, "isAutomaticLogbookCalculationAllowed", {
-            // check if summary logbooks date range less than 84 days (12 weeks)
-            get: function () {
-                // forbid automatic logbook calculation if no logbook trips exist
-                if (!this.trips.length) {
-                    return false;
-                }
-                // forbid automatic logbook calculation if logbook trips summary date range less than 12 weeks
-                return this.trips.slice(-1)[0].date.getTime() - this.trips[0].date.getTime() >= this.logbookClaimRange;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(LogbookCollection.prototype, "bestPeriod", {
-            get: function () {
-                // don't calculate if not allowed
-                if (!this.isAutomaticLogbookCalculationAllowed) {
-                    return null;
-                }
-                this.calculateBestPeriod();
-                return this._bestPeriod;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(LogbookCollection.prototype, "workTrips", {
-            get: function () {
-                return this.trips.filter(function (logbook) { return logbook.isWork; });
-            },
-            enumerable: false,
-            configurable: true
-        });
-        // calculate best period for logbook claim method
-        LogbookCollection.prototype.calculateBestPeriod = function () {
-            var _this = this;
-            // set default best period values for real values comparison
-            this.setInitialBestPeriod();
-            // get best period with each trip date as start date
-            this.workTrips.forEach(function (logbook) {
-                var dateRange = _this.getDateRange(logbook.date);
-                // get all trips included in current 12 weeks period
-                var tripsInRange = _this.trips.filter(function (l) {
-                    return l.date >= dateRange.from && l.date <= dateRange.to;
-                });
-                // get work trips included in current 12 weeks period
-                var workTripsInRange = tripsInRange.filter(function (l) { return l.isWork; });
-                // calculate sum of work kilometers in current 12 weeks range
-                var currentRangeKilometers = _this.getKilometersAmount(workTripsInRange);
-                // overwrite best period with current 12 weeks range if amount of kilometers is bigger
-                if (currentRangeKilometers > _this._bestPeriod.kilometers) {
-                    _this._bestPeriod = {
-                        from: dateRange.from,
-                        to: dateRange.to,
-                        kilometers: currentRangeKilometers,
-                        workUsage: _this.getLogbooksWorkUsage(tripsInRange, workTripsInRange)
-                    };
-                }
-            });
-        };
-        LogbookCollection.prototype.getDateRange = function (from) {
-            // set end date after 12 weeks after start date
-            var to = new Date(from.getTime() + this.logbookClaimRange);
-            // set as period last 12 weeks of current year if period end date after end of current year
-            if (to > this.financialYear.endDate) {
-                to = this.financialYear.endDate;
-                from = new Date(to.getTime() - this.logbookClaimRange);
-            }
-            return { from: from, to: to };
-        };
-        // calculate kilometers amount for passed trips
-        LogbookCollection.prototype.getKilometersAmount = function (logbooks) {
-            if (!logbooks.length) {
-                return 0;
-            }
-            return logbooks.map(function (logbook) { return logbook.odometerEnd - logbook.odometerStart; })
-                .reduce(function (prev, next) { return prev + Number(next); });
-        };
-        // calculate work usage for passed trips
-        LogbookCollection.prototype.getLogbooksWorkUsage = function (logbooks, workLogbooks) {
-            var kilometers = this.getKilometersAmount(logbooks);
-            var workKilometers = this.getKilometersAmount(workLogbooks);
-            return Math.round(workKilometers / kilometers * 100);
-        };
-        // set default best period with zero values and fin year start date for comparison in calculation
-        LogbookCollection.prototype.setInitialBestPeriod = function () {
-            // set 1st of July of current year as default start date for best period
-            var startDate = this.financialYear.startDate;
-            // set end custom-date after 12 weeks from start date
-            var endDate = new Date(startDate.getTime() + this.logbookClaimRange);
-            this._bestPeriod = classTransformer.plainToClass(LogbookPeriod, {
-                from: startDate,
-                to: endDate,
-                kilometers: 0,
-                workUsage: 0
-            });
-        };
-        return LogbookCollection;
-    }());
-
-    var MessageCollection = /** @class */ (function (_super) {
-        __extends(MessageCollection, _super);
-        function MessageCollection() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        MessageCollection.prototype.getFirstUnreadMessage = function (user) {
-            return this.items.find(function (message) {
-                return !message.isRead() && message.isFromEmployee() !== user.isEmployee();
-            });
-        };
-        /**
-         * Get List of unread chats
-         */
-        MessageCollection.prototype.getUnread = function () {
-            return this.items.filter(function (message) { return !message.readAt; });
-        };
-        /**
-         * Check if chat has unread chats
-         */
-        MessageCollection.prototype.hasUnread = function () {
-            return !!this.getUnread().length;
-        };
-        return MessageCollection;
-    }(Collection));
-
-    /**
-     * Collection of MessageDocument instances
-     */
-    var MessageDocumentCollection = /** @class */ (function (_super) {
-        __extends(MessageDocumentCollection, _super);
-        function MessageDocumentCollection() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * get list of documents which are not attached to any message
-         */
-        MessageDocumentCollection.prototype.getUnattached = function () {
-            return new MessageDocumentCollection(this.items.filter(function (doc) { return !doc.message; }));
-        };
-        return MessageDocumentCollection;
-    }(Collection));
-
     var PropertyCollection = /** @class */ (function (_super) {
         __extends(PropertyCollection, _super);
         function PropertyCollection() {
@@ -2673,6 +2611,8 @@
     (function (ChartAccountsHeadingVehicleListEnum) {
         ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["WORK_RELATED_CAR_EXPENSES"] = 8] = "WORK_RELATED_CAR_EXPENSES";
         ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["DEPRECIATION_VEHICLES"] = 9] = "DEPRECIATION_VEHICLES";
+        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["KLMS"] = 60] = "KLMS";
+        ChartAccountsHeadingVehicleListEnum[ChartAccountsHeadingVehicleListEnum["FUEL_OIL"] = 61] = "FUEL_OIL";
     })(exports.ChartAccountsHeadingVehicleListEnum || (exports.ChartAccountsHeadingVehicleListEnum = {}));
 
     exports.ChartAccountsListEnum = void 0;
@@ -2684,16 +2624,17 @@
         ChartAccountsListEnum[ChartAccountsListEnum["BUILDING_AT_COST"] = 304] = "BUILDING_AT_COST";
         ChartAccountsListEnum[ChartAccountsListEnum["MANAGEMENT_FEES_PLATFORM_FEES"] = 656] = "MANAGEMENT_FEES_PLATFORM_FEES";
         ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED_FOR_WORK"] = 24] = "KLMS_TRAVELLED_FOR_WORK";
+        ChartAccountsListEnum[ChartAccountsListEnum["KLMS_TRAVELLED"] = 683] = "KLMS_TRAVELLED";
         ChartAccountsListEnum[ChartAccountsListEnum["DIRECTOR_FEES"] = 6] = "DIRECTOR_FEES";
         ChartAccountsListEnum[ChartAccountsListEnum["SALARY_OR_WAGES"] = 2] = "SALARY_OR_WAGES";
         ChartAccountsListEnum[ChartAccountsListEnum["VEHICLES"] = 25] = "VEHICLES";
         ChartAccountsListEnum[ChartAccountsListEnum["COMMERCIAL_VEHICLES"] = 26] = "COMMERCIAL_VEHICLES";
+        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_INTEREST"] = 37] = "VEHICLE_LOAN_INTEREST";
+        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_PRINCIPAL"] = 38] = "VEHICLE_LOAN_PRINCIPAL";
         ChartAccountsListEnum[ChartAccountsListEnum["TAX_INSTALMENTS"] = 662] = "TAX_INSTALMENTS";
         ChartAccountsListEnum[ChartAccountsListEnum["INTEREST_EARNED"] = 22] = "INTEREST_EARNED";
         ChartAccountsListEnum[ChartAccountsListEnum["TRUST_INCOME"] = 567] = "TRUST_INCOME";
         ChartAccountsListEnum[ChartAccountsListEnum["TAX_OFFSETS_N_R_A_S"] = 571] = "TAX_OFFSETS_N_R_A_S";
-        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_INTEREST"] = 37] = "VEHICLE_LOAN_INTEREST";
-        ChartAccountsListEnum[ChartAccountsListEnum["VEHICLE_LOAN_PRINCIPAL"] = 38] = "VEHICLE_LOAN_PRINCIPAL";
     })(exports.ChartAccountsListEnum || (exports.ChartAccountsListEnum = {}));
 
     var DepreciationCapitalProject$1 = /** @class */ (function () {
@@ -2855,6 +2796,25 @@
         ChartAccounts.prototype.isKlmsForWork = function () {
             return this.id === exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK;
         };
+        /**
+         * Check if chart accounts id is related for 'Klms travelled for sole' category
+         */
+        ChartAccounts.prototype.isKlmsForSole = function () {
+            return this.id === exports.ChartAccountsListEnum.KLMS_TRAVELLED;
+        };
+        /**
+         * Check if accounts id is related for KLMs category related to passed tank type
+         */
+        ChartAccounts.prototype.isKLMsByTankType = function (tankType) {
+            switch (tankType) {
+                case exports.TankTypeEnum.WORK:
+                    return this.isKlmsForWork();
+                case exports.TankTypeEnum.SOLE:
+                    return this.isKlmsForSole();
+                default:
+                    return false;
+            }
+        };
         /**
          * Check if chart accounts id is related for 'NRAS Tax Offset' category
          */
@@ -2949,6 +2909,18 @@
         ChartAccounts.prototype.isVehicleLoanExpense = function () {
             return this.id === exports.ChartAccountsListEnum.VEHICLE_LOAN_INTEREST || this.id === exports.ChartAccountsListEnum.VEHICLE_LOAN_PRINCIPAL;
         };
+        /**
+         * Get chart accounts value for current financial year
+         */
+        ChartAccounts.prototype.getCurrentYearValue = function () {
+            return this.getValueByYear(new FinancialYear().year);
+        };
+        /**
+         * Get chart accounts value by financial year
+         */
+        ChartAccounts.prototype.getValueByYear = function (year) {
+            return this.values.find(function (value) { return value.financialYear === year; });
+        };
         return ChartAccounts;
     }(ChartAccounts$1));
     __decorate([
@@ -3013,7 +2985,6 @@
         UserStatusEnum[UserStatusEnum["INACTIVE"] = 0] = "INACTIVE";
         UserStatusEnum[UserStatusEnum["ON_BOARDING"] = 1] = "ON_BOARDING";
         UserStatusEnum[UserStatusEnum["ACTIVE"] = 2] = "ACTIVE";
-        UserStatusEnum[UserStatusEnum["TRIAL"] = 3] = "TRIAL";
     })(exports.UserStatusEnum || (exports.UserStatusEnum = {}));
 
     exports.UserRolesEnum = void 0;
@@ -3103,12 +3074,12 @@
         classTransformer.Type((function () { return Country; }))
     ], Address.prototype, "country", void 0);
 
-    var _a$3;
-    var USER_WORK_POSITION = (_a$3 = {},
-        _a$3[exports.UserRolesEnum.EMPLOYEE] = 'Employee',
-        _a$3[exports.UserRolesEnum.FIRM_MANAGER] = 'Manager',
-        _a$3[exports.UserRolesEnum.FIRM_OWNER] = 'Firm Owner',
-        _a$3);
+    var _a$4;
+    var USER_WORK_POSITION = (_a$4 = {},
+        _a$4[exports.UserRolesEnum.EMPLOYEE] = 'Employee',
+        _a$4[exports.UserRolesEnum.FIRM_MANAGER] = 'Manager',
+        _a$4[exports.UserRolesEnum.FIRM_OWNER] = 'Firm Owner',
+        _a$4);
 
     var ClientDetails$1 = /** @class */ (function () {
         function ClientDetails() {
@@ -3276,22 +3247,22 @@
         SubscriptionTypeEnum[SubscriptionTypeEnum["INVESTOR_PLUS"] = 3] = "INVESTOR_PLUS";
     })(exports.SubscriptionTypeEnum || (exports.SubscriptionTypeEnum = {}));
 
+    var _a$3;
+    var SUBSCRIPTION_TITLE = (_a$3 = {},
+        _a$3[exports.SubscriptionTypeEnum.WITHOUT_SUBSCRIPTION] = 'Without subscription',
+        _a$3[exports.SubscriptionTypeEnum.INDIVIDUAL] = 'Individual',
+        _a$3[exports.SubscriptionTypeEnum.INVESTOR] = 'Investor',
+        _a$3[exports.SubscriptionTypeEnum.INVESTOR_PLUS] = 'Investor plus',
+        _a$3);
+
     var _a$2;
-    var SUBSCRIPTION_TITLE = (_a$2 = {},
+    var SUBSCRIPTION_DESCRIPTION = (_a$2 = {},
         _a$2[exports.SubscriptionTypeEnum.WITHOUT_SUBSCRIPTION] = 'Without subscription',
-        _a$2[exports.SubscriptionTypeEnum.INDIVIDUAL] = 'Individual',
-        _a$2[exports.SubscriptionTypeEnum.INVESTOR] = 'Investor',
-        _a$2[exports.SubscriptionTypeEnum.INVESTOR_PLUS] = 'Investor plus',
+        _a$2[exports.SubscriptionTypeEnum.INDIVIDUAL] = 'Manage income and expenses via live bank feeds. Keep receipts safe, maximise deductions & minimise tax.',
+        _a$2[exports.SubscriptionTypeEnum.INVESTOR] = 'Property made easy with smart tax tools and real-time information to help control how much tax you pay.',
+        _a$2[exports.SubscriptionTypeEnum.INVESTOR_PLUS] = 'Add your whole portfolio, including investment properties, home and properties in trusts. For 3+ properties an extra $6 will be charged per property.',
         _a$2);
 
-    var _a$1;
-    var SUBSCRIPTION_DESCRIPTION = (_a$1 = {},
-        _a$1[exports.SubscriptionTypeEnum.WITHOUT_SUBSCRIPTION] = 'Without subscription',
-        _a$1[exports.SubscriptionTypeEnum.INDIVIDUAL] = 'Manage income and expenses via live bank feeds. Keep receipts safe, maximise deductions & minimise tax.',
-        _a$1[exports.SubscriptionTypeEnum.INVESTOR] = 'Property made easy with smart tax tools and real-time information to help control how much tax you pay.',
-        _a$1[exports.SubscriptionTypeEnum.INVESTOR_PLUS] = 'Add your whole portfolio, including investment properties, home and properties in trusts. For 3+ properties an extra $6 will be charged per property.',
-        _a$1);
-
     var PROPERTY_INVESTOR_MAX_PROPERTIES = 2;
     var ServiceSubscription = /** @class */ (function (_super) {
         __extends(ServiceSubscription, _super);
@@ -3844,10 +3815,11 @@
         TaxExemptionEnum[TaxExemptionEnum["OTHER"] = 7] = "OTHER";
     })(exports.TaxExemptionEnum || (exports.TaxExemptionEnum = {}));
 
-    var PropertyCategoryListEnum;
+    exports.PropertyCategoryListEnum = void 0;
     (function (PropertyCategoryListEnum) {
         PropertyCategoryListEnum[PropertyCategoryListEnum["OWNER_OCCUPIED"] = 3] = "OWNER_OCCUPIED";
-    })(PropertyCategoryListEnum || (PropertyCategoryListEnum = {}));
+        PropertyCategoryListEnum[PropertyCategoryListEnum["VACANT_LAND"] = 5] = "VACANT_LAND";
+    })(exports.PropertyCategoryListEnum || (exports.PropertyCategoryListEnum = {}));
 
     exports.TaxExemptionMetadataEnum = void 0;
     (function (TaxExemptionMetadataEnum) {
@@ -4072,7 +4044,7 @@
             }
             switch (true) {
                 // exemption for main residence properties
-                case this.category.id === PropertyCategoryListEnum.OWNER_OCCUPIED:
+                case this.category.id === exports.PropertyCategoryListEnum.OWNER_OCCUPIED:
                     return exports.TaxExemptionEnum.PPR;
                 // exemption for investment properties owned for at least one year
                 case this.isOneYearExemptionApplicable(sale):
@@ -4874,6 +4846,10 @@
             var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.forecasts = [];
             _this.type = exports.DepreciationTypeEnum.PLANT_EQUIPMENT;
+            /**
+             * @TODO remove after ? signs removed from db models
+             */
+            _this.amount = 0;
             return _this;
         }
         Depreciation.prototype.isCapital = function () {
@@ -5643,7 +5619,7 @@
         TransactionAllocationCollection.prototype.groupByBankAccount = function (bankTransactions) {
             var _this = this;
             // Group bank transactions by bank account id
-            var bankTransactionsByBankAccount = new CollectionDictionary(bankTransactions, 'bankAccount');
+            var bankTransactionsByBankAccount = new CollectionDictionary(bankTransactions, 'bankAccount.id');
             // Create empty dictionary of transaction allocations
             var allocationsByBankAccount = new CollectionDictionary(new TransactionAllocationCollection([]));
             // Fill allocations dictionary with bank transactions dictionary keys and allocations related with each bank transaction collection
@@ -5681,6 +5657,124 @@
         return UserEventSettingCollection;
     }(Collection));
 
+    /**
+     * Class contains traveled kilometers and work usage percent in 12 weeks date range
+     */
+    var LogbookPeriod = /** @class */ (function () {
+        function LogbookPeriod() {
+        }
+        LogbookPeriod.prototype.isEndOfYear = function () {
+            return this.to === new FinancialYear().endDate;
+        };
+        return LogbookPeriod;
+    }());
+    __decorate([
+        classTransformer.Type(function () { return Date; })
+    ], LogbookPeriod.prototype, "from", void 0);
+    __decorate([
+        classTransformer.Type(function () { return Date; })
+    ], LogbookPeriod.prototype, "to", void 0);
+
+    /**
+     * 12 weeks in milliseconds
+     * "To work out your business-use percentage, you need to keep a logbook and the odometer readings for the logbook period.
+     * The logbook period is a minimum continuous period of 12 weeks." © Nicole Kelly
+     */
+    var LOGBOOK_PERIOD_DURATION = 12 * 7 * 24 * 3600 * 1000;
+    var VehicleLogbookCollection = /** @class */ (function (_super) {
+        __extends(VehicleLogbookCollection, _super);
+        function VehicleLogbookCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        /**
+         * Check if we can calculate the best period
+         */
+        VehicleLogbookCollection.prototype.isBestPeriodExist = function () {
+            if (this.items.length < 2) {
+                return false;
+            }
+            return LOGBOOK_PERIOD_DURATION < (this.last.date.getTime() - this.first.date.getTime());
+        };
+        /**
+         * Get collection of non-personal logbooks (work-related, sole-related).
+         */
+        VehicleLogbookCollection.prototype.getBusinessLogbooks = function () {
+            return this.create(this.items.filter(function (logbook) { return logbook.isBusiness(); }));
+        };
+        /**
+         * Logbook Period is the best when it has the biggest amount of work kilometers
+         * Best period duration is defined as LOGBOOK_PERIOD_DURATION (12 weeks) by the ATO
+         */
+        VehicleLogbookCollection.prototype.getBestPeriod = function () {
+            if (!this.isBestPeriodExist()) {
+                return null;
+            }
+            var bestPeriod;
+            var businessLogbooks = this.getBusinessLogbooks().toArray();
+            for (var i = 0; i < businessLogbooks.length; i++) {
+                var logbook = businessLogbooks[i];
+                // no sense to check next logbooks because we already get the end of the year
+                if (bestPeriod && bestPeriod.isEndOfYear()) {
+                    break;
+                }
+                var dateRange = this.getPeriodRange(logbook.date);
+                // get logbooks included in current logbook period
+                var logbooksInRange = this.getByDateRange(logbook.date, new Date(logbook.date.getTime() + LOGBOOK_PERIOD_DURATION));
+                var workUsage = logbooksInRange.getWorkUsage();
+                // compare with previous best period and overwrite if needs
+                if (!bestPeriod || workUsage > bestPeriod.workUsage) {
+                    bestPeriod = classTransformer.plainToClass(LogbookPeriod, {
+                        from: dateRange.from,
+                        to: dateRange.to,
+                        kilometers: logbooksInRange.getBusinessLogbooks().getKlms(),
+                        workUsage: workUsage
+                    });
+                }
+            }
+            return bestPeriod;
+        };
+        /**
+         * Calculate total kilometers traveled
+         */
+        VehicleLogbookCollection.prototype.getKlms = function () {
+            return this.items.reduce(function (sum, logbook) { return sum + logbook.getKlms(); }, 0);
+        };
+        /**
+         * Calculate work usage (percent of business-related kilometers from total kilometers)
+         */
+        VehicleLogbookCollection.prototype.getWorkUsage = function () {
+            var totalKilometers = this.getKlms();
+            var workKilometers = this.getBusinessLogbooks().getKlms();
+            return Math.round(workKilometers / totalKilometers * 100);
+        };
+        /**
+         * Get LOGBOOK_PERIOD_DURATION date range from passed start date
+         */
+        VehicleLogbookCollection.prototype.getPeriodRange = function (from) {
+            // set end date after LOGBOOK_PERIOD_DURATION after start date
+            var to = new Date(from.getTime() + LOGBOOK_PERIOD_DURATION);
+            var financialYear = new FinancialYear();
+            // set as period last LOGBOOK_PERIOD_DURATION of current year if period end date after end of current year
+            if (to > financialYear.endDate) {
+                to = financialYear.endDate;
+                from = new Date(to.getTime() - LOGBOOK_PERIOD_DURATION);
+            }
+            return { from: from, to: to };
+        };
+        return VehicleLogbookCollection;
+    }(Collection));
+
+    var VehicleCollection = /** @class */ (function (_super) {
+        __extends(VehicleCollection, _super);
+        function VehicleCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        VehicleCollection.prototype.getLogbooks = function () {
+            return new VehicleLogbookCollection(flatten__default["default"](this.items.map(function (vehicle) { return vehicle.logbook; })));
+        };
+        return VehicleCollection;
+    }(Collection));
+
     exports.BankAccountStatusEnum = void 0;
     (function (BankAccountStatusEnum) {
         BankAccountStatusEnum[BankAccountStatusEnum["INACTIVE"] = 0] = "INACTIVE";
@@ -6117,6 +6211,15 @@
         VehicleLogbookPurposeEnum[VehicleLogbookPurposeEnum["PERSONAL"] = 2] = "PERSONAL";
     })(exports.VehicleLogbookPurposeEnum || (exports.VehicleLogbookPurposeEnum = {}));
 
+    /**
+     * Account setup item instance is using for account setup checklist
+     */
+    var AccountSetupItem = /** @class */ (function () {
+        function AccountSetupItem() {
+        }
+        return AccountSetupItem;
+    }());
+
     var Bank$1 = /** @class */ (function () {
         function Bank() {
         }
@@ -6648,10 +6751,24 @@
         ChartAccountsTaxLabelsEnum["TAX_DEDUCTED"] = "Tax Deducted";
     })(exports.ChartAccountsTaxLabelsEnum || (exports.ChartAccountsTaxLabelsEnum = {}));
 
-    var Chat$1 = /** @class */ (function () {
-        function Chat() {
+    var ChartAccountsValue$1 = /** @class */ (function () {
+        function ChartAccountsValue() {
         }
-        return Chat;
+        return ChartAccountsValue;
+    }());
+
+    var ChartAccountsValue = /** @class */ (function (_super) {
+        __extends(ChartAccountsValue, _super);
+        function ChartAccountsValue() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ChartAccountsValue;
+    }(ChartAccountsValue$1));
+
+    var Chat$1 = /** @class */ (function () {
+        function Chat() {
+        }
+        return Chat;
     }());
 
     var Chat = /** @class */ (function (_super) {
@@ -6751,6 +6868,30 @@
         classTransformer.Expose()
     ], Message.prototype, "documents", void 0);
 
+    var ClientIncomeTypes$1 = /** @class */ (function () {
+        function ClientIncomeTypes() {
+        }
+        return ClientIncomeTypes;
+    }());
+
+    var ClientIncomeTypes = /** @class */ (function (_super) {
+        __extends(ClientIncomeTypes, _super);
+        function ClientIncomeTypes() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        Object.defineProperty(ClientIncomeTypes.prototype, "length", {
+            /**
+             * Get count of selected income types
+             */
+            get: function () {
+                return Object.values(this).filter(function (value) { return typeof value === 'boolean' && value; }).length;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return ClientIncomeTypes;
+    }(ClientIncomeTypes$1));
+
     var ClientInvite$1 = /** @class */ (function () {
         function ClientInvite() {
         }
@@ -7017,34 +7158,34 @@
         return DepreciationGroupItem;
     }(DepreciationGroup));
 
-    var _a;
-    var DEPRECIATION_GROUPS = (_a = {},
-        _a[exports.DepreciationGroupEnum.BORROWING_EXPENSES] = {
+    var _a$1;
+    var DEPRECIATION_GROUPS = (_a$1 = {},
+        _a$1[exports.DepreciationGroupEnum.BORROWING_EXPENSES] = {
             label: 'Borrowing Expenses',
             description: 'Borrowing expenses on loans are deductible over 1826 days (5 years) starting from the date of a loan',
             icon: 'loan'
         },
-        _a[exports.DepreciationGroupEnum.BUILDING_IMPROVEMENTS] = {
+        _a$1[exports.DepreciationGroupEnum.BUILDING_IMPROVEMENTS] = {
             label: 'Building & Improvements',
             description: 'Construction costs, renovations and capital improvements which depreciate at 2.5%',
             icon: 'building-improvements'
         },
-        _a[exports.DepreciationGroupEnum.PLANT_EQUIPMENT] = {
+        _a$1[exports.DepreciationGroupEnum.PLANT_EQUIPMENT] = {
             label: 'Plant & Equipment',
             description: 'Assets which decline in value over their useful life (as prescribed by the ATO)',
             icon: 'plant-equipment'
         },
-        _a[exports.DepreciationGroupEnum.LOW_VALUE_POOL] = {
+        _a$1[exports.DepreciationGroupEnum.LOW_VALUE_POOL] = {
             label: 'Low Value Pool',
             description: 'Items under $1,000 are added to the pool to maximise depreciation',
             icon: 'lvp'
         },
-        _a[exports.DepreciationGroupEnum.WRITTEN_OFF_ITEMS] = {
+        _a$1[exports.DepreciationGroupEnum.WRITTEN_OFF_ITEMS] = {
             label: 'Written Off Items',
             description: 'Items below $300, replaced or obsolete are fully deductible',
             icon: 'cart'
         },
-        _a);
+        _a$1);
 
     var DepreciationReceipt$1 = /** @class */ (function () {
         function DepreciationReceipt() {
@@ -7212,8 +7353,20 @@
         AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 35] = "USER_UPDATED";
         AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 36] = "VEHICLE_CLAIM_UPDATED";
         AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 37] = "VEHICLE_CLAIM_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 38] = "VEHICLE_LOGBOOK_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 39] = "VEHICLE_LOGBOOK_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 40] = "VEHICLE_LOGBOOK_DELETED";
     })(exports.AppEventTypeEnum || (exports.AppEventTypeEnum = {}));
 
+    /**
+     * Data table structure suitable for export
+     */
+    var ExportDataTable = /** @class */ (function () {
+        function ExportDataTable() {
+        }
+        return ExportDataTable;
+    }());
+
     exports.ExportFormatEnum = void 0;
     (function (ExportFormatEnum) {
         ExportFormatEnum["PDF"] = "PDF";
@@ -7329,20 +7482,18 @@
         function VehicleLogbook() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        Object.defineProperty(VehicleLogbook.prototype, "kilometres", {
-            get: function () {
-                return this.odometerEnd - this.odometerStart;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(VehicleLogbook.prototype, "isWork", {
-            get: function () {
-                return this.purpose === exports.VehicleLogbookPurposeEnum.BUSINESS;
-            },
-            enumerable: false,
-            configurable: true
-        });
+        /**
+         * Get amount of kilometers in this logbook
+         */
+        VehicleLogbook.prototype.getKlms = function () {
+            return this.odometerEnd - this.odometerStart;
+        };
+        /**
+         * Check if logbook is business-related
+         */
+        VehicleLogbook.prototype.isBusiness = function () {
+            return this.purpose === exports.VehicleLogbookPurposeEnum.BUSINESS;
+        };
         return VehicleLogbook;
     }(VehicleLogbook$1));
     __decorate([
@@ -7354,54 +7505,12 @@
         function Vehicle() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        Object.defineProperty(Vehicle.prototype, "workKilometersPercentage", {
-            get: function () {
-                return this.workKilometres / this.totalKilometres * 100;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Vehicle.prototype, "totalKilometres", {
-            get: function () {
-                var kilometers = 0;
-                this.logbook.forEach(function (lb) {
-                    kilometers += lb.kilometres;
-                });
-                return kilometers;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Vehicle.prototype, "workKilometres", {
-            get: function () {
-                var kilometers = 0;
-                this.logbook.forEach(function (lb) {
-                    if (lb.purpose === exports.VehicleLogbookPurposeEnum.BUSINESS) {
-                        kilometers += lb.kilometres;
-                    }
-                });
-                return kilometers;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Vehicle.prototype, "personalKilometres", {
-            get: function () {
-                return this.totalKilometres - this.workKilometres;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Vehicle.prototype, "lastLogbook", {
-            get: function () {
-                if (!this.logbook.length) {
-                    return { odometerEnd: 0 };
-                }
-                return this.logbook.slice(-1)[0];
-            },
-            enumerable: false,
-            configurable: true
-        });
+        /**
+         * Get vehicle's logbooks as collection
+         */
+        Vehicle.prototype.getLogbooks = function () {
+            return new VehicleLogbookCollection(this.logbook);
+        };
         return Vehicle;
     }(Vehicle$1));
     __decorate([
@@ -7438,19 +7547,70 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(VehicleClaim.prototype, "isLogbookMethod", {
-            get: function () {
-                return this.method === exports.VehicleClaimMethodEnum.LOGBOOK;
-            },
-            enumerable: false,
-            configurable: true
-        });
+        VehicleClaim.prototype.isLogbookMethod = function () {
+            return this.method === exports.VehicleClaimMethodEnum.LOGBOOK;
+        };
+        VehicleClaim.prototype.isKLMsMethod = function () {
+            return this.method === exports.VehicleClaimMethodEnum.KMS;
+        };
+        VehicleClaim.prototype.isWorkTank = function () {
+            return this.tankType === exports.TankTypeEnum.WORK;
+        };
+        VehicleClaim.prototype.isSoleTank = function () {
+            return this.tankType === exports.TankTypeEnum.SOLE;
+        };
         /**
-         * Claim amount for Kms method
+         * Claim amount for KLMs method. Exists only for KLMs method.
          */
-        VehicleClaim.prototype.getKmsClaimAmount = function (vehicleClaimRate) {
+        VehicleClaim.prototype.getKLMsClaimAmount = function (vehicleClaimRate) {
+            if (!this.isKLMsMethod()) {
+                return 0;
+            }
             return +(this.kilometers * vehicleClaimRate).toFixed(2);
         };
+        /**
+         * Get logbook claim amount. Exists only for logbook method.
+         * ClaimAmount = WorkUsage * transaction/depreciation amount
+         */
+        VehicleClaim.prototype.getLogbookClaimAmount = function (transactions) {
+            var _this = this;
+            if (!this.isLogbookMethod()) {
+                return 0;
+            }
+            var transactionsAmount = transactions
+                .getByTankType(this.tankType)
+                .getVehicleTransactions()
+                // except klms transactions because they needed only for klms method
+                .filter(function (transaction) { return !transaction.chartAccounts.isKLMsByTankType(_this.tankType); })
+                .sumBy('amount');
+            // Math.abs because amount will be negative (because we sum expenses), but we don't want negative percent value
+            return Math.abs(transactionsAmount) * this.workUsage / 100;
+        };
+        /**
+         * Create KLMs transaction based on vehicle claim and vehicle claim rate
+         * @TODO handle on backend: Create klms transaction when vhicle claim created
+         */
+        VehicleClaim.prototype.toTransaction = function (vehicleClaimRate) {
+            return classTransformer.plainToClass(Transaction, {
+                amount: this.kilometers * vehicleClaimRate,
+                source: exports.TransactionSourceEnum.CASH,
+                type: exports.TransactionTypeEnum.DEBIT,
+                taxWithheld: 0,
+                description: 'Klm’s method',
+                date: new Date(new FinancialYear().year + "-06-30"),
+                claimPercent: 100,
+                chartAccounts: {
+                    id: this.getKlmsChartAccountsIdByTankType(this.tankType)
+                }
+            });
+        };
+        VehicleClaim.prototype.getKlmsChartAccountsIdByTankType = function (tankType) {
+            if (tankType === void 0) { tankType = this.tankType; }
+            if (tankType === exports.TankTypeEnum.WORK) {
+                return exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK;
+            }
+            return exports.ChartAccountsListEnum.KLMS_TRAVELLED;
+        };
         return VehicleClaim;
     }(VehicleClaim$1));
 
@@ -7505,6 +7665,12 @@
         })
     ], Notification.prototype, "redirectionLink", void 0);
 
+    exports.PdfOrientationEnum = void 0;
+    (function (PdfOrientationEnum) {
+        PdfOrientationEnum["PORTRAIT"] = "portrait";
+        PdfOrientationEnum["LANDSCAPE"] = "landscape";
+    })(exports.PdfOrientationEnum || (exports.PdfOrientationEnum = {}));
+
     /**
      * Calculation form control types
      */
@@ -8365,87 +8531,105 @@
         UserEventSettingFieldEnum["FREQUENCY"] = "frequency";
     })(exports.UserEventSettingFieldEnum || (exports.UserEventSettingFieldEnum = {}));
 
-    var AddressService = /** @class */ (function () {
-        function AddressService(http, environment) {
+    /**
+     * Enum list of all possible account setup items. Using with [ACCOUNT_SETUP_ITEMS]{@link ACCOUNT_SETUP_ITEMS}
+     */
+    var AccountSetupItemsEnum;
+    (function (AccountSetupItemsEnum) {
+        AccountSetupItemsEnum[AccountSetupItemsEnum["SALARY"] = 0] = "SALARY";
+        AccountSetupItemsEnum[AccountSetupItemsEnum["OTHER_INCOME"] = 1] = "OTHER_INCOME";
+        AccountSetupItemsEnum[AccountSetupItemsEnum["PROPERTY"] = 2] = "PROPERTY";
+        AccountSetupItemsEnum[AccountSetupItemsEnum["BANK_FEEDS"] = 3] = "BANK_FEEDS";
+        AccountSetupItemsEnum[AccountSetupItemsEnum["WORK_LOGBOOK"] = 4] = "WORK_LOGBOOK";
+        AccountSetupItemsEnum[AccountSetupItemsEnum["SOLE_INCOME"] = 5] = "SOLE_INCOME";
+        AccountSetupItemsEnum[AccountSetupItemsEnum["TRANSACTION"] = 6] = "TRANSACTION";
+    })(AccountSetupItemsEnum || (AccountSetupItemsEnum = {}));
+
+    var _a;
+    /**
+     * List of all possible account setup steps
+     */
+    var ACCOUNT_SETUP_ITEMS = (_a = {},
+        _a[AccountSetupItemsEnum.SALARY] = classTransformer.plainToClass(AccountSetupItem, {
+            title: 'Add your work income forecast',
+            description: 'One the most important steps is to add your salary or wage incomes so we can automatically calculate tax withheld and your forecasted tax position.',
+            url: '/client/work-tank/forecasting'
+        }),
+        _a[AccountSetupItemsEnum.OTHER_INCOME] = classTransformer.plainToClass(AccountSetupItem, {
+            title: 'Add any other expected incomes',
+            description: 'To ensure an accurate tax position forecast, add estimates for any other income types, like dividends, interest, trusts, annuities, director payments etc.',
+            url: '/client/work-tank/forecasting'
+        }),
+        _a[AccountSetupItemsEnum.PROPERTY] = classTransformer.plainToClass(AccountSetupItem, {
+            title: 'Add your properties',
+            description: 'Add your properties to seamlessly manage your rental incomes and expenses, whilst tracking your cash position, tax positions and equity forecasts in real time.',
+            url: '/client/property-tank'
+        }),
+        _a[AccountSetupItemsEnum.BANK_FEEDS] = classTransformer.plainToClass(AccountSetupItem, {
+            title: 'Link banks and select accounts',
+            description: 'Link banks to automatically feed your account transactions to save you time and money.  Allocating live transactions ensures nothing is missed, lost or forgotten!',
+            url: '/client/bank-feeds'
+        }),
+        _a[AccountSetupItemsEnum.WORK_LOGBOOK] = classTransformer.plainToClass(AccountSetupItem, {
+            title: 'Set up your logbook method',
+            description: 'Do you use your vehicle for work? Select your method and the klms or logbook % to automate accurately all vehicle expenses throughout the year.',
+            url: '/client/work-tank/logbook'
+        }),
+        _a[AccountSetupItemsEnum.SOLE_INCOME] = classTransformer.plainToClass(AccountSetupItem, {
+            title: 'Add your business details',
+            description: 'Add your business details, logo and payment terms to create invoice templates in minutes.',
+            url: '/client/sole-tank/forecasting'
+        }),
+        _a[AccountSetupItemsEnum.TRANSACTION] = classTransformer.plainToClass(AccountSetupItem, {
+            title: 'Allocation transactions',
+            description: 'Select one or multiple transactions, the category from the dropdown and attach your receipt. It’s that simple to capture every possible deduction, and keep organised all throughout the year.',
+            url: '/client/bank-feeds'
+        }),
+        _a);
+
+    /**
+     * @TODO extend rest service when it could work with single objects, not only arrays
+     */
+    var ClientIncomeTypesService = /** @class */ (function () {
+        function ClientIncomeTypesService(http, environment) {
             this.http = http;
             this.environment = environment;
-            this.countriesSubject = new rxjs.ReplaySubject(1);
+            this.cacheSubject = new rxjs.ReplaySubject(1);
         }
-        AddressService.prototype.getCountries = function () {
+        ClientIncomeTypesService.prototype.get = function () {
             var _this = this;
-            if (!this._countries) {
-                this.http.get(this.environment.apiV2 + "/countries")
+            if (!this.cache) {
+                this.http.get(this.environment.apiV2 + "/client-income-types")
                     .pipe(operators.map(function (response) {
-                    return response['hydra:member'].map(function (item) { return classTransformer.plainToClass(Country, item); });
+                    return classTransformer.plainToClass(ClientIncomeTypes, response['hydra:member'][0], { excludePrefixes: ['@'] });
                 }))
-                    .subscribe(function (countries) {
-                    _this._countries = countries;
-                    _this.countriesSubject.next(countries);
+                    .subscribe(function (incomeTypes) {
+                    _this.cache = incomeTypes;
+                    _this.cacheSubject.next(_this.cache);
                 });
             }
-            return this.countriesSubject.asObservable();
-        };
-        return AddressService;
-    }());
-    AddressService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AddressService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    AddressService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AddressService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AddressService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
-
-    /**
-     * Service to work with assets (documents, receipts, e.t.c.)
-     */
-    var AssetsService = /** @class */ (function () {
-        function AssetsService(http, userSwitcherService, environment) {
-            this.http = http;
-            this.userSwitcherService = userSwitcherService;
-            this.environment = environment;
-            this.impersonatedClient = this.userSwitcherService.get();
-        }
-        /**
-         * Get asset link
-         * @param asset to get the link for
-         */
-        AssetsService.prototype.getLink = function (asset) {
-            return this.http.get(this.environment.apiV2 + "/assets/" + asset.type + "/" + asset.id);
-        };
-        /**
-         * Download asset
-         * @param asset which should be downloaded
-         * @TODO refactor
-         */
-        AssetsService.prototype.download = function (asset) {
-            return this.environment.apiV2 + "/assets/" + asset.type + "/" + asset.id + "/download?bearer=" + localStorage.getItem('token') + (this.impersonatedClient ? "&_switch_user=" + this.impersonatedClient : '');
+            return this.cacheSubject.asObservable();
         };
-        // @Todo refactor to event dispatcher
-        /**
-         * Delete asset
-         * @param entityId: id of asset main entity (property, folder, transaction, e.t.c.)
-         * @param asset which should be deleted
-         */
-        AssetsService.prototype.delete = function (entityId, asset) {
-            return this.http.delete(this.environment.apiV2 + "/" + asset.entityType + "/" + entityId + "/" + asset.type + "/" + asset.id);
+        ClientIncomeTypesService.prototype.update = function (incomeTypes) {
+            var _this = this;
+            return this.http.put(this.environment.apiV2 + "/client-income-types/" + incomeTypes.id, incomeTypes)
+                .pipe(operators.map(function (incomeTypesBase) {
+                _this.cache = classTransformer.plainToClass(ClientIncomeTypes, incomeTypesBase);
+                _this.cacheSubject.next(_this.cache);
+                return _this.cache;
+            }));
         };
-        return AssetsService;
+        return ClientIncomeTypesService;
     }());
-    AssetsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AssetsService, deps: [{ token: i1__namespace.HttpClient }, { token: UserSwitcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    AssetsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AssetsService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AssetsService, decorators: [{
+    ClientIncomeTypesService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientIncomeTypesService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ClientIncomeTypesService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientIncomeTypesService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientIncomeTypesService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
             }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: UserSwitcherService }, { type: undefined, decorators: [{
+            return [{ type: i1__namespace.HttpClient }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
                         }] }];
@@ -8478,19 +8662,75 @@
                     }]
             }] });
 
+    /**
+     * popup notifications service (toast, snackbar).
+     */
+    var ToastService = /** @class */ (function () {
+        function ToastService() {
+            this.toast$ = new rxjs.ReplaySubject(1);
+        }
+        ToastService.prototype.get = function () {
+            return this.toast$.asObservable();
+        };
+        ToastService.prototype.add = function (toast) {
+            this.toast$.next(toast);
+        };
+        ToastService.prototype.success = function (message) {
+            this.add(classTransformer.plainToClass(Toast, {
+                type: exports.ToastTypeEnum.SUCCESS,
+                title: 'Success!',
+                message: message,
+            }));
+        };
+        ToastService.prototype.warning = function (message) {
+            this.add(classTransformer.plainToClass(Toast, {
+                type: exports.ToastTypeEnum.WARNING,
+                title: 'Warning!',
+                message: message,
+            }));
+        };
+        ToastService.prototype.error = function (message) {
+            this.add(classTransformer.plainToClass(Toast, {
+                type: exports.ToastTypeEnum.ERROR,
+                title: 'Error!',
+                message: message,
+            }));
+        };
+        ToastService.prototype.info = function (message) {
+            this.add(classTransformer.plainToClass(Toast, {
+                type: exports.ToastTypeEnum.INFO,
+                title: 'Information',
+                message: message,
+            }));
+        };
+        return ToastService;
+    }());
+    ToastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ToastService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ToastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ToastService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ToastService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
     /**
      * Abstract base service that implements common services functionality
      * and describe abstract methods/properties that have to be implemented in child services
      * Model - entity service is working with
      * BaseModel - base entity model that extends by Model
+     * @TODO Alex: refactor all services for work with collections instead of arrays
+     * @TODO Alex: implement smart system of default toast messages
      */
     var RestService = /** @class */ (function () {
-        function RestService(http, eventDispatcherService, environment) {
+        function RestService(http, eventDispatcherService, environment, toastService) {
             this.http = http;
             this.eventDispatcherService = eventDispatcherService;
             this.environment = environment;
+            this.toastService = toastService;
             // subject for service cache
             this.cacheSubject = new rxjs.ReplaySubject(1);
+            this.listenEvents();
         }
         /**
          * get cached list of all instances
@@ -8539,6 +8779,9 @@
                     _this.cache.push(newInstance);
                     _this.updateCache();
                 }
+                if (_this.messageCreated) {
+                    _this.toastService.success(_this.messageCreated);
+                }
                 return newInstance;
             }));
         };
@@ -8559,6 +8802,9 @@
                     (_a = _this.cache).push.apply(_a, __spreadArray([], __read(newInstances)));
                     _this.updateCache();
                 }
+                if (_this.messageCreatedBatch) {
+                    _this.toastService.success(_this.messageCreatedBatch);
+                }
                 return newInstances;
             }));
         };
@@ -8576,6 +8822,9 @@
                 var updatedInstance = _this.createModelInstance(_this.modelClass, updatedItem);
                 replace(_this.cache, updatedInstance);
                 _this.updateCache();
+                if (_this.messageUpdated) {
+                    _this.toastService.success(_this.messageUpdated);
+                }
                 return updatedInstance;
             }));
         };
@@ -8594,6 +8843,9 @@
                 updatedInstances.forEach(function (instance) {
                     replace(_this.cache, instance);
                 });
+                if (_this.messageUpdatedBatch) {
+                    _this.toastService.success(_this.messageUpdatedBatch);
+                }
                 _this.updateCache();
                 return updatedInstances;
             }));
@@ -8608,6 +8860,9 @@
                 .pipe(operators.map(function () {
                 _this.cache = _this.cache.filter(function (item) { return item['id'] !== model['id']; });
                 _this.updateCache();
+                if (_this.messageDeleted) {
+                    _this.toastService.success(_this.messageDeleted);
+                }
             }));
         };
         /**
@@ -8621,6 +8876,9 @@
                 var ids = models.map(function (model) { return model['id']; });
                 _this.cache = _this.cache.filter(function (item) { return !ids.includes(item['id']); });
                 _this.updateCache();
+                if (_this.messageDeletedBatch) {
+                    _this.toastService.success(_this.messageDeletedBatch);
+                }
             }));
         };
         /**
@@ -8659,9 +8917,13 @@
         RestService.prototype.createModelInstance = function (model, baseModel) {
             return classTransformer.plainToClass(model, baseModel, { excludePrefixes: ['@'] });
         };
-        return RestService;
+        /**
+         * Method that call all listeners. Empty by default. Should be redefined by child services if required
+         */
+        RestService.prototype.listenEvents = function () { };
+        return RestService;
     }());
-    RestService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    RestService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     RestService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: RestService, decorators: [{
                 type: i0.Injectable,
@@ -8672,26 +8934,217 @@
             return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
-                        }] }];
+                        }] }, { type: ToastService }];
         } });
 
     /**
-     * Service that handling banks logic
+     * Service for work with Property
      */
-    var BankService = /** @class */ (function (_super) {
-        __extends(BankService, _super);
-        function BankService() {
+    var PropertyService = /** @class */ (function (_super) {
+        __extends(PropertyService, _super);
+        function PropertyService() {
             var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            _this.modelClass = Bank;
-            _this.url = 'banks';
-            _this.isHydra = true;
+            _this.modelClass = Property;
+            _this.url = 'properties';
             return _this;
         }
-        return BankService;
+        PropertyService.prototype.listenEvents = function () {
+            this.listenShareInviteAccepted();
+            this.listenServiceSubscriptionUpdated();
+            // @TODO Alex: consider to refactor property movements logic similar to client-movements
+            this.listenMovementsChanged();
+        };
+        /**
+         * Update cache when share invitation accepted
+         */
+        PropertyService.prototype.listenShareInviteAccepted = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_SHARE_UPDATED).subscribe(function () { return _this.resetCache(); });
+        };
+        /**
+         * Update cache when user's service subscription is updated
+         */
+        PropertyService.prototype.listenServiceSubscriptionUpdated = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(function () { return _this.resetCache(); });
+        };
+        /**
+         * Update cache when property category changed
+         */
+        PropertyService.prototype.listenMovementsChanged = function () {
+            var _this = this;
+            // @TODO change dispatcher logic to work with multiple events
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_MOVEMENT_CREATED).subscribe(function () { return _this.resetCache(); });
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_MOVEMENT_UPDATED).subscribe(function () { return _this.resetCache(); });
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_MOVEMENT_DELETED).subscribe(function () { return _this.resetCache(); });
+        };
+        PropertyService.prototype.update = function (property) {
+            var _this = this;
+            return _super.prototype.update.call(this, property).pipe(operators.map(function (updatedProperty) {
+                if (property.documentFile) {
+                    _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.PROPERTY_UPDATED_WITH_DOCUMENT, property));
+                }
+                return updatedProperty;
+            }));
+        };
+        PropertyService.prototype.getByCategoryId = function (id) {
+            return this.get().pipe(operators.map(function (properties) {
+                return properties.filter(function (property) { return property.category.id === id; });
+            }));
+        };
+        /**
+         * Activate deactivated property
+         */
+        PropertyService.prototype.activate = function (property) {
+            var _this = this;
+            return this.http.post(this.environment.apiV2 + "/property-subscriptions", { user: property.user, property: property })
+                .pipe(operators.map(function (propertySubscriptionBase) {
+                var newPropertySubscription = classTransformer.plainToClass(PropertySubscription, propertySubscriptionBase);
+                var activatedProperty = classTransformer.plainToClass(Property, Object.assign({}, property, { subscriptions: [newPropertySubscription] }));
+                replace(_this.cache, activatedProperty);
+                _this.updateCache();
+            }));
+        };
+        /**
+         * Deactivate activated property
+         */
+        PropertyService.prototype.deactivate = function (property) {
+            var _this = this;
+            return this.http.delete(this.environment.apiV2 + "/property-subscriptions/" + property.getCurrentSubscription().id)
+                .pipe(operators.map(function () {
+                var deactivatedProperty = classTransformer.plainToClass(Property, Object.assign({}, property, { subscriptions: [] }));
+                replace(_this.cache, deactivatedProperty);
+                _this.updateCache();
+            }));
+        };
+        /**
+         * Update property photo
+         * @param property Property instance for photo update
+         * @param photoFormData FormData with property photo image
+         */
+        PropertyService.prototype.updatePhoto = function (property, photoFormData) {
+            var _this = this;
+            return this.http.post(this.environment.apiV2 + "/properties/" + property.id + "/photo?_method=PUT", photoFormData)
+                .pipe(operators.map(function (photoLink) {
+                property.photo = photoLink;
+                // update properties cache
+                replace(_this.cache, property);
+                _this.updateCache();
+            }));
+        };
+        PropertyService.prototype.getByShareId = function (id) {
+            return this.get().pipe(operators.map(function (properties) {
+                return properties.filter(function (property) { return property.user.id === id; });
+            }));
+        };
+        /**
+         * Get list of active user's properties
+         */
+        PropertyService.prototype.getActive = function () {
+            return this.get().pipe(operators.map(function (properties) { return properties.filter(function (property) { return property.isActive; }); }));
+        };
+        return PropertyService;
     }(RestService));
-    BankService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, decorators: [{
+    PropertyService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
+    /**
+     * Service to work with income sources
+     */
+    var IncomeSourceService = /** @class */ (function (_super) {
+        __extends(IncomeSourceService, _super);
+        function IncomeSourceService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.url = 'income-sources';
+            _this.modelClass = IncomeSource;
+            _this.incomeSourceTypeSubject = new rxjs.ReplaySubject(1);
+            return _this;
+        }
+        /**
+         * Get income sources tax calculation
+         * @param salaryForecast for which tax should be calculated
+         */
+        IncomeSourceService.prototype.getTaxCalculation = function (salaryForecast) {
+            return this.http.post(this.environment.apiV2 + "/" + this.url + "/tax-calculation", salaryForecast)
+                .pipe(operators.map(function (response) {
+                return classTransformer.plainToClass(SalaryForecast, response);
+            }));
+        };
+        /**
+         * Add batch of income sources
+         * @param incomeSources to add
+         */
+        IncomeSourceService.prototype.addBatch = function (incomeSources) {
+            var _this = this;
+            return this.http.post(this.environment.apiV2 + "/" + this.url, incomeSources)
+                .pipe(operators.map(function (addedIncomeSources) {
+                var _a;
+                // assign respond income sources to provided income sources
+                var assignedIncomeSources = addedIncomeSources
+                    .map(function (incomeSource, index) { return Object.assign(classTransformer.plainToClass(IncomeSource, {}), incomeSource, incomeSources[index]); });
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.INCOME_SOURCES_CREATED, assignedIncomeSources));
+                (_a = _this.cache).push.apply(_a, __spreadArray([], __read(assignedIncomeSources)));
+                _this.updateCache();
+                return assignedIncomeSources;
+            }));
+        };
+        /**
+         * Update batch of income sources
+         */
+        IncomeSourceService.prototype.updateBatch = function (incomeSources, queryParams) {
+            var _this = this;
+            if (queryParams === void 0) { queryParams = {}; }
+            return this.http.put(this.environment.apiV2 + "/" + this.url, incomeSources, queryParams)
+                .pipe(operators.map(function (updatedItems) {
+                var updatedInstances = updatedItems.map(function (item) { return _this.createModelInstance(_this.modelClass, item); });
+                updatedInstances.forEach(function (instance) {
+                    replace(_this.cache, instance);
+                });
+                if (incomeSources[0].forecasts.length) {
+                    _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.INCOME_SOURCES_UPDATED, incomeSources));
+                }
+                _this.updateCache();
+                return updatedInstances;
+            }));
+        };
+        /**
+         * Get income sources by provided types
+         * @param types
+         */
+        IncomeSourceService.prototype.getByTypes = function (types) {
+            return this.get()
+                .pipe(operators.map(function (incomeSources) { return incomeSources
+                .filter(function (incomeSource) { return types.includes(incomeSource.type); }); }));
+        };
+        /**
+         * Get other incomes types
+         */
+        IncomeSourceService.prototype.getIncomeSourceTypes = function () {
+            var _this = this;
+            if (!this.incomeSourceTypes) {
+                this.incomeSourceTypes = [];
+                this.http.get(this.environment.apiV2 + "/income-source-types")
+                    .pipe(operators.map(function (response) {
+                    return response.map(function (item) { return classTransformer.plainToClass(IncomeSourceType, item); });
+                }))
+                    .subscribe(function (otherIncomesTypes) {
+                    _this.incomeSourceTypes = otherIncomesTypes;
+                    _this.incomeSourceTypeSubject.next(_this.incomeSourceTypes);
+                });
+            }
+            return this.incomeSourceTypeSubject.asObservable();
+        };
+        return IncomeSourceService;
+    }(RestService));
+    IncomeSourceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    IncomeSourceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -8703,15 +9156,11 @@
      */
     var BankAccountService = /** @class */ (function (_super) {
         __extends(BankAccountService, _super);
-        function BankAccountService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function BankAccountService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             // api url parameter for bank accounts
             _this.url = 'bank-accounts';
             _this.modelClass = BankAccount;
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -8784,37 +9233,348 @@
             }));
         };
         /**
-         * Listen to EventDispatcherService events
+         * Listen to EventDispatcherService events
+         */
+        BankAccountService.prototype.listenToEventDispatcherChanges = function () {
+            var _this = this;
+            this.eventDispatcherService.on([
+                exports.AppEventTypeEnum.PROPERTY_SHARE_UPDATED,
+                exports.AppEventTypeEnum.LOAN_PAYOUT_UPDATED,
+                exports.AppEventTypeEnum.BANK_CONNECTION_ADDED
+            ]).subscribe(function () {
+                _this.fetch().subscribe(function (bankAccounts) {
+                    _this.cache = bankAccounts;
+                    _this.updateCache();
+                });
+            });
+        };
+        return BankAccountService;
+    }(RestService));
+    BankAccountService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankAccountService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
+    // @TODO Don't look at the commented code. Will be refactored/removed during TT-1503
+    /**
+     * Service for transaction allocations business logic
+     * @TODO alex refactor
+     */
+    var TransactionAllocationService = /** @class */ (function (_super) {
+        __extends(TransactionAllocationService, _super);
+        function TransactionAllocationService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            // API URL param for transaction allocations
+            _this.url = 'transactions-allocations';
+            _this.modelClass = TransactionAllocation;
+            return _this;
+        }
+        /**
+         * Add single transaction allocation
+         */
+        TransactionAllocationService.prototype.add = function (allocation) {
+            return this.addBatch([allocation]).pipe(operators.map(function (newAllocations) { return newAllocations[0]; }));
+        };
+        /**
+         * get list of transactions allocations related with passed bank transactions list
+         */
+        TransactionAllocationService.prototype.getByTransactions = function (transactions) {
+            var ids = transactions.map(function (transaction) { return transaction.id; });
+            return this.get()
+                .pipe(operators.map(function (transactionAllocations) {
+                return transactionAllocations.filter(function (allocation) { return ids.includes(allocation.transaction.id); });
+            }));
+        };
+        TransactionAllocationService.prototype.listenEvents = function () {
+            this.onTransactionsCreated();
+            this.onDepreciationCreated();
+            this.onTransactionDeleted();
+        };
+        /**
+         * Reset cache on transactions created
+         */
+        TransactionAllocationService.prototype.onTransactionsCreated = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.TRANSACTIONS_CREATED).subscribe(function () {
+                // Update allocations cache to synchronize data and fire subscriptions
+                _this.resetCache();
+            });
+        };
+        /**
+         * Reset cache on depreciation created
+         */
+        TransactionAllocationService.prototype.onDepreciationCreated = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.DEPRECIATIONS_CREATED).subscribe(function () {
+                // Update allocations cache to synchronize data and fire subscriptions
+                _this.resetCache();
+            });
+        };
+        /**
+         * Reset cache on transaction deleted
+         */
+        TransactionAllocationService.prototype.onTransactionDeleted = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.TRANSACTION_DELETED).subscribe(function () {
+                // Update allocations cache to synchronize data and fire subscriptions
+                _this.resetCache();
+            });
+        };
+        return TransactionAllocationService;
+    }(RestService));
+    TransactionAllocationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TransactionAllocationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
+    var MessagesEnum$1;
+    (function (MessagesEnum) {
+        MessagesEnum["VEHICLE_CREATED"] = "Vehicle created successfully";
+        MessagesEnum["VEHICLE_UPDATED"] = "Vehicle updated successfully";
+        MessagesEnum["VEHICLE_DELETED"] = "Vehicle deleted successfully";
+        MessagesEnum["VEHICLE_CLAIM_CREATED"] = "Vehicle claim created successfully";
+        MessagesEnum["VEHICLE_CLAIM_UPDATED"] = "Vehicle claim updated successfully";
+        MessagesEnum["VEHICLE_CLAIM_DELETED"] = "Vehicle claim deleted successfully";
+        MessagesEnum["VEHICLE_LOGBOOK_CREATED"] = "Vehicle logbook created successfully";
+        MessagesEnum["VEHICLE_LOGBOOK_UPDATED"] = "Vehicle logbook updated successfully";
+        MessagesEnum["VEHICLE_LOGBOOK_DELETED"] = "Vehicle logbook deleted successfully";
+    })(MessagesEnum$1 || (MessagesEnum$1 = {}));
+
+    var VehicleClaimService = /** @class */ (function (_super) {
+        __extends(VehicleClaimService, _super);
+        function VehicleClaimService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.modelClass = VehicleClaim;
+            _this.url = 'vehicle-claims';
+            _this.messageCreated = MessagesEnum$1.VEHICLE_CLAIM_CREATED;
+            _this.messageUpdated = MessagesEnum$1.VEHICLE_CLAIM_UPDATED;
+            _this.messageDeleted = MessagesEnum$1.VEHICLE_CLAIM_DELETED;
+            return _this;
+        }
+        return VehicleClaimService;
+    }(RestService));
+    VehicleClaimService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleClaimService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    VehicleClaimService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleClaimService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleClaimService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
+    /**
+     * Service handling user's account setup process.
+     * Checks required steps and their completion
+     */
+    var AccountSetupService = /** @class */ (function () {
+        function AccountSetupService(clientIncomeTypesService, propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService) {
+            this.clientIncomeTypesService = clientIncomeTypesService;
+            this.propertyService = propertyService;
+            this.incomeSourceService = incomeSourceService;
+            this.bankAccountsService = bankAccountsService;
+            this.transactionAllocationService = transactionAllocationService;
+            this.vehicleClaimService = vehicleClaimService;
+            this.cacheSubject = new rxjs.ReplaySubject(1);
+        }
+        /**
+         * Get list of account setup items for current user
+         */
+        AccountSetupService.prototype.get = function () {
+            var _this = this;
+            if (!this.cache) {
+                this.clientIncomeTypesService.get().subscribe(function (incomeTypes) {
+                    rxjs.combineLatest(_this.createBatch(incomeTypes)).subscribe(function (items) {
+                        _this.cache = new AccountSetupItemCollection(items);
+                        _this.cacheSubject.next(_this.cache);
+                    });
+                });
+            }
+            return this.cacheSubject.asObservable();
+        };
+        /**
+         * Get a single AccountSetupItem and check it's completion
+         */
+        AccountSetupService.prototype.create = function (itemType, request) {
+            return request.pipe(operators.map(function (result) {
+                var item = ACCOUNT_SETUP_ITEMS[itemType];
+                if (result.length) {
+                    item.isCompleted = true;
+                }
+                return item;
+            }));
+        };
+        /**
+         * Get batch of requests to get list of required AccountSetupItem's.
+         * Some items are optional and depends of user's client income types
+         */
+        AccountSetupService.prototype.createBatch = function (incomeTypes) {
+            var batch = [];
+            // Salary item is completed when user added salary income source
+            if (incomeTypes.salary) {
+                batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSourcesByType(exports.IncomeSourceTypeEnum.SALARY)));
+            }
+            // Other income item is completed when user added at least one other income source
+            if (incomeTypes.dividends || incomeTypes.other) {
+                batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSourcesByType(exports.IncomeSourceTypeEnum.OTHER)));
+            }
+            // Rental income item is completed when user added at least one property
+            if (incomeTypes.rental) {
+                batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.get()));
+            }
+            // Bank feeds item is completed when user added at least one bank account (basiq or manual)
+            batch.push(this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.get()));
+            // Logbook item is completed when user has at least one vehicle claim with any method (klms or logbook)
+            batch.push(this.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get()));
+            // @TODO waiting for sole tank forecast page
+            // Sole item is completed when user added at least one sole income source
+            // if (incomeTypes.soleTrader) {
+            //   batch.push(
+            //     this.prepareItem(
+            //       AccountSetupItemsEnum.SOLE_INCOME,
+            //       this.getIncomeSourcesByType(IncomeSourceTypeEnum.SOLE)
+            //     )
+            //   );
+            // }
+            // Allocation item is completed when user added at least one transaction allocation
+            batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));
+            return batch;
+        };
+        /**
+         * @TODO work with collection when services refactored
+         */
+        AccountSetupService.prototype.getIncomeSourcesByType = function (type) {
+            return this.incomeSourceService.get().pipe(operators.map(function (incomeSources) {
+                return new IncomeSourceCollection(incomeSources).getBy('type', type).toArray();
+            }));
+        };
+        return AccountSetupService;
+    }());
+    AccountSetupService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    AccountSetupService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AccountSetupService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AccountSetupService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], ctorParameters: function () { return [{ type: ClientIncomeTypesService }, { type: PropertyService }, { type: IncomeSourceService }, { type: BankAccountService }, { type: TransactionAllocationService }, { type: VehicleClaimService }]; } });
+
+    var AddressService = /** @class */ (function () {
+        function AddressService(http, environment) {
+            this.http = http;
+            this.environment = environment;
+            this.countriesSubject = new rxjs.ReplaySubject(1);
+        }
+        AddressService.prototype.getCountries = function () {
+            var _this = this;
+            if (!this._countries) {
+                this.http.get(this.environment.apiV2 + "/countries")
+                    .pipe(operators.map(function (response) {
+                    return response['hydra:member'].map(function (item) { return classTransformer.plainToClass(Country, item); });
+                }))
+                    .subscribe(function (countries) {
+                    _this._countries = countries;
+                    _this.countriesSubject.next(countries);
+                });
+            }
+            return this.countriesSubject.asObservable();
+        };
+        return AddressService;
+    }());
+    AddressService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AddressService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    AddressService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AddressService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AddressService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], ctorParameters: function () {
+            return [{ type: i1__namespace.HttpClient }, { type: undefined, decorators: [{
+                            type: i0.Inject,
+                            args: ['environment']
+                        }] }];
+        } });
+
+    /**
+     * Service to work with assets (documents, receipts, e.t.c.)
+     */
+    var AssetsService = /** @class */ (function () {
+        function AssetsService(http, userSwitcherService, environment) {
+            this.http = http;
+            this.userSwitcherService = userSwitcherService;
+            this.environment = environment;
+            this.impersonatedClient = this.userSwitcherService.get();
+        }
+        /**
+         * Get asset link
+         * @param asset to get the link for
+         */
+        AssetsService.prototype.getLink = function (asset) {
+            return this.http.get(this.environment.apiV2 + "/assets/" + asset.type + "/" + asset.id);
+        };
+        /**
+         * Download asset
+         * @param asset which should be downloaded
+         * @TODO refactor
+         */
+        AssetsService.prototype.download = function (asset) {
+            return this.environment.apiV2 + "/assets/" + asset.type + "/" + asset.id + "/download?bearer=" + localStorage.getItem('token') + (this.impersonatedClient ? "&_switch_user=" + this.impersonatedClient : '');
+        };
+        // @Todo refactor to event dispatcher
+        /**
+         * Delete asset
+         * @param entityId: id of asset main entity (property, folder, transaction, e.t.c.)
+         * @param asset which should be deleted
          */
-        BankAccountService.prototype.listenToEventDispatcherChanges = function () {
-            var _this = this;
-            this.eventDispatcherService.on([
-                exports.AppEventTypeEnum.PROPERTY_SHARE_UPDATED,
-                exports.AppEventTypeEnum.LOAN_PAYOUT_UPDATED,
-                exports.AppEventTypeEnum.BANK_CONNECTION_ADDED
-            ]).subscribe(function () {
-                _this.fetch().subscribe(function (bankAccounts) {
-                    _this.cache = bankAccounts;
-                    _this.updateCache();
-                });
-            });
+        AssetsService.prototype.delete = function (entityId, asset) {
+            return this.http.delete(this.environment.apiV2 + "/" + asset.entityType + "/" + entityId + "/" + asset.type + "/" + asset.id);
         };
-        return BankAccountService;
-    }(RestService));
-    BankAccountService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankAccountService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountService, decorators: [{
+        return AssetsService;
+    }());
+    AssetsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AssetsService, deps: [{ token: i1__namespace.HttpClient }, { token: UserSwitcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    AssetsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AssetsService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AssetsService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
             }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+            return [{ type: i1__namespace.HttpClient }, { type: UserSwitcherService }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
                         }] }];
         } });
 
+    /**
+     * Service that handling banks logic
+     */
+    var BankService = /** @class */ (function (_super) {
+        __extends(BankService, _super);
+        function BankService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.modelClass = Bank;
+            _this.url = 'banks';
+            _this.isHydra = true;
+            return _this;
+        }
+        return BankService;
+    }(RestService));
+    BankService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
     /**
      * @TODO move to collection
      */
@@ -8916,14 +9676,10 @@
      */
     var BankConnectionService = /** @class */ (function (_super) {
         __extends(BankConnectionService, _super);
-        function BankConnectionService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function BankConnectionService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.modelClass = BankConnection;
             _this.url = 'bank-connections';
-            _this.listenEvents();
             return _this;
         }
         BankConnectionService.prototype.listenEvents = function () {
@@ -8945,34 +9701,25 @@
         };
         return BankConnectionService;
     }(RestService));
-    BankConnectionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankConnectionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankConnectionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankConnectionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     BankConnectionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankConnectionService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankConnectionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     /**
      * Service for bank transactions business logic
      */
     var BankTransactionService = /** @class */ (function (_super) {
         __extends(BankTransactionService, _super);
-        function BankTransactionService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function BankTransactionService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             // url part for BankTransaction API
             _this.url = 'bank-transactions';
             _this.modelClass = BankTransaction;
-            _this.listenEvents();
             return _this;
         }
         BankTransactionService.prototype.listenEvents = function () {
@@ -9031,19 +9778,14 @@
         };
         return BankTransactionService;
     }(RestService));
-    BankTransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankTransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     BankTransactionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     /**
      * basiq is a middleman between bank and user
@@ -9051,15 +9793,11 @@
      */
     var BasiqService = /** @class */ (function (_super) {
         __extends(BasiqService, _super);
-        function BasiqService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function BasiqService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.tokenSubject = new rxjs.ReplaySubject();
             _this.url = 'basiq/accounts';
             _this.modelClass = BankAccount;
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -9122,19 +9860,14 @@
         };
         return BasiqService;
     }(RestService));
-    BasiqService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasiqService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     BasiqService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     var BorrowingExpenseService = /** @class */ (function () {
         function BorrowingExpenseService(http, environment) {
@@ -9374,24 +10107,19 @@
      */
     var ChatService = /** @class */ (function (_super) {
         __extends(ChatService, _super);
-        function ChatService(http, eventDispatcherService, environment, sseService) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
+        function ChatService(http, eventDispatcherService, environment, toastService, sseService) {
+            var _this = _super.call(this, http, eventDispatcherService, environment, toastService) || this;
             _this.http = http;
             _this.eventDispatcherService = eventDispatcherService;
             _this.environment = environment;
+            _this.toastService = toastService;
             _this.sseService = sseService;
             _this.modelClass = Chat;
             _this.url = 'chats';
             _this.isHydra = true;
-            _this.listenEvents();
+            _this.listenChats();
             return _this;
         }
-        /**
-         * SSE and Event Dispatcher Services listeners
-         */
-        ChatService.prototype.listenEvents = function () {
-            this.listenChats();
-        };
         /**
          * Listen chats events
          */
@@ -9428,7 +10156,7 @@
         };
         return ChatService;
     }(RestService));
-    ChatService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChatService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ChatService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChatService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     ChatService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChatService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChatService, decorators: [{
                 type: i0.Injectable,
@@ -9439,7 +10167,7 @@
             return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
-                        }] }, { type: SseService }];
+                        }] }, { type: ToastService }, { type: SseService }];
         } });
 
     /**
@@ -9447,24 +10175,19 @@
      */
     var MessageService = /** @class */ (function (_super) {
         __extends(MessageService, _super);
-        function MessageService(http, eventDispatcherService, environment, sseService) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
+        function MessageService(http, eventDispatcherService, environment, toastService, sseService) {
+            var _this = _super.call(this, http, eventDispatcherService, environment, toastService) || this;
             _this.http = http;
             _this.eventDispatcherService = eventDispatcherService;
             _this.environment = environment;
+            _this.toastService = toastService;
             _this.sseService = sseService;
             _this.modelClass = Message;
             _this.url = 'messages';
             _this.isHydra = true;
-            _this.listenEvents();
+            _this.listenMessages();
             return _this;
         }
-        /**
-         * SSE and Event Dispatcher Services listeners
-         */
-        MessageService.prototype.listenEvents = function () {
-            this.listenMessages();
-        };
         /**
          * subscribe to new chat messages
          */
@@ -9487,7 +10210,7 @@
         };
         return MessageService;
     }(RestService));
-    MessageService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    MessageService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     MessageService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageService, decorators: [{
                 type: i0.Injectable,
@@ -9498,7 +10221,7 @@
             return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
-                        }] }, { type: SseService }];
+                        }] }, { type: ToastService }, { type: SseService }];
         } });
 
     // @TODO improve base rest service and extend it
@@ -9718,15 +10441,11 @@
 
     var ClientMovementService = /** @class */ (function (_super) {
         __extends(ClientMovementService, _super);
-        function ClientMovementService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function ClientMovementService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.modelClass = ClientMovement;
             _this.url = 'client-movements';
             _this.isHydra = true;
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -9797,19 +10516,14 @@
         };
         return ClientMovementService;
     }(RestService));
-    ClientMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientMovementService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ClientMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientMovementService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     ClientMovementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientMovementService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientMovementService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     // @Todo refactor with BaseRest service
     /**
@@ -9907,14 +10621,10 @@
 
     var DepreciationService = /** @class */ (function (_super) {
         __extends(DepreciationService, _super);
-        function DepreciationService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function DepreciationService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.modelClass = Depreciation;
             _this.url = 'depreciations';
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -9948,14 +10658,6 @@
             this.listenToVehicleClaim();
             this.listenToUpdatedBankAccount();
         };
-        /**
-         * Get depreciations related to Vehicle category
-         */
-        DepreciationService.prototype.getVehicleDepreciations = function () {
-            return this.get().pipe(operators.map(function (depreciations) {
-                return depreciations.filter(function (depreciation) { return depreciation.isVehicleDepreciation(); });
-            }));
-        };
         DepreciationService.prototype.getOpenBalance = function (depreciation) {
             return this.http.post(this.environment.apiV2 + "/" + this.url + "/opening-balance?financialYear=" + new FinancialYear().year, depreciation)
                 .pipe(operators.map(function (response) {
@@ -10037,30 +10739,22 @@
         };
         return DepreciationService;
     }(RestService));
-    DepreciationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    DepreciationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     DepreciationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     /**
      * Service to handle document-folders and depending documents logic
      */
     var DocumentFolderService = /** @class */ (function (_super) {
         __extends(DocumentFolderService, _super);
-        function DocumentFolderService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function DocumentFolderService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.url = 'folders';
             _this.modelClass = DocumentFolder;
             return _this;
@@ -10119,19 +10813,14 @@
         };
         return DocumentFolderService;
     }(RestService));
-    DocumentFolderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentFolderService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    DocumentFolderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentFolderService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     DocumentFolderService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentFolderService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DocumentFolderService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     var EmployeeService = /** @class */ (function (_super) {
         __extends(EmployeeService, _super);
@@ -10266,178 +10955,69 @@
             }));
         };
         FirmService.prototype.getByType = function (type) {
-            return this.getAll().pipe(operators.map(function (firms) {
-                return firms.filter(function (firm) { return firm.type === type; });
-            }));
-        };
-        FirmService.prototype.updatePhoto = function (firm, photo) {
-            var _this = this;
-            return this.http.post(this.environment.apiV2 + "/firms/photo?_method=PUT", photo)
-                .pipe(operators.map(function (firmPhoto) {
-                _this.firm = classTransformer.plainToClass(Firm, Object.assign(firm, { photo: firmPhoto }));
-                _this.firmSubject.next(_this.firm);
-                return firm;
-            }));
-        };
-        return FirmService;
-    }());
-    FirmService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FirmService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    FirmService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FirmService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FirmService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
-
-    var HeaderTitleService = /** @class */ (function () {
-        function HeaderTitleService(router, activatedRoute) {
-            this.router = router;
-            this.activatedRoute = activatedRoute;
-        }
-        HeaderTitleService.prototype.handleTitle = function () {
-            var _this = this;
-            return this.router.events.pipe(operators.filter(function (event) { return event instanceof i1$1.NavigationEnd; }), operators.map(function () { return _this.activatedRoute; }), operators.map(function (route) {
-                while (route.firstChild) {
-                    route = route.firstChild;
-                }
-                return route;
-            }), operators.filter(function (route) { return route.outlet === 'primary'; }), operators.mergeMap(function (route) { return route.data; }));
-        };
-        return HeaderTitleService;
-    }());
-    HeaderTitleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, deps: [{ token: i1__namespace$1.Router }, { token: i1__namespace$1.ActivatedRoute }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    HeaderTitleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }], ctorParameters: function () { return [{ type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }]; } });
-
-    /**
-     * Service to work with income sources
-     */
-    var IncomeSourceService = /** @class */ (function (_super) {
-        __extends(IncomeSourceService, _super);
-        function IncomeSourceService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
-            _this.url = 'income-sources';
-            _this.modelClass = IncomeSource;
-            _this.incomeSourceTypeSubject = new rxjs.ReplaySubject(1);
-            return _this;
-        }
-        /**
-         * Get income sources tax calculation
-         * @param salaryForecast for which tax should be calculated
-         */
-        IncomeSourceService.prototype.getTaxCalculation = function (salaryForecast) {
-            return this.http.post(this.environment.apiV2 + "/" + this.url + "/tax-calculation", salaryForecast)
-                .pipe(operators.map(function (response) {
-                return classTransformer.plainToClass(SalaryForecast, response);
-            }));
-        };
-        /**
-         * Add batch of income sources
-         * @param incomeSources to add
-         */
-        IncomeSourceService.prototype.addBatch = function (incomeSources) {
-            var _this = this;
-            return this.http.post(this.environment.apiV2 + "/" + this.url, incomeSources)
-                .pipe(operators.map(function (addedIncomeSources) {
-                var _a;
-                // assign respond income sources to provided income sources
-                var assignedIncomeSources = addedIncomeSources
-                    .map(function (incomeSource, index) { return Object.assign(classTransformer.plainToClass(IncomeSource, {}), incomeSource, incomeSources[index]); });
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.INCOME_SOURCES_CREATED, assignedIncomeSources));
-                (_a = _this.cache).push.apply(_a, __spreadArray([], __read(assignedIncomeSources)));
-                _this.updateCache();
-                return assignedIncomeSources;
-            }));
-        };
-        /**
-         * Update batch of income sources
-         */
-        IncomeSourceService.prototype.updateBatch = function (incomeSources, queryParams) {
-            var _this = this;
-            if (queryParams === void 0) { queryParams = {}; }
-            return this.http.put(this.environment.apiV2 + "/" + this.url, incomeSources, queryParams)
-                .pipe(operators.map(function (updatedItems) {
-                var updatedInstances = updatedItems.map(function (item) { return _this.createModelInstance(_this.modelClass, item); });
-                updatedInstances.forEach(function (instance) {
-                    replace(_this.cache, instance);
-                });
-                if (incomeSources[0].forecasts.length) {
-                    _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.INCOME_SOURCES_UPDATED, incomeSources));
-                }
-                _this.updateCache();
-                return updatedInstances;
-            }));
-        };
-        /**
-         * Get income sources by provided types
-         * @param types
-         */
-        IncomeSourceService.prototype.getByTypes = function (types) {
-            return this.get()
-                .pipe(operators.map(function (incomeSources) { return incomeSources
-                .filter(function (incomeSource) { return types.includes(incomeSource.type); }); }));
+            return this.getAll().pipe(operators.map(function (firms) {
+                return firms.filter(function (firm) { return firm.type === type; });
+            }));
         };
-        /**
-         * Get other incomes types
-         */
-        IncomeSourceService.prototype.getIncomeSourceTypes = function () {
+        FirmService.prototype.updatePhoto = function (firm, photo) {
             var _this = this;
-            if (!this.incomeSourceTypes) {
-                this.incomeSourceTypes = [];
-                this.http.get(this.environment.apiV2 + "/income-source-types")
-                    .pipe(operators.map(function (response) {
-                    return response.map(function (item) { return classTransformer.plainToClass(IncomeSourceType, item); });
-                }))
-                    .subscribe(function (otherIncomesTypes) {
-                    _this.incomeSourceTypes = otherIncomesTypes;
-                    _this.incomeSourceTypeSubject.next(_this.incomeSourceTypes);
-                });
-            }
-            return this.incomeSourceTypeSubject.asObservable();
+            return this.http.post(this.environment.apiV2 + "/firms/photo?_method=PUT", photo)
+                .pipe(operators.map(function (firmPhoto) {
+                _this.firm = classTransformer.plainToClass(Firm, Object.assign(firm, { photo: firmPhoto }));
+                _this.firmSubject.next(_this.firm);
+                return firm;
+            }));
         };
-        return IncomeSourceService;
-    }(RestService));
-    IncomeSourceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    IncomeSourceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceService, decorators: [{
+        return FirmService;
+    }());
+    FirmService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FirmService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    FirmService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FirmService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FirmService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
             }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+            return [{ type: i1__namespace.HttpClient }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
                         }] }];
         } });
 
+    var HeaderTitleService = /** @class */ (function () {
+        function HeaderTitleService(router, activatedRoute) {
+            this.router = router;
+            this.activatedRoute = activatedRoute;
+        }
+        HeaderTitleService.prototype.handleTitle = function () {
+            var _this = this;
+            return this.router.events.pipe(operators.filter(function (event) { return event instanceof i1$1.NavigationEnd; }), operators.map(function () { return _this.activatedRoute; }), operators.map(function (route) {
+                while (route.firstChild) {
+                    route = route.firstChild;
+                }
+                return route;
+            }), operators.filter(function (route) { return route.outlet === 'primary'; }), operators.mergeMap(function (route) { return route.data; }));
+        };
+        return HeaderTitleService;
+    }());
+    HeaderTitleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, deps: [{ token: i1__namespace$1.Router }, { token: i1__namespace$1.ActivatedRoute }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    HeaderTitleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], ctorParameters: function () { return [{ type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }]; } });
+
     /**
      * Service to work with Other Income Forecasts
      */
     var IncomeSourceForecastService = /** @class */ (function (_super) {
         __extends(IncomeSourceForecastService, _super);
-        function IncomeSourceForecastService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function IncomeSourceForecastService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.modelClass = IncomeSourceForecast;
             _this.url = 'income-source-forecasts';
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -10497,33 +11077,24 @@
         };
         return IncomeSourceForecastService;
     }(RestService));
-    IncomeSourceForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceForecastService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    IncomeSourceForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     IncomeSourceForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceForecastService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IncomeSourceForecastService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     /**
      * Service to work with Salary Forecasts
      */
     var SalaryForecastService = /** @class */ (function (_super) {
         __extends(SalaryForecastService, _super);
-        function SalaryForecastService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function SalaryForecastService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.modelClass = SalaryForecast;
             _this.url = 'salary-forecasts';
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -10583,30 +11154,21 @@
         };
         return SalaryForecastService;
     }(RestService));
-    SalaryForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SalaryForecastService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SalaryForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SalaryForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     SalaryForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SalaryForecastService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SalaryForecastService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     var SoleForecastService = /** @class */ (function (_super) {
         __extends(SoleForecastService, _super);
-        function SoleForecastService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function SoleForecastService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.modelClass = SoleForecast;
             _this.url = 'sole-forecasts';
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -10666,19 +11228,14 @@
         };
         return SoleForecastService;
     }(RestService));
-    SoleForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleForecastService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SoleForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     SoleForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleForecastService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleForecastService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     /**
      * Service to work with intercom
@@ -10755,14 +11312,10 @@
      */
     var LoanService = /** @class */ (function (_super) {
         __extends(LoanService, _super);
-        function LoanService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function LoanService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.url = 'bank-accounts/loans';
             _this.modelClass = Loan;
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -10880,43 +11433,33 @@
         };
         return LoanService;
     }(RestService));
-    LoanService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LoanService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    LoanService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LoanService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     LoanService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LoanService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: LoanService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     /**
      * Service to handle service notifications logic
      */
     var ServiceNotificationService = /** @class */ (function (_super) {
         __extends(ServiceNotificationService, _super);
-        function ServiceNotificationService(http, eventDispatcherService, environment, sseService) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
+        function ServiceNotificationService(http, eventDispatcherService, environment, toastService, sseService) {
+            var _this = _super.call(this, http, eventDispatcherService, environment, toastService) || this;
             _this.http = http;
             _this.eventDispatcherService = eventDispatcherService;
             _this.environment = environment;
+            _this.toastService = toastService;
             _this.sseService = sseService;
             _this.modelClass = Notification;
             _this.url = 'service-notifications';
             _this.isHydra = true;
-            _this.listenEvents();
+            _this.listenNotifications();
             return _this;
         }
-        /**
-         * SSE and Event Dispatcher Services listeners
-         */
-        ServiceNotificationService.prototype.listenEvents = function () {
-            this.listenNotifications();
-        };
         /**
          * subscribe to new chat messages
          */
@@ -10939,7 +11482,7 @@
         };
         return ServiceNotificationService;
     }(RestService));
-    ServiceNotificationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServiceNotificationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ServiceNotificationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServiceNotificationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: SseService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     ServiceNotificationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServiceNotificationService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServiceNotificationService, decorators: [{
                 type: i0.Injectable,
@@ -10950,7 +11493,7 @@
             return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
-                        }] }, { type: SseService }];
+                        }] }, { type: ToastService }, { type: SseService }];
         } });
 
     /**
@@ -10972,7 +11515,7 @@
             src: '/assets/img/icons/logo.png',
             width: 30,
             height: 7,
-            positionX: 168,
+            positionX: 42,
             positionY: 6
         },
         // coords for file section title (group, table, e.t.c.)
@@ -11003,45 +11546,73 @@
         function PdfService() {
         }
         /**
-         * Export file form provided HTML tables
+         * Export file from provided HTML tables
+         */
+        PdfService.prototype.exportTables = function (tables, title, fileName, orientation) {
+            var document = this.generateFromTables(orientation, tables, title);
+            document.save(fileName + ".pdf");
+        };
+        /**
+         * Export file from provided array-like table data
          */
-        PdfService.prototype.exportTables = function (tables, title, fileName) {
-            var document = this.generateFromTables(tables, title);
+        PdfService.prototype.exportFromDataTables = function (dataTables, title, fileName) {
+            var document = this.generateFromDataTables(title, dataTables);
             document.save(fileName + ".pdf");
         };
-        PdfService.prototype.generateFromTables = function (tables, title) {
+        /**
+         * Generate file from array-like table data
+         */
+        PdfService.prototype.generateFromDataTables = function (title, dataTables) {
+            var _this = this;
             var pdf = new jsPDF__default["default"]();
             this.setDocumentTitle(pdf, title);
             this.setDocumentLogo(pdf);
+            dataTables.forEach(function (dataTable) {
+                autoTable__default["default"](pdf, Object.assign({ head: [dataTable.header], body: dataTable.rows, foot: [dataTable.footer] }, _this.setTableOptions(pdf, dataTable.caption)));
+            });
+            return pdf;
+        };
+        PdfService.prototype.generateFromTables = function (orientation, tables, title) {
+            var _this = this;
+            var pdf = new jsPDF__default["default"](orientation);
+            this.setDocumentTitle(pdf, title);
+            this.setDocumentLogo(pdf);
             tables.forEach(function (table) {
-                var _a;
                 // Add table caption if not provided
                 if (!table.caption) {
                     table.createCaption();
                     table.caption.innerText = '';
                 }
-                // coords of last table
-                var lastTableCoords = pdf['lastAutoTable'].finalY || PDF_CONFIG.contentCoords.marginTop;
-                pdf.text(table.caption.innerText, PDF_CONFIG.contentCoords.marginLeft, lastTableCoords + PDF_CONFIG.contentCoords.marginTop);
-                // get caption height based on caption content height
-                var captionHeight = pdf.getTextDimensions(pdf.splitTextToSize((_a = table.caption) === null || _a === void 0 ? void 0 : _a.innerText, pdf.internal.pageSize.width)).h;
-                // table options
-                var options = {
-                    html: table,
-                    startY: lastTableCoords + captionHeight + PDF_CONFIG.contentTitleCoords.marginTop,
-                    headStyles: PDF_CONFIG.table.headStyles,
-                    footStyles: PDF_CONFIG.table.footStyles,
-                    didParseCell: function (data) {
-                        // Align last column content to right
-                        if (data.table.columns.length > 1 && (data.column.index === data.table.columns.length - 1)) {
-                            data.cell.styles.halign = 'right';
-                        }
-                    }
-                };
-                autoTable__default["default"](pdf, options);
+                autoTable__default["default"](pdf, Object.assign({ html: table }, _this.setTableOptions(pdf, table.caption.innerText)));
             });
             return pdf;
         };
+        /**
+         * Set basic options for PDF table
+         */
+        PdfService.prototype.setTableOptions = function (pdf, tableCaption) {
+            if (tableCaption === void 0) { tableCaption = ''; }
+            var lastTableCoords = pdf['lastAutoTable'].finalY || PDF_CONFIG.contentCoords.marginTop;
+            // get caption height based on caption content height
+            var captionHeight = pdf.getTextDimensions(pdf.splitTextToSize(tableCaption, pdf.internal.pageSize.width)).h;
+            pdf.text(tableCaption, PDF_CONFIG.contentCoords.marginLeft, lastTableCoords + PDF_CONFIG.contentCoords.marginTop);
+            return {
+                headStyles: {
+                    fillColor: PDF_CONFIG.text.colorPrimary,
+                },
+                footStyles: {
+                    fillColor: PDF_CONFIG.text.colorWhite,
+                    textColor: PDF_CONFIG.text.colorBlack
+                },
+                startY: lastTableCoords + captionHeight + PDF_CONFIG.contentTitleCoords.marginTop,
+                didParseCell: function (data) {
+                    // Align last column content to right
+                    if (data.table.columns.length > 1 && (data.column.index === data.table.columns.length - 1)) {
+                        data.cell.styles.halign = 'right';
+                    }
+                }
+            };
+        };
         PdfService.prototype.setDocumentTitle = function (doc, title) {
             doc.setFontSize(PDF_CONFIG.text.fontSize)
                 .setFont(PDF_CONFIG.text.fontName, PDF_CONFIG.text.fontStyle, PDF_CONFIG.text.fontWeight)
@@ -11050,7 +11621,7 @@
         PdfService.prototype.setDocumentLogo = function (doc) {
             var logo = new Image();
             logo.src = PDF_CONFIG.logo.src;
-            doc.addImage(logo, 'PNG', PDF_CONFIG.logo.positionX, PDF_CONFIG.logo.positionY, PDF_CONFIG.logo.width, PDF_CONFIG.logo.height);
+            doc.addImage(logo, 'PNG', doc.internal.pageSize.width - PDF_CONFIG.logo.positionX, PDF_CONFIG.logo.positionY, PDF_CONFIG.logo.width, PDF_CONFIG.logo.height);
         };
         return PdfService;
     }());
@@ -11061,133 +11632,7 @@
                 args: [{
                         providedIn: 'root'
                     }]
-            }] });
-
-    /**
-     * Service for work with Property
-     */
-    var PropertyService = /** @class */ (function (_super) {
-        __extends(PropertyService, _super);
-        function PropertyService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
-            _this.modelClass = Property;
-            _this.url = 'properties';
-            _this.listenEvents();
-            return _this;
-        }
-        PropertyService.prototype.listenEvents = function () {
-            this.listenShareInviteAccepted();
-            this.listenServiceSubscriptionUpdated();
-            // @TODO Alex: consider to refactor property movements logic similar to client-movements
-            this.listenMovementsChanged();
-        };
-        /**
-         * Update cache when share invitation accepted
-         */
-        PropertyService.prototype.listenShareInviteAccepted = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_SHARE_UPDATED).subscribe(function () { return _this.resetCache(); });
-        };
-        /**
-         * Update cache when user's service subscription is updated
-         */
-        PropertyService.prototype.listenServiceSubscriptionUpdated = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.SERVICE_SUBSCRIPTION_UPDATED).subscribe(function () { return _this.resetCache(); });
-        };
-        /**
-         * Update cache when property category changed
-         */
-        PropertyService.prototype.listenMovementsChanged = function () {
-            var _this = this;
-            // @TODO change dispatcher logic to work with multiple events
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_MOVEMENT_CREATED).subscribe(function () { return _this.resetCache(); });
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_MOVEMENT_UPDATED).subscribe(function () { return _this.resetCache(); });
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.PROPERTY_MOVEMENT_DELETED).subscribe(function () { return _this.resetCache(); });
-        };
-        PropertyService.prototype.update = function (property) {
-            var _this = this;
-            return _super.prototype.update.call(this, property).pipe(operators.map(function (updatedProperty) {
-                if (property.documentFile) {
-                    _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.PROPERTY_UPDATED_WITH_DOCUMENT, property));
-                }
-                return updatedProperty;
-            }));
-        };
-        PropertyService.prototype.getByCategoryId = function (id) {
-            return this.get().pipe(operators.map(function (properties) {
-                return properties.filter(function (property) { return property.category.id === id; });
-            }));
-        };
-        /**
-         * Activate deactivated property
-         */
-        PropertyService.prototype.activate = function (property) {
-            var _this = this;
-            return this.http.post(this.environment.apiV2 + "/property-subscriptions", { user: property.user, property: property })
-                .pipe(operators.map(function (propertySubscriptionBase) {
-                var newPropertySubscription = classTransformer.plainToClass(PropertySubscription, propertySubscriptionBase);
-                var activatedProperty = classTransformer.plainToClass(Property, Object.assign({}, property, { subscriptions: [newPropertySubscription] }));
-                replace(_this.cache, activatedProperty);
-                _this.updateCache();
-            }));
-        };
-        /**
-         * Deactivate activated property
-         */
-        PropertyService.prototype.deactivate = function (property) {
-            var _this = this;
-            return this.http.delete(this.environment.apiV2 + "/property-subscriptions/" + property.getCurrentSubscription().id)
-                .pipe(operators.map(function () {
-                var deactivatedProperty = classTransformer.plainToClass(Property, Object.assign({}, property, { subscriptions: [] }));
-                replace(_this.cache, deactivatedProperty);
-                _this.updateCache();
-            }));
-        };
-        /**
-         * Update property photo
-         * @param property Property instance for photo update
-         * @param photoFormData FormData with property photo image
-         */
-        PropertyService.prototype.updatePhoto = function (property, photoFormData) {
-            var _this = this;
-            return this.http.post(this.environment.apiV2 + "/properties/" + property.id + "/photo?_method=PUT", photoFormData)
-                .pipe(operators.map(function (photoLink) {
-                property.photo = photoLink;
-                // update properties cache
-                replace(_this.cache, property);
-                _this.updateCache();
-            }));
-        };
-        PropertyService.prototype.getByShareId = function (id) {
-            return this.get().pipe(operators.map(function (properties) {
-                return properties.filter(function (property) { return property.user.id === id; });
-            }));
-        };
-        /**
-         * Get list of active user's properties
-         */
-        PropertyService.prototype.getActive = function () {
-            return this.get().pipe(operators.map(function (properties) { return properties.filter(function (property) { return property.isActive; }); }));
-        };
-        return PropertyService;
-    }(RestService));
-    PropertyService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     function enumToList(data) {
         var list = [];
@@ -11209,74 +11654,17 @@
         MessagesEnum["CREATED_MESSAGE"] = "Transaction(s) created";
     })(MessagesEnum || (MessagesEnum = {}));
 
-    /**
-     * popup notifications service (toast, snackbar).
-     */
-    var ToastService = /** @class */ (function () {
-        function ToastService() {
-            this.toast$ = new rxjs.ReplaySubject(1);
-        }
-        ToastService.prototype.get = function () {
-            return this.toast$.asObservable();
-        };
-        ToastService.prototype.add = function (toast) {
-            this.toast$.next(toast);
-        };
-        ToastService.prototype.success = function (message) {
-            this.add(classTransformer.plainToClass(Toast, {
-                type: exports.ToastTypeEnum.SUCCESS,
-                title: 'Success!',
-                message: message,
-            }));
-        };
-        ToastService.prototype.warning = function (message) {
-            this.add(classTransformer.plainToClass(Toast, {
-                type: exports.ToastTypeEnum.WARNING,
-                title: 'Warning!',
-                message: message,
-            }));
-        };
-        ToastService.prototype.error = function (message) {
-            this.add(classTransformer.plainToClass(Toast, {
-                type: exports.ToastTypeEnum.ERROR,
-                title: 'Error!',
-                message: message,
-            }));
-        };
-        ToastService.prototype.info = function (message) {
-            this.add(classTransformer.plainToClass(Toast, {
-                type: exports.ToastTypeEnum.INFO,
-                title: 'Information',
-                message: message,
-            }));
-        };
-        return ToastService;
-    }());
-    ToastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ToastService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ToastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ToastService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ToastService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }] });
-
     /**
      * Service for transactions business logic
      */
     var TransactionService = /** @class */ (function (_super) {
         __extends(TransactionService, _super);
-        function TransactionService(http, eventDispatcherService, environment, toastService) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
-            _this.toastService = toastService;
+        function TransactionService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             // url part for Transaction API
             _this.url = 'transactions';
             _this.modelClass = Transaction;
             _this.transactionDeleted = new i0.EventEmitter();
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -11347,6 +11735,15 @@
                 return transactions.filter(function (transaction) { return transaction.isWorkTank(); });
             }));
         };
+        /**
+         * Get list of property holding costs (transactions related to vacant land property)
+         */
+        TransactionService.prototype.getPropertyHoldingCosts = function (propertyId) {
+            return this.http.get(this.environment.apiV2 + "/" + this.url + "?propertyId=" + propertyId + "&propertyCategoryId=" + exports.PropertyCategoryListEnum.VACANT_LAND)
+                .pipe(operators.map(function (transactionsBase) {
+                return transactionsBase.map(function (transactionBase) { return classTransformer.plainToClass(Transaction, transactionBase); });
+            }));
+        };
         /**
          * get list of taxable transactions with tank type 'Work'
          */
@@ -11543,14 +11940,6 @@
                     return null;
             }
         };
-        /**
-         * Get transactions related to Vehicle category
-         */
-        TransactionService.prototype.getVehicleTransactions = function () {
-            return this.get().pipe(operators.map(function (transactions) {
-                return transactions.filter(function (transaction) { return transaction.isVehicleTransaction(); });
-            }));
-        };
         /**
          * Listen to EventDispatcherService event related to Depreciation changing
          */
@@ -11573,19 +11962,14 @@
         };
         return TransactionService;
     }(RestService));
-    TransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     TransactionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }, { type: ToastService }];
-        } });
+            }] });
 
     /**
      * Service to handle Property transactions report items data (get income / expense report items, e.t.c.)
@@ -11776,6 +12160,54 @@
                     }]
             }] });
 
+    /**
+     * Service to work with holding costs (transactions related to vacant land property)
+     */
+    var PropertyHoldingCostsService = /** @class */ (function () {
+        function PropertyHoldingCostsService(pdfService, currencyPipe, datePipe) {
+            this.pdfService = pdfService;
+            this.currencyPipe = currencyPipe;
+            this.datePipe = datePipe;
+            this.url = 'transactions';
+            this.modelClass = Transaction;
+        }
+        PropertyHoldingCostsService.prototype.initDataTable = function (holdingCosts) {
+            return classTransformer.plainToClass(ExportDataTable, {
+                header: ['Date', 'Description', 'Debit', 'Credit'],
+                rows: this.getDataTableRows(holdingCosts),
+                footer: [
+                    'Total',
+                    '',
+                    this.currencyPipe.transform(holdingCosts.sumBy('debit')).toString(),
+                    this.currencyPipe.transform(holdingCosts.sumBy('credit')).toString(),
+                ]
+            });
+        };
+        /**
+         * Get data for the exporting table rows
+         */
+        PropertyHoldingCostsService.prototype.getDataTableRows = function (holdingCosts) {
+            var _this = this;
+            return holdingCosts.items.map(function (transaction) {
+                return [
+                    _this.datePipe.transform(transaction.date, 'dd/MM/YYYY').toString(),
+                    transaction.description,
+                    _this.currencyPipe.transform(transaction.debit).toString(),
+                    _this.currencyPipe.transform(transaction.credit).toString()
+                ];
+            });
+        };
+        return PropertyHoldingCostsService;
+    }());
+    PropertyHoldingCostsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyHoldingCostsService, deps: [{ token: PdfService }, { token: i2__namespace.CurrencyPipe }, { token: i2__namespace.DatePipe }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyHoldingCostsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyHoldingCostsService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyHoldingCostsService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], ctorParameters: function () { return [{ type: PdfService }, { type: i2__namespace.CurrencyPipe }, { type: i2__namespace.DatePipe }]; } });
+
     /**
      * Service for work with Property Categories
      */
@@ -11803,14 +12235,10 @@
      */
     var PropertyDocumentService = /** @class */ (function (_super) {
         __extends(PropertyDocumentService, _super);
-        function PropertyDocumentService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function PropertyDocumentService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.modelClass = PropertyDocument;
             _this.url = 'properties/documents';
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -11852,32 +12280,23 @@
         };
         return PropertyDocumentService;
     }(RestService));
-    PropertyDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyDocumentService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyDocumentService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     PropertyDocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyDocumentService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyDocumentService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     // @TODO check and improve logic during refactoring
     var PropertyShareService = /** @class */ (function (_super) {
         __extends(PropertyShareService, _super);
-        function PropertyShareService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function PropertyShareService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             // api url parameter for properties shares
             _this.url = 'properties/shares';
             _this.modelClass = PropertyShare;
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -11964,19 +12383,14 @@
         };
         return PropertyShareService;
     }(RestService));
-    PropertyShareService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyShareService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyShareService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyShareService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     PropertyShareService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyShareService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyShareService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     var PropertySaleService = /** @class */ (function (_super) {
         __extends(PropertySaleService, _super);
@@ -12094,11 +12508,8 @@
             this.serviceSubscriptionsSubject = new rxjs.ReplaySubject(1);
             this.servicePaymentsSubject = new rxjs.ReplaySubject(1);
             this.subscriptionChangeSubject = new rxjs.BehaviorSubject(null);
-            this.listenEvents();
-        }
-        SubscriptionService.prototype.listenEvents = function () {
             this.listenSubscriptions();
-        };
+        }
         SubscriptionService.prototype.getSubscription = function (force) {
             var _this = this;
             if (force === void 0) { force = false; }
@@ -12243,14 +12654,10 @@
      */
     var TaxReviewService = /** @class */ (function (_super) {
         __extends(TaxReviewService, _super);
-        function TaxReviewService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function TaxReviewService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.url = 'tax-reviews';
             _this.modelClass = TaxReview;
-            _this.listenEvents();
             return _this;
         }
         /**
@@ -12324,200 +12731,110 @@
         };
         return TaxReviewService;
     }(RestService));
-    TaxReviewService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TaxReviewService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     TaxReviewService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     /**
      * Service to work with tax review history
      */
     var TaxReviewHistoryService = /** @class */ (function (_super) {
         __extends(TaxReviewHistoryService, _super);
-        function TaxReviewHistoryService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function TaxReviewHistoryService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.url = 'tax-reviews/history';
             _this.modelClass = TaxReview;
-            // subscribe on tax review updating
-            eventDispatcherService.on(exports.AppEventTypeEnum.TAX_REVIEW_UPDATED).subscribe(function (taxReview) {
-                var tempCache = ___default["default"].cloneDeep(_this.cache);
-                // insert element at the beginning of the array
-                tempCache.unshift(taxReview);
-                _this.cache = tempCache;
-                _this.updateCache();
-            });
             return _this;
         }
-        return TaxReviewHistoryService;
-    }(RestService));
-    TaxReviewHistoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TaxReviewHistoryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
-
-    /**
-     * Service to work with tax summary logic
-     */
-    var TaxSummaryService = /** @class */ (function () {
-        function TaxSummaryService(http, eventDispatcherService, environment) {
-            this.http = http;
-            this.eventDispatcherService = eventDispatcherService;
-            this.environment = environment;
-            this.taxSummaryActualsSubject = new rxjs.ReplaySubject(1);
-            this.taxSummaryForecastsSubject = new rxjs.ReplaySubject(1);
-            this.listenEvents();
-        }
-        TaxSummaryService.prototype.listenEvents = function () {
-            this.listenToIncomeSourceForecastsEvents();
-        };
-        /**
-         * Get actual tax summary items
-         */
-        TaxSummaryService.prototype.getActuals = function () {
-            var _this = this;
-            this.http.get(this.environment.apiV2 + "/tax-summary/" + exports.TaxSummaryTypeEnum.ACTUALS, {})
-                .subscribe(function (response) {
-                var taxSummary = classTransformer.plainToClass(TaxSummary, response);
-                _this.taxSummaryActualsSubject.next(taxSummary);
-                return taxSummary;
-            });
-            return this.taxSummaryActualsSubject.asObservable();
-        };
-        /**
-         * Get forecast tax summary items
-         */
-        TaxSummaryService.prototype.getForecast = function () {
-            var _this = this;
-            this.http.get(this.environment.apiV2 + "/tax-summary/" + exports.TaxSummaryTypeEnum.FORECASTS, {})
-                .subscribe(function (response) {
-                var taxSummary = classTransformer.plainToClass(TaxSummary, response);
-                _this.taxSummaryForecastsSubject.next(taxSummary);
-                return taxSummary;
-            });
-            return this.taxSummaryForecastsSubject.asObservable();
+        TaxReviewHistoryService.prototype.listenEvents = function () {
+            this.listenTaxReviewUpdate();
         };
         /**
-         * Listen to EventDispatcherService events related to Income source forecasts
+         * Update tax review history cache when single tax review updated.
          */
-        TaxSummaryService.prototype.listenToIncomeSourceForecastsEvents = function () {
+        TaxReviewHistoryService.prototype.listenTaxReviewUpdate = function () {
             var _this = this;
-            this.eventDispatcherService
-                .on([exports.AppEventTypeEnum.INCOME_SOURCES_FORECASTS_CREATED, exports.AppEventTypeEnum.INCOME_SOURCES_FORECASTS_UPDATED])
-                .subscribe(function () {
-                _this.getForecast().subscribe();
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.TAX_REVIEW_UPDATED).subscribe(function (taxReview) {
+                var tempCache = ___default["default"].cloneDeep(_this.cache);
+                // insert element at the beginning of the array
+                tempCache.unshift(taxReview);
+                _this.cache = tempCache;
+                _this.updateCache();
             });
         };
-        return TaxSummaryService;
-    }());
-    TaxSummaryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxSummaryService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TaxSummaryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxSummaryService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxSummaryService, decorators: [{
-                type: i0.Injectable,
-                args: [{
-                        providedIn: 'root'
-                    }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
-
-    // @TODO Don't look at the commented code. Will be refactored/removed during TT-1503
-    /**
-     * Service for transaction allocations business logic
-     * @TODO alex refactor
-     */
-    var TransactionAllocationService = /** @class */ (function (_super) {
-        __extends(TransactionAllocationService, _super);
-        function TransactionAllocationService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
-            // API URL param for transaction allocations
-            _this.url = 'transactions-allocations';
-            _this.modelClass = TransactionAllocation;
-            _this.listenEvents();
-            return _this;
-        }
-        /**
-         * Add single transaction allocation
-         */
-        TransactionAllocationService.prototype.add = function (allocation) {
-            return this.addBatch([allocation]).pipe(operators.map(function (newAllocations) { return newAllocations[0]; }));
-        };
-        /**
-         * get list of transactions allocations related with passed bank transactions list
-         */
-        TransactionAllocationService.prototype.getByTransactions = function (transactions) {
-            var ids = transactions.map(function (transaction) { return transaction.id; });
-            return this.get()
-                .pipe(operators.map(function (transactionAllocations) {
-                return transactionAllocations.filter(function (allocation) { return ids.includes(allocation.transaction.id); });
-            }));
-        };
-        TransactionAllocationService.prototype.listenEvents = function () {
-            this.onTransactionsCreated();
-            this.onDepreciationCreated();
-            this.onTransactionDeleted();
+        return TaxReviewHistoryService;
+    }(RestService));
+    TaxReviewHistoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TaxReviewHistoryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxReviewHistoryService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
+    /**
+     * Service to work with tax summary logic
+     */
+    var TaxSummaryService = /** @class */ (function () {
+        function TaxSummaryService(http, eventDispatcherService, environment) {
+            this.http = http;
+            this.eventDispatcherService = eventDispatcherService;
+            this.environment = environment;
+            this.taxSummaryActualsSubject = new rxjs.ReplaySubject(1);
+            this.taxSummaryForecastsSubject = new rxjs.ReplaySubject(1);
+            this.listenEvents();
+        }
+        TaxSummaryService.prototype.listenEvents = function () {
+            this.listenToIncomeSourceForecastsEvents();
         };
         /**
-         * Reset cache on transactions created
+         * Get actual tax summary items
          */
-        TransactionAllocationService.prototype.onTransactionsCreated = function () {
+        TaxSummaryService.prototype.getActuals = function () {
             var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.TRANSACTIONS_CREATED).subscribe(function () {
-                // Update allocations cache to synchronize data and fire subscriptions
-                _this.resetCache();
+            this.http.get(this.environment.apiV2 + "/tax-summary/" + exports.TaxSummaryTypeEnum.ACTUALS, {})
+                .subscribe(function (response) {
+                var taxSummary = classTransformer.plainToClass(TaxSummary, response);
+                _this.taxSummaryActualsSubject.next(taxSummary);
+                return taxSummary;
             });
+            return this.taxSummaryActualsSubject.asObservable();
         };
         /**
-         * Reset cache on depreciation created
+         * Get forecast tax summary items
          */
-        TransactionAllocationService.prototype.onDepreciationCreated = function () {
+        TaxSummaryService.prototype.getForecast = function () {
             var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.DEPRECIATIONS_CREATED).subscribe(function () {
-                // Update allocations cache to synchronize data and fire subscriptions
-                _this.resetCache();
+            this.http.get(this.environment.apiV2 + "/tax-summary/" + exports.TaxSummaryTypeEnum.FORECASTS, {})
+                .subscribe(function (response) {
+                var taxSummary = classTransformer.plainToClass(TaxSummary, response);
+                _this.taxSummaryForecastsSubject.next(taxSummary);
+                return taxSummary;
             });
+            return this.taxSummaryForecastsSubject.asObservable();
         };
         /**
-         * Reset cache on transaction deleted
+         * Listen to EventDispatcherService events related to Income source forecasts
          */
-        TransactionAllocationService.prototype.onTransactionDeleted = function () {
+        TaxSummaryService.prototype.listenToIncomeSourceForecastsEvents = function () {
             var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.TRANSACTION_DELETED).subscribe(function () {
-                // Update allocations cache to synchronize data and fire subscriptions
-                _this.resetCache();
+            this.eventDispatcherService
+                .on([exports.AppEventTypeEnum.INCOME_SOURCES_FORECASTS_CREATED, exports.AppEventTypeEnum.INCOME_SOURCES_FORECASTS_UPDATED])
+                .subscribe(function () {
+                _this.getForecast().subscribe();
             });
         };
-        return TransactionAllocationService;
-    }(RestService));
-    TransactionAllocationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TransactionAllocationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionAllocationService, decorators: [{
+        return TaxSummaryService;
+    }());
+    TaxSummaryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxSummaryService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TaxSummaryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxSummaryService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxSummaryService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12742,11 +13059,8 @@
 
     var UserEventSettingService = /** @class */ (function (_super) {
         __extends(UserEventSettingService, _super);
-        function UserEventSettingService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function UserEventSettingService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.modelClass = UserEventSetting;
             _this.url = 'user-event-settings';
             _this.isHydra = true;
@@ -12781,27 +13095,19 @@
         };
         return UserEventSettingService;
     }(RestService));
-    UserEventSettingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventSettingService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserEventSettingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventSettingService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     UserEventSettingService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventSettingService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventSettingService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     var UserEventTypeService = /** @class */ (function (_super) {
         __extends(UserEventTypeService, _super);
-        function UserEventTypeService(http, eventDispatcherService, environment) {
-            var _this = _super.call(this, http, eventDispatcherService, environment) || this;
-            _this.http = http;
-            _this.eventDispatcherService = eventDispatcherService;
-            _this.environment = environment;
+        function UserEventTypeService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
             _this.modelClass = UserEventType;
             _this.url = 'user-event-types';
             _this.isHydra = true;
@@ -12809,252 +13115,138 @@
         }
         return UserEventTypeService;
     }(RestService));
-    UserEventTypeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventTypeService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserEventTypeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventTypeService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
     UserEventTypeService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventTypeService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserEventTypeService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
-                            type: i0.Inject,
-                            args: ['environment']
-                        }] }];
-        } });
+            }] });
 
     /**
      * Service that allows to work with WorkTank operations
-     * @TODO separate into multiple services, extend restService
+     * @TODO separate vehicles and logbooks to different api
      */
-    var VehicleService = /** @class */ (function () {
-        function VehicleService(http, transactionService, depreciationService, chartAccountsService, eventDispatcherService, environment) {
-            this.http = http;
-            this.transactionService = transactionService;
-            this.depreciationService = depreciationService;
-            this.chartAccountsService = chartAccountsService;
-            this.eventDispatcherService = eventDispatcherService;
-            this.environment = environment;
-            this.vehiclesSubject = new rxjs.ReplaySubject(1);
-            this.vehicleClaimSubject = new rxjs.ReplaySubject(1);
-            this.vehicleClaimRateSubject = new rxjs.ReplaySubject(1);
-            this.vehicleTaxReturnSubject = new rxjs.ReplaySubject(1);
-            this.incomePositionsSubject = new rxjs.ReplaySubject(1);
+    var VehicleService = /** @class */ (function (_super) {
+        __extends(VehicleService, _super);
+        function VehicleService() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.url = 'vehicles';
+            _this.modelClass = Vehicle;
+            _this.messageCreated = MessagesEnum$1.VEHICLE_CREATED;
+            _this.messageUpdated = MessagesEnum$1.VEHICLE_UPDATED;
+            _this.messageDeleted = MessagesEnum$1.VEHICLE_DELETED;
+            return _this;
         }
-        VehicleService.prototype.getVehicles = function () {
-            var _this = this;
-            // @TODO create backend for get logbook
-            if (!this._vehicles) {
-                this.http.get(this.environment.apiV2 + "/vehicles")
-                    .pipe(operators.map(function (response) {
-                    return response.map(function (item) { return classTransformer.plainToClass(Vehicle, item); });
-                }))
-                    .subscribe(function (vehicles) {
-                    _this._vehicles = vehicles;
-                    _this.vehiclesSubject.next(vehicles);
-                });
-            }
-            return this.vehiclesSubject.asObservable();
-        };
-        /**
-         * Get vehicles claim amount
-         */
-        VehicleService.prototype.getVehiclesClaim = function () {
-            var _this = this;
-            if (!this._vehicleClaim) {
-                this.http.get(this.environment.apiV2 + "/vehicle-claims")
-                    .pipe(operators.map(function (response) {
-                    // return Vehicle claim from backend or create new if it not exist
-                    return response.length ? response.map(function (item) { return classTransformer.plainToClass(VehicleClaim, item); })[0] : classTransformer.plainToClass(VehicleClaim, {});
-                }))
-                    .subscribe(function (vehicleClaim) {
-                    _this._vehicleClaim = vehicleClaim;
-                    _this.vehicleClaimSubject.next(vehicleClaim);
-                });
-            }
-            return this.vehicleClaimSubject.asObservable();
-        };
-        /**
-         * Add new vehicle claim
-         * @param claim object which should be added
-         */
-        VehicleService.prototype.addVehicleClaim = function (claim) {
-            var _this = this;
-            return this.http.post(this.environment.apiV2 + "/vehicle-claims", claim).pipe(operators.map(function (response) {
-                _this._vehicleClaim = classTransformer.plainToClass(VehicleClaim, response);
-                _this.vehicleClaimSubject.next(_this._vehicleClaim);
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.VEHICLE_CLAIM_CREATED, null));
-            }));
-        };
-        /**
-         * Get vehicles claim rate for current financial year
-         */
-        VehicleService.prototype.getVehiclesClaimRate = function () {
-            var _this = this;
-            if (!this._vehicleClaimRate) {
-                this.chartAccountsService.getChartAccountsById(exports.ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK)
-                    .pipe(operators.map(function (response) {
-                    return response.values.find(function (chartAccount) { return chartAccount.financialYear === new FinancialYear().year; }).value;
-                }))
-                    .subscribe(function (claimRate) {
-                    _this._vehicleClaimRate = claimRate;
-                    _this.vehicleClaimRateSubject.next(_this._vehicleClaimRate);
-                });
-            }
-            return this.vehicleClaimRateSubject.asObservable();
-        };
-        /**
-         * Get vehicles tax return for vehicle transactions & depreciations
-         */
-        VehicleService.prototype.getVehiclesTaxReturn = function () {
-            var _this = this;
-            if (!this._vehicleTaxReturn) {
-                rxjs.combineLatest([
-                    // @Todo refactor to avoid injection of another services
-                    this.transactionService.get(),
-                    this.depreciationService.get(),
-                    this.getVehiclesClaim()
-                ]).pipe(operators.map(function (_b) {
-                    var _c = __read(_b, 3), transactions = _c[0], depreciations = _c[1], vehicleClaim = _c[2];
-                    var chartAccountsHeadingsIds = enumToList(exports.ChartAccountsHeadingVehicleListEnum)
-                        .map(function (item) { return item.value; });
-                    // get transactions & depreciations which chart accounts headings are belong to vehicle category
-                    // but except KLMS transaction
-                    var filteredItems = __spreadArray(__spreadArray([], __read(transactions)), __read(depreciations)).filter(function (item) {
-                        var _a;
-                        return chartAccountsHeadingsIds.includes((_a = item.chartAccounts.heading) === null || _a === void 0 ? void 0 : _a.id) && !item.chartAccounts.isKlmsForWork();
-                    });
-                    // get claim amount sum
-                    return filteredItems.reduce(function (sum, item) {
-                        // @Todo remove item.amount negative sign when depreciations will be refactored and will have negative sign
-                        return sum + ((item instanceof Depreciation ? item.currentYearForecast.amount : -item.amount) * (vehicleClaim.workUsage / 100));
-                    }, 0);
-                }))
-                    .subscribe(function (taxReturn) {
-                    _this._vehicleTaxReturn = taxReturn;
-                    _this.vehicleTaxReturnSubject.next(_this._vehicleTaxReturn);
-                });
-            }
-            return this.vehicleTaxReturnSubject.asObservable();
-        };
-        /**
-         * Update vehicle claim
-         * @param claim which should be updated
-         *
-         * @TODO alex refresh depreciation/transaction cache
-         */
-        VehicleService.prototype.updateVehicleClaim = function (claim) {
-            var _this = this;
-            return this.http.put(this.environment.apiV2 + "/vehicle-claims/" + claim.id, claim).pipe(operators.map(function (response) {
-                var updatedVehicleClaim = classTransformer.plainToClass(VehicleClaim, response);
-                _this._vehicleClaim = updatedVehicleClaim;
-                _this.vehicleClaimSubject.next(_this._vehicleClaim);
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.VEHICLE_CLAIM_UPDATED, null));
-                return updatedVehicleClaim;
-            }));
+        VehicleService.prototype.listenEvents = function () {
+            this.listenLogbookAdded();
+            this.listenLogbookUpdated();
+            this.listenLogbookDeleted();
         };
         /**
-         * Add new logbook for desired vehicle
-         * @param logbook which should be added
-         * @param vehicle for which logbook object should be added
+         * Add a new logbook items to the vehicle when a new one created
          */
-        VehicleService.prototype.addLogbook = function (logbook, vehicle) {
+        VehicleService.prototype.listenLogbookAdded = function () {
             var _this = this;
-            return this.http.post(this.environment.apiV2 + "/vehicles/" + vehicle.id + "/logbooks", logbook)
-                .pipe(operators.map(function (response) {
-                _this._vehicles.find(function (v) { return v.id === vehicle.id; }).logbook.push(response);
-                // we update nested logbook object inside vehicles list. So list is not changed and next not emit subscriptions updates.
-                // that is why we recreate vehicles array
-                _this.vehiclesSubject.next(_this._vehicles.map(function (item) { return classTransformer.plainToClass(Vehicle, item); }));
-            }));
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.VEHICLE_LOGBOOK_CREATED)
+                .subscribe(function (result) {
+                var tempCache = cloneDeep__default["default"](_this.cache);
+                tempCache.find(function (vehicle) { return vehicle.id === result.vehicleId; }).logbook.push(result.logbook);
+                _this.cache = tempCache;
+                _this.updateCache();
+            });
         };
         /**
-         * Update logbook
-         * @param logbook which should be updated
-         * @param vehicle for which logbook object should be updated
+         * Replace vehicle's logbook with updated instance when logbook item updated
          */
-        VehicleService.prototype.updateLogbook = function (logbook, vehicle) {
+        VehicleService.prototype.listenLogbookUpdated = function () {
             var _this = this;
-            return this.http.put(this.environment.apiV2 + "/vehicles/" + vehicle.id + "/logbooks/" + logbook.id, logbook).pipe(operators.map(function (response) {
-                var editedVehicle = _this._vehicles.find(function (v) { return v.id === vehicle.id; });
-                var editedLogbookIndex = editedVehicle.logbook.findIndex(function (l) { return l.id === logbook.id; });
-                editedVehicle.logbook.splice(editedLogbookIndex, 1, classTransformer.plainToClass(VehicleLogbook, response));
-                // we update nested logbook object inside vehicles list. So list is not changed and next not emit subscriptions updates.
-                // that is why we recreate vehicles array
-                _this.vehiclesSubject.next(_this._vehicles.map(function (item) { return classTransformer.plainToClass(Vehicle, item); }));
-            }));
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.VEHICLE_LOGBOOK_UPDATED)
+                .subscribe(function (result) {
+                var tempCache = cloneDeep__default["default"](_this.cache);
+                replace(tempCache.find(function (vehicle) { return vehicle.id === result.vehicleId; }).logbook, result.logbook);
+                _this.cache = tempCache;
+                _this.updateCache();
+            });
         };
         /**
-         * Delete trip
-         * @param logbook for which trip should be deleted
-         * @param vehicle for which trip should be deleted
+         * Remove logbook item from vehicle when logbook deleted
          */
-        VehicleService.prototype.deleteTrip = function (logbook, vehicle) {
+        VehicleService.prototype.listenLogbookDeleted = function () {
             var _this = this;
-            return this.http.delete(this.environment.apiV2 + "/vehicles/" + vehicle.id + "/logbooks/" + logbook.id)
-                .pipe(operators.map(function () {
-                var editedVehicle = _this._vehicles.find(function (v) { return v.id === vehicle.id; });
-                var deletedLogbookIndex = editedVehicle.logbook.findIndex(function (l) { return l.id === logbook.id; });
-                editedVehicle.logbook.splice(deletedLogbookIndex, 1);
-                // we update nested logbook object inside vehicles list. So list is not changed and next not emit subscriptions updates.
-                // that is why we recreate vehicles array
-                _this.vehiclesSubject.next(_this._vehicles.map(function (item) { return classTransformer.plainToClass(Vehicle, item); }));
-            }));
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.VEHICLE_LOGBOOK_DELETED)
+                .subscribe(function (result) {
+                var tempCache = cloneDeep__default["default"](_this.cache);
+                var vehicle = tempCache.find(function (vehicle) { return vehicle.id === result.vehicleId; });
+                vehicle.logbook = vehicle.logbook.filter(function (logbook) { return logbook.id !== result.logbook.id; });
+                _this.cache = tempCache;
+                _this.updateCache();
+            });
         };
-        /**
-         * Add new vehicle
-         * @param vehicle which should be added
-         */
-        VehicleService.prototype.addVehicle = function (vehicle) {
+        return VehicleService;
+    }(RestService));
+    VehicleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    VehicleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }] });
+
+    /**
+     * Vehicle logbook service. Allows user to add, update or delete vehicle trips
+     * @TODO extend rest service after it refactored
+     */
+    var VehicleLogbookService = /** @class */ (function () {
+        function VehicleLogbookService(http, eventDispatcherService, environment, toastService) {
+            this.http = http;
+            this.eventDispatcherService = eventDispatcherService;
+            this.environment = environment;
+            this.toastService = toastService;
+        }
+        VehicleLogbookService.prototype.add = function (logbook, vehicleId) {
             var _this = this;
-            return this.http.post(this.environment.apiV2 + "/vehicles", { name: vehicle.name })
-                .pipe(operators.map(function (response) {
-                _this._vehicles.push(classTransformer.plainToClass(Vehicle, response));
-                _this.vehiclesSubject.next(_this._vehicles);
+            return this.http.post(this.environment.apiV2 + "/vehicles/" + vehicleId + "/logbooks", logbook)
+                .pipe(operators.map(function (vehicleLogbookBase) {
+                var newVehicleLogbook = classTransformer.plainToClass(VehicleLogbook, vehicleLogbookBase);
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.VEHICLE_LOGBOOK_CREATED, { logbook: newVehicleLogbook, vehicleId: vehicleId }));
+                _this.toastService.success(MessagesEnum$1.VEHICLE_LOGBOOK_CREATED);
+                return newVehicleLogbook;
             }));
         };
-        /**
-         * Update vehicle
-         * @param vehicle which should be updated
-         */
-        VehicleService.prototype.updateVehicle = function (vehicle) {
+        VehicleLogbookService.prototype.update = function (logbook, vehicleId) {
             var _this = this;
-            return this.http.put(this.environment.apiV2 + "/vehicles/" + vehicle.id, { name: vehicle.name })
-                .pipe(operators.map(function (response) {
-                var editedVehicleIndex = _this._vehicles.findIndex(function (v) { return v.id === vehicle.id; });
-                _this._vehicles.splice(editedVehicleIndex, 1, classTransformer.plainToClass(Vehicle, response));
-                _this.vehiclesSubject.next(_this._vehicles);
+            return this.http.put(this.environment.apiV2 + "/vehicles/" + vehicleId + "/logbooks/" + logbook.id, logbook).pipe(operators.map(function (vehicleLogbookBase) {
+                var updatedVehicleLogbook = classTransformer.plainToClass(VehicleLogbook, vehicleLogbookBase);
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.VEHICLE_LOGBOOK_UPDATED, { logbook: updatedVehicleLogbook, vehicleId: vehicleId }));
+                _this.toastService.success(MessagesEnum$1.VEHICLE_LOGBOOK_UPDATED);
+                return classTransformer.plainToClass(VehicleLogbook, updatedVehicleLogbook);
             }));
         };
-        /**
-         * Delete vehicle
-         * @param vehicle which should be deleted
-         */
-        VehicleService.prototype.deleteVehicle = function (vehicle) {
+        VehicleLogbookService.prototype.delete = function (logbook, vehicleId) {
             var _this = this;
-            return this.http.delete(this.environment.apiV2 + "/vehicles/" + vehicle.id)
+            return this.http.delete(this.environment.apiV2 + "/vehicles/" + vehicleId + "/logbooks/" + logbook.id)
                 .pipe(operators.map(function () {
-                var deletedVehicleIndex = _this._vehicles.findIndex(function (v) { return v.id === vehicle.id; });
-                _this._vehicles.splice(deletedVehicleIndex, 1);
-                // we update nested logbook object inside vehicles list. So list is not changed and next not emit subscriptions updates.
-                // that is why we recreate vehicles array
-                _this.vehiclesSubject.next(_this._vehicles.map(function (item) { return classTransformer.plainToClass(Vehicle, item); }));
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.VEHICLE_LOGBOOK_DELETED, { logbook: logbook, vehicleId: vehicleId }));
+                _this.toastService.success(MessagesEnum$1.VEHICLE_LOGBOOK_DELETED);
             }));
         };
-        return VehicleService;
+        return VehicleLogbookService;
     }());
-    VehicleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, deps: [{ token: i1__namespace.HttpClient }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    VehicleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleService, decorators: [{
+    VehicleLogbookService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleLogbookService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    VehicleLogbookService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleLogbookService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: VehicleLogbookService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
             }], ctorParameters: function () {
-            return [{ type: i1__namespace.HttpClient }, { type: TransactionService }, { type: DepreciationService }, { type: ChartAccountsService }, { type: EventDispatcherService }, { type: undefined, decorators: [{
+            return [{ type: i1__namespace.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: ['environment']
-                        }] }];
+                        }] }, { type: ToastService }];
         } });
 
     /**
@@ -13209,6 +13401,39 @@
         return AbstractForm;
     }(forms.FormGroup));
 
+    /**
+     * Check if at least one form field is true, otherwise form is invalid.
+     * Use with groups of boolean form controls (checkbox, toggle, etc.)
+     */
+    function atLeastOneCheckedValidator() {
+        return function (formGroup) {
+            return Object.values(formGroup.controls)
+                .find(function (control) { return control.value; }) ? null : { nothingChecked: true };
+        };
+    }
+
+    var ClientIncomeTypesForm = /** @class */ (function (_super) {
+        __extends(ClientIncomeTypesForm, _super);
+        function ClientIncomeTypesForm(clientIncomeTypes) {
+            var _this = _super.call(this, {
+                salary: new forms.FormControl(clientIncomeTypes.salary),
+                rental: new forms.FormControl(clientIncomeTypes.rental),
+                soleTrader: new forms.FormControl(clientIncomeTypes.soleTrader),
+                dividends: new forms.FormControl(clientIncomeTypes.dividends),
+                other: new forms.FormControl(clientIncomeTypes.other)
+            }, atLeastOneCheckedValidator()) || this;
+            _this.clientIncomeTypes = clientIncomeTypes;
+            return _this;
+        }
+        ClientIncomeTypesForm.prototype.submit = function () {
+            if (!this.valid) {
+                return null;
+            }
+            return Object.assign({}, this.clientIncomeTypes, this.value);
+        };
+        return ClientIncomeTypesForm;
+    }(AbstractForm));
+
     var LoginForm = /** @class */ (function (_super) {
         __extends(LoginForm, _super);
         function LoginForm() {
@@ -13292,6 +13517,139 @@
         return ResetPasswordForm;
     }(AbstractForm));
 
+    var MAX_NAME_LENGTH = 60;
+    var VehicleForm = /** @class */ (function (_super) {
+        __extends(VehicleForm, _super);
+        function VehicleForm(vehicle) {
+            var _this = _super.call(this, {
+                name: new forms.FormControl(vehicle.name, [forms.Validators.required, forms.Validators.maxLength(MAX_NAME_LENGTH)])
+            }) || this;
+            _this.vehicle = vehicle;
+            return _this;
+        }
+        /**
+         * @TODO save model, add generics and handle it in AbstractForm
+         */
+        VehicleForm.prototype.submit = function () {
+            return classTransformer.plainToClass(VehicleClaim, Object.assign({}, this.vehicle, this.getRawValue()));
+        };
+        return VehicleForm;
+    }(AbstractForm));
+
+    var VehicleClaimForm = /** @class */ (function (_super) {
+        __extends(VehicleClaimForm, _super);
+        function VehicleClaimForm(vehicleClaim, logbooks) {
+            var _this = _super.call(this, {
+                method: new forms.FormControl(vehicleClaim.method, forms.Validators.required),
+                isManual: new forms.FormControl(vehicleClaim.isManual),
+                kilometers: new forms.FormControl({
+                    value: vehicleClaim.kilometers,
+                    disabled: !vehicleClaim.isManual
+                }),
+                workUsage: new forms.FormControl({
+                    value: vehicleClaim.workUsage,
+                    disabled: !vehicleClaim.isManual
+                })
+            }) || this;
+            _this.vehicleClaim = vehicleClaim;
+            _this.logbooks = logbooks;
+            _this.setIsManualState();
+            _this.listenMethodChanges();
+            _this.listenIsManualChanges();
+            return _this;
+        }
+        /**
+         * Check if vehicle claim method changed
+         */
+        VehicleClaimForm.prototype.isMethodChanged = function () {
+            return this.vehicleClaim.method !== this.get('method').value;
+        };
+        /**
+         * Check if KLMs method selected
+         */
+        VehicleClaimForm.prototype.isKLMsMethod = function () {
+            return this.get('method').value === exports.VehicleClaimMethodEnum.KMS;
+        };
+        /**
+         * Check if Logbook method selected
+         */
+        VehicleClaimForm.prototype.isLogbookMethod = function () {
+            return this.get('method').value === exports.VehicleClaimMethodEnum.LOGBOOK;
+        };
+        /**
+         * Check if user selected manual calculation
+         */
+        VehicleClaimForm.prototype.isManual = function () {
+            return this.get('isManual').value;
+        };
+        /**
+         * @TODO save model, add generics and handle it in AbstractForm
+         */
+        VehicleClaimForm.prototype.submit = function () {
+            return classTransformer.plainToClass(VehicleClaim, Object.assign({}, this.vehicleClaim, this.getRawValue()));
+        };
+        VehicleClaimForm.prototype.setIsManualState = function () {
+            if (this.logbooks.isBestPeriodExist()) {
+                this.get('isManual').enable();
+            }
+            else {
+                this.get('isManual').disable();
+                this.get('isManual').setValue(true);
+            }
+        };
+        /**
+         * Handle method field value changes.
+         * Set work usage value depended of selected method.
+         */
+        VehicleClaimForm.prototype.listenMethodChanges = function () {
+            var _this = this;
+            this.get('method').valueChanges.subscribe(function (method) {
+                if (method === exports.VehicleClaimMethodEnum.KMS) {
+                    _this.get('workUsage').setValue(0);
+                }
+                else if (method === exports.VehicleClaimMethodEnum.LOGBOOK && !_this.isManual()) {
+                    _this.get('workUsage').setValue(_this.logbooks.getBestPeriod().workUsage);
+                }
+                _this.setValues();
+            });
+        };
+        /**
+         * Handle isManual field value changes.
+         * Enable/disable fields depended of isManual value
+         */
+        VehicleClaimForm.prototype.listenIsManualChanges = function () {
+            var _this = this;
+            this.get('isManual').valueChanges.subscribe(function (isManual) {
+                if (isManual) {
+                    _this.get('kilometers').enable();
+                    _this.get('workUsage').enable();
+                }
+                else {
+                    _this.get('kilometers').disable();
+                    _this.get('workUsage').disable();
+                }
+                _this.setValues();
+            });
+        };
+        /**
+         * Set automatic calculated values depended of current method for non-manual vehicle claim
+         */
+        VehicleClaimForm.prototype.setValues = function () {
+            if (this.isManual()) {
+                return;
+            }
+            switch (this.get('method').value) {
+                case exports.VehicleClaimMethodEnum.LOGBOOK:
+                    this.get('workUsage').setValue(this.logbooks.getBestPeriod().workUsage);
+                    break;
+                case exports.VehicleClaimMethodEnum.KMS:
+                    var businessKms = this.logbooks.getBusinessLogbooks().getKlms();
+                    this.get('kilometers').setValue(businessKms < this.vehicleClaim.kmsLimit ? businessKms : this.vehicleClaim.kmsLimit);
+            }
+        };
+        return VehicleClaimForm;
+    }(AbstractForm));
+
     /**
      * Public API Surface of tt-core
      */
@@ -13301,6 +13659,9 @@
      */
 
     exports.AbstractForm = AbstractForm;
+    exports.AccountSetupItem = AccountSetupItem;
+    exports.AccountSetupItemCollection = AccountSetupItemCollection;
+    exports.AccountSetupService = AccountSetupService;
     exports.Address = Address;
     exports.AddressService = AddressService;
     exports.AppEvent = AppEvent;
@@ -13338,12 +13699,16 @@
     exports.ChartAccountsHeading = ChartAccountsHeading;
     exports.ChartAccountsMetadata = ChartAccountsMetadata;
     exports.ChartAccountsService = ChartAccountsService;
+    exports.ChartAccountsValue = ChartAccountsValue;
     exports.ChartData = ChartData;
     exports.ChartSerie = ChartSerie;
     exports.Chat = Chat;
     exports.ChatService = ChatService;
     exports.ClientCollection = ClientCollection;
     exports.ClientDetails = ClientDetails;
+    exports.ClientIncomeTypes = ClientIncomeTypes;
+    exports.ClientIncomeTypesForm = ClientIncomeTypesForm;
+    exports.ClientIncomeTypesService = ClientIncomeTypesService;
     exports.ClientInvite = ClientInvite;
     exports.ClientInviteService = ClientInviteService;
     exports.ClientMovement = ClientMovement;
@@ -13387,6 +13752,7 @@
     exports.Endpoint = Endpoint;
     exports.EquityPositionChartService = EquityPositionChartService;
     exports.EventDispatcherService = EventDispatcherService;
+    exports.ExportDataTable = ExportDataTable;
     exports.FinancialYear = FinancialYear;
     exports.Firm = Firm;
     exports.FirmService = FirmService;
@@ -13408,7 +13774,6 @@
     exports.LoanPayment = LoanPayment;
     exports.LoanPayout = LoanPayout;
     exports.LoanService = LoanService;
-    exports.LogbookCollection = LogbookCollection;
     exports.LogbookPeriod = LogbookPeriod;
     exports.LoginForm = LoginForm;
     exports.MODULE_URL_LIST = MODULE_URL_LIST;
@@ -13439,6 +13804,7 @@
     exports.PropertyEquityChartData = PropertyEquityChartData;
     exports.PropertyEquityChartItem = PropertyEquityChartItem;
     exports.PropertyForecast = PropertyForecast;
+    exports.PropertyHoldingCostsService = PropertyHoldingCostsService;
     exports.PropertyReportItem = PropertyReportItem;
     exports.PropertyReportItemCollection = PropertyReportItemCollection;
     exports.PropertyReportItemDepreciationCollection = PropertyReportItemDepreciationCollection;
@@ -13514,7 +13880,13 @@
     exports.UserToRegister = UserToRegister;
     exports.Vehicle = Vehicle;
     exports.VehicleClaim = VehicleClaim;
+    exports.VehicleClaimForm = VehicleClaimForm;
+    exports.VehicleClaimService = VehicleClaimService;
+    exports.VehicleCollection = VehicleCollection;
+    exports.VehicleForm = VehicleForm;
     exports.VehicleLogbook = VehicleLogbook;
+    exports.VehicleLogbookCollection = VehicleLogbookCollection;
+    exports.VehicleLogbookService = VehicleLogbookService;
     exports.VehicleService = VehicleService;
     exports.WORK_TANK_LOGBOOK_PURPOSE_OPTIONS = WORK_TANK_LOGBOOK_PURPOSE_OPTIONS;
     exports.XlsxService = XlsxService;