taxtank-core 0.20.0 → 0.21.1

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/get'), require('lodash/last'), require('moment'), require('lodash/flatten'), require('lodash/hasIn'), require('lodash/first'), require('lodash/cloneDeep'), require('lodash/compact'), require('lodash/uniqBy'), require('lodash/concat'), require('moment-range'), require('@angular/forms'), require('lodash/fromPairs'), require('lodash'), require('event-source-polyfill/src/eventsource.min.js'), require('@angular/router'), require('lodash/clone'), require('html2pdf.js'), 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/last', 'moment', 'lodash/flatten', 'lodash/hasIn', 'lodash/first', 'lodash/cloneDeep', 'lodash/compact', 'lodash/uniqBy', 'lodash/concat', 'moment-range', '@angular/forms', 'lodash/fromPairs', 'lodash', 'event-source-polyfill/src/eventsource.min.js', '@angular/router', 'lodash/clone', 'html2pdf.js', '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.last, global.moment, global.flatten, global.hasIn, global.first, global.cloneDeep$1, global.compact, global.uniqBy, global.concat, global.momentRange, global.ng.forms, global.fromPairs, global._, global.eventsource_min_js, global.ng.router, global.clone, global.html2pdf, global.jsPDF, global.autoTable, global.stripeJs, global.xlsx, global.FileSaver));
-})(this, (function (exports, i0, i1$1, i1, rxjs, operators, classTransformer, angularJwt, get, last, moment, flatten, hasIn, first, cloneDeep$1, compact, uniqBy, concat, momentRange, forms, fromPairs, _, eventsource_min_js, i1$2, clone, html2pdf, 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/last'), require('moment'), require('lodash/flatten'), require('lodash/hasIn'), require('lodash/first'), require('lodash/uniqBy'), require('lodash/concat'), require('rxjs/internal/observable/throwError'), require('lodash/cloneDeep'), require('lodash/compact'), require('moment-range'), require('@angular/forms'), require('lodash/fromPairs'), require('lodash'), require('event-source-polyfill/src/eventsource.min.js'), require('@angular/router'), require('lodash/clone'), require('html2pdf.js'), 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/last', 'moment', 'lodash/flatten', 'lodash/hasIn', 'lodash/first', 'lodash/uniqBy', 'lodash/concat', 'rxjs/internal/observable/throwError', 'lodash/cloneDeep', 'lodash/compact', 'moment-range', '@angular/forms', 'lodash/fromPairs', 'lodash', 'event-source-polyfill/src/eventsource.min.js', '@angular/router', 'lodash/clone', 'html2pdf.js', '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.last, global.moment, global.flatten, global.hasIn, global.first, global.uniqBy, global.concat, global.rxjs["internal/observable/throwError"], global.cloneDeep$1, global.compact, global.momentRange, global.ng.forms, global.fromPairs, global._, global.eventsource_min_js, global.ng.router, global.clone, global.html2pdf, global.jsPDF, global.autoTable, global.stripeJs, global.xlsx, global.FileSaver));
+})(this, (function (exports, i0, i1$1, i1, rxjs, operators, classTransformer, angularJwt, get, last, moment, flatten, hasIn, first, uniqBy, concat, throwError, cloneDeep$1, compact, momentRange, forms, fromPairs, _, eventsource_min_js, i1$2, clone, html2pdf, jsPDF, autoTable, stripeJs, xlsx, FileSaver) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -33,10 +33,10 @@
     var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
     var hasIn__default = /*#__PURE__*/_interopDefaultLegacy(hasIn);
     var first__default = /*#__PURE__*/_interopDefaultLegacy(first);
-    var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep$1);
-    var compact__default = /*#__PURE__*/_interopDefaultLegacy(compact);
     var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
     var concat__default = /*#__PURE__*/_interopDefaultLegacy(concat);
+    var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep$1);
+    var compact__default = /*#__PURE__*/_interopDefaultLegacy(compact);
     var fromPairs__default = /*#__PURE__*/_interopDefaultLegacy(fromPairs);
     var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
     var i1__namespace$2 = /*#__PURE__*/_interopNamespace(i1$2);
@@ -88,9 +88,9 @@
         };
         return CorelogicService;
     }());
-    CorelogicService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    CorelogicService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicService, decorators: [{
+    CorelogicService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    CorelogicService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -135,9 +135,9 @@
         };
         return CorelogicInterceptor;
     }());
-    CorelogicInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicInterceptor, deps: [{ token: CorelogicService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    CorelogicInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: CorelogicInterceptor, decorators: [{
+    CorelogicInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicInterceptor, deps: [{ token: CorelogicService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    CorelogicInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: CorelogicInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: CorelogicService }, { type: undefined, decorators: [{
@@ -176,9 +176,9 @@
         };
         return FinancialYearInterceptor;
     }());
-    FinancialYearInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FinancialYearInterceptor, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    FinancialYearInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FinancialYearInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FinancialYearInterceptor, decorators: [{
+    FinancialYearInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FinancialYearInterceptor, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    FinancialYearInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FinancialYearInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FinancialYearInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: undefined, decorators: [{
@@ -187,7 +187,7 @@
                         }] }];
         } });
 
-    /******************************************************************************
+    /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -349,11 +349,7 @@
     var __createBinding = Object.create ? (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
-        var desc = Object.getOwnPropertyDescriptor(m, k);
-        if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-            desc = { enumerable: true, get: function () { return m[k]; } };
-        }
-        Object.defineProperty(o, k2, desc);
+        Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
     }) : (function (o, m, k, k2) {
         if (k2 === undefined)
             k2 = k;
@@ -508,11 +504,6 @@
             throw new TypeError("Cannot write private member to an object whose class did not declare it");
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
-    function __classPrivateFieldIn(state, receiver) {
-        if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function"))
-            throw new TypeError("Cannot use 'in' operator on non-object");
-        return typeof state === "function" ? receiver === state : state.has(receiver);
-    }
 
     var NAME_TOKEN = 'token';
     var NAME_REFRESH_TOKEN = 'refreshToken';
@@ -543,9 +534,9 @@
         };
         return JwtService;
     }(angularJwt.JwtHelperService));
-    JwtService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    JwtService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtService, decorators: [{
+    JwtService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    JwtService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -619,9 +610,9 @@
         };
         return EventDispatcherService;
     }());
-    EventDispatcherService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EventDispatcherService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    EventDispatcherService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EventDispatcherService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EventDispatcherService, decorators: [{
+    EventDispatcherService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EventDispatcherService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    EventDispatcherService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EventDispatcherService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EventDispatcherService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -675,9 +666,9 @@
         };
         return AuthService;
     }());
-    AuthService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AuthService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    AuthService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AuthService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AuthService, decorators: [{
+    AuthService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AuthService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    AuthService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AuthService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: AuthService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -766,6 +757,11 @@
         };
         JwtInterceptor.prototype.handle401Error = function (req, next, err) {
             var _this = this;
+            var _a;
+            // skip 401 errors not from JWT (basiq login case or other)
+            if (!((_a = err.error.message) === null || _a === void 0 ? void 0 : _a.includes('JWT Token'))) {
+                return rxjs.throwError(err);
+            }
             if (req.url.includes('token/refresh') || req.url.includes('login')) {
                 if (req.url.includes('token/refresh')) {
                     this.authService.logoutFront();
@@ -813,9 +809,9 @@
         };
         return JwtInterceptor;
     }());
-    JwtInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtInterceptor, deps: [{ token: JwtService }, { token: AuthService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    JwtInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: JwtInterceptor, decorators: [{
+    JwtInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtInterceptor, deps: [{ token: JwtService }, { token: AuthService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    JwtInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: JwtInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: JwtService }, { type: AuthService }, { type: undefined, decorators: [{
@@ -853,9 +849,9 @@
         };
         return UserSwitcherService;
     }());
-    UserSwitcherService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserSwitcherService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherService, decorators: [{
+    UserSwitcherService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserSwitcherService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -892,9 +888,9 @@
         };
         return UserSwitcherInterceptor;
     }());
-    UserSwitcherInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherInterceptor, deps: [{ token: UserSwitcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserSwitcherInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserSwitcherInterceptor, decorators: [{
+    UserSwitcherInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherInterceptor, deps: [{ token: UserSwitcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserSwitcherInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserSwitcherInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
             return [{ type: UserSwitcherService }, { type: undefined, decorators: [{
@@ -1055,6 +1051,7 @@
         TRANSACTIONS_ALLOCATIONS_POST: new Endpoint('POST', '\\/transactions-allocations'),
         TRANSACTIONS_ALLOCATIONS_DELETE: new Endpoint('DELETE', '\\/transactions-allocations\\/\\d+'),
         USER_CONFIRMATION_POST: new Endpoint('POST', '\\/users\\/confirmation'),
+        USER_CONFIRMATION_RESEND_POST: new Endpoint('POST', '\\/users\\/confirmation\\/resend'),
         USER_CURRENT_GET: new Endpoint('GET', '\\/users\\/current'),
         USER_CURRENT_PASSWORD_PUT: new Endpoint('PUT', '\\/users\\/current\\/password\.\*'),
         USER_EVENT_SETTINGS_GET: new Endpoint('GET', '\\/user-event-settings'),
@@ -1097,9 +1094,9 @@
         };
         return PreloaderService;
     }());
-    PreloaderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PreloaderService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderService, decorators: [{
+    PreloaderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PreloaderService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -1129,9 +1126,9 @@
         };
         return PreloaderInterceptor;
     }());
-    PreloaderInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderInterceptor, deps: [{ token: PreloaderService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PreloaderInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PreloaderInterceptor, decorators: [{
+    PreloaderInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderInterceptor, deps: [{ token: PreloaderService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PreloaderInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PreloaderInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: PreloaderService }]; } });
 
@@ -1272,9 +1269,9 @@
         };
         return ToastService;
     }());
-    ToastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ToastService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ToastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ToastService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ToastService, decorators: [{
+    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'
@@ -1480,9 +1477,9 @@
         RestService.prototype.listenEvents = function () { };
         return RestService;
     }());
-    RestService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: RestService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: RestService, decorators: [{
+    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,
                 args: [{
                         providedIn: 'root'
@@ -2802,6 +2799,9 @@
         Collection.prototype.getIds = function () {
             return this.items.map(function (item) { return item['id']; });
         };
+        Collection.prototype.mapBy = function (path) {
+            return this.items.map(function (item) { return get__default["default"](item, path); });
+        };
         Collection.prototype.sortBy = function (field, isDesc) {
             if (field === void 0) { field = 'id'; }
             if (isDesc === void 0) { isDesc = true; }
@@ -2864,8 +2864,8 @@
         Collection.prototype.remove = function (items) {
             return this.filter(function (model) { return !items.map(function (item) { return item.id; }).includes(model.id); });
         };
-        Collection.prototype.removeBy = function (path, value) {
-            return this.filter(function (item) { return get__default["default"](item, path) !== value; });
+        Collection.prototype.removeBy = function (path, values) {
+            return this.filter(function (item) { return !(Array.isArray(values) ? values : [values]).includes(get__default["default"](item, path)); });
         };
         return Collection;
     }());
@@ -3149,6 +3149,11 @@
             if (unitOfTime === void 0) { unitOfTime = 'days'; }
             return moment__namespace(sale.contractDate).diff(moment__namespace(this.contractDate), unitOfTime);
         };
+        /**
+         * Tax Position = Income - Expense - Interest - Depreciation
+         * Where (Income - Expense - Interest) is cash position.
+         * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217415928/Dashboard+Property
+         */
         Property.prototype.getTaxPosition = function (transactions, depreciations) {
             return transactions.cashPosition - Math.abs(depreciations.claimAmount);
         };
@@ -3235,6 +3240,20 @@
         return Bank;
     }(AbstractModel));
 
+    var BankPopularEnum;
+    (function (BankPopularEnum) {
+        BankPopularEnum["BANKWEST"] = "Bank of Western Australia trading as BankWest";
+        BankPopularEnum["ANZ"] = "Australia and New Zealand Banking Group Limited";
+        BankPopularEnum["CBA"] = "Commonwealth Bank Australia";
+        BankPopularEnum["WESTPAC"] = "Westpac Banking Corporation";
+        BankPopularEnum["BENDIGO"] = "Bendigo and Adelaide Bank Limited";
+        BankPopularEnum["ING_DIRECT"] = "ING Bank (Australia) Limited (trading as ING Direct)";
+        BankPopularEnum["ST_GEORGE"] = "St. George Bank (a subsidiary of Westpac)";
+        BankPopularEnum["SUNCORP"] = "Suncorp-Metway Limited";
+        BankPopularEnum["CITIBANK"] = "Citibank";
+        BankPopularEnum["BOQ"] = "Bank of Queensland Limited";
+    })(BankPopularEnum || (BankPopularEnum = {}));
+
     var Bank = /** @class */ (function (_super) {
         __extends(Bank, _super);
         function Bank() {
@@ -3257,6 +3276,13 @@
             return value ? value.replace(' ', '%20') : null;
         })
     ], Bank.prototype, "logo", void 0);
+    __decorate([
+        classTransformer.Transform(function (_a) {
+            var obj = _a.obj;
+            return Object.values(BankPopularEnum).includes(obj.name);
+        }),
+        classTransformer.Expose()
+    ], Bank.prototype, "isPopular", void 0);
 
     exports.BankConnectionStatusEnum = void 0;
     (function (BankConnectionStatusEnum) {
@@ -3417,16 +3443,151 @@
         classTransformer.Type(function () { return BankConnection; })
     ], BankAccount.prototype, "bankConnection", void 0);
 
+    var TYPE_LOAN = [
+        exports.BankAccountTypeEnum.MORTGAGE,
+        exports.BankAccountTypeEnum.CREDIT_CARD,
+        exports.BankAccountTypeEnum.LOAN
+    ];
+
     /**
-     * any event happened in the app, which needs to be handled somehow (distributed to other part of the app)
+     * Collection of bank accounts.
      */
-    var AppEvent = /** @class */ (function () {
-        function AppEvent(type, payload) {
-            this.type = type;
-            this.payload = payload;
+    var BankAccountCollection = /** @class */ (function (_super) {
+        __extends(BankAccountCollection, _super);
+        function BankAccountCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
         }
-        return AppEvent;
-    }());
+        /**
+         * get list of bank accounts with passed types
+         */
+        BankAccountCollection.prototype.getByType = function (types, isExclude) {
+            if (isExclude === void 0) { isExclude = false; }
+            // get types always as array (if only one passed)
+            var typesArray = concat__default["default"](types);
+            return this.items.filter(function (bankAccount) {
+                if (isExclude) {
+                    return !typesArray.includes(bankAccount.type);
+                }
+                return typesArray.includes(bankAccount.type);
+            });
+        };
+        /**
+         * get amount of initial loans
+         */
+        BankAccountCollection.prototype.getInitialLoanAmount = function () {
+            return this.getByType(TYPE_LOAN)
+                .reduce(function (sum, bankAccount) {
+                return sum += bankAccount.balances.length ? bankAccount.getOpeningBalance() : 0;
+            }, 0);
+        };
+        /**
+         * get amount of current loans
+         */
+        BankAccountCollection.prototype.getCurrentLoanAmount = function () {
+            return this.getByType(TYPE_LOAN)
+                .reduce(function (sum, bankAccount) {
+                return sum += bankAccount.currentBalance;
+            }, 0);
+        };
+        /**
+         * get collection filtered by property id
+         */
+        BankAccountCollection.prototype.getByPropertyId = function (id) {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) {
+                return bankAccount.bankAccountProperties.find(function (bankAccountProperty) {
+                    return bankAccountProperty.property.id === id;
+                });
+            }));
+        };
+        /**
+         * get collection filtered by properties ids
+         */
+        BankAccountCollection.prototype.getByPropertiesIds = function (ids) {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) {
+                return bankAccount.bankAccountProperties.find(function (bankAccountProperty) {
+                    return ids.includes(bankAccountProperty.property.id);
+                });
+            }));
+        };
+        /**
+         * get collection of active bank accounts
+         */
+        BankAccountCollection.prototype.getActiveBankAccounts = function () {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) {
+                return bankAccount.isActive();
+            }));
+        };
+        /**
+         * get reduction of loan (reduction of principle) percentage
+         */
+        BankAccountCollection.prototype.getPrincipleReductionPercent = function () {
+            var initialLoans = this.getInitialLoanAmount();
+            var currentLoans = this.getCurrentLoanAmount();
+            if (!initialLoans) {
+                return 0;
+            }
+            return (initialLoans - currentLoans) / initialLoans * 100;
+        };
+        /**
+         * Get collection of loan bank accounts
+         */
+        BankAccountCollection.prototype.getLoanAccounts = function () {
+            return new BankAccountCollection(this.getByType(TYPE_LOAN));
+        };
+        BankAccountCollection.prototype.getSavingsAccounts = function () {
+            return new BankAccountCollection(this.getByType(TYPE_LOAN, true));
+        };
+        BankAccountCollection.prototype.getOpeningBalance = function () {
+            return this.items.reduce(function (sum, bankAccount) { return sum + bankAccount.getOpeningBalance(); }, 0);
+        };
+        Object.defineProperty(BankAccountCollection.prototype, "currentBalance", {
+            get: function () {
+                return this.sumBy('currentBalance');
+            },
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * Get Collection of bank accounts with property tank type
+         */
+        BankAccountCollection.prototype.getPropertyBankAccounts = function () {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isPropertyTank(); }));
+        };
+        /**
+         * Get Collection of bank accounts with work tank type
+         */
+        BankAccountCollection.prototype.getWorkBankAccounts = function () {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isWorkTank(); }));
+        };
+        /**
+         * Get Collection of bank accounts by tank type
+         */
+        BankAccountCollection.prototype.getByTankType = function (tankType) {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.tankType === tankType; }));
+        };
+        /**
+         * Get list of all bank account properties
+         */
+        BankAccountCollection.prototype.getBankAccountPropertiesList = function () {
+            return flatten__default["default"](this.items.map(function (bankAccount) {
+                return bankAccount.bankAccountProperties;
+            }));
+        };
+        /**
+         * Get lis of unique properties from all bank accounts properties
+         */
+        BankAccountCollection.prototype.getProperties = function () {
+            return uniqBy__default["default"](this.getBankAccountPropertiesList().map(function (bankAccountProperty) {
+                return bankAccountProperty.property;
+            }), 'id');
+        };
+        BankAccountCollection.prototype.getPropertyBalanceAmount = function (propertyId) {
+            return this.items.reduce(function (sum, bankAccount) {
+                return sum + bankAccount.getPropertyBalanceAmount(propertyId);
+            }, 0);
+        };
+        return BankAccountCollection;
+    }(Collection));
 
     /**
      * BankConnection means user account at specific bank (usually each user has only one at the same bank)
@@ -3442,16 +3603,26 @@
         }
         BankConnectionService.prototype.listenEvents = function () {
             this.listenToAddedBankAccounts();
-            this.listenBasiqJobCreated();
-            this.listenConnectionUpdated();
             this.listenNotifications();
         };
         BankConnectionService.prototype.add = function (bankConnection) {
             var _this = this;
             return this.http.post(this.environment.apiV2 + "/" + this.url, bankConnection)
                 .pipe(operators.map(function (bankConnectionBase) {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BANK_CONNECTION_ADDED, null));
-                return classTransformer.plainToClass(BankConnection, bankConnectionBase);
+                var connection = classTransformer.plainToClass(BankConnection, bankConnectionBase);
+                // We use this endpoint for create and reconnect bank connections because of basiq logic.
+                // So we try to replace bank connection in cache for reconnection case.
+                if (bankConnection.id) {
+                    var tempCache = cloneDeep__default["default"](_this.cache);
+                    replace(tempCache, connection);
+                    _this.cache = cloneDeep__default["default"](tempCache);
+                    _this.cacheSubject.next(tempCache);
+                }
+                else {
+                    _this.cache.push(connection);
+                    _this.cacheSubject.next(cloneDeep__default["default"](_this.cache));
+                }
+                return classTransformer.plainToClass(BankConnection, connection);
             }));
         };
         BankConnectionService.prototype.listenToAddedBankAccounts = function () {
@@ -3460,47 +3631,6 @@
                 _this.resetCache();
             });
         };
-        /**
-         * When user log in to bank, basiq create a job. We create a bank connection with based on this job
-         */
-        BankConnectionService.prototype.listenBasiqJobCreated = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.BASIQ_JOB_CREATED).subscribe(function (result) {
-                // push connection to cache temporary to show it to user directly with pending status and not wait until backend loaded
-                var tempCache = cloneDeep__default["default"](_this.cache);
-                result.connection.setPending();
-                tempCache.push(result.connection);
-                _this.cache = tempCache;
-                _this.cacheSubject.next(tempCache);
-                _this.add(classTransformer.plainToClass(BankConnection, { basiqJob: { externalId: result.jobId } })).subscribe(function (newConnection) {
-                    // replace temporary connection with real saved connection
-                    // no replace() because connection does not have id yet
-                    tempCache.splice(-1, 1, newConnection);
-                    _this.cache = cloneDeep__default["default"](tempCache);
-                    _this.cacheSubject.next(tempCache);
-                });
-            });
-        };
-        /**
-         * When basiq connection disconnected we create a basiq job and update this connection
-         */
-        BankConnectionService.prototype.listenConnectionUpdated = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.BASIQ_CONNECTION_UPDATED).subscribe(function (result) {
-                // replace connection to cache temporary to show pending status until backend loaded
-                var tempCache = cloneDeep__default["default"](_this.cache);
-                result.connection.setPending();
-                replace(tempCache, result.connection);
-                _this.cache = tempCache;
-                _this.cacheSubject.next(tempCache);
-                _this.add(classTransformer.plainToClass(BankConnection, { basiqJob: { externalId: result.jobId } })).subscribe(function (updatedConnection) {
-                    // replace temporary connection again with real updated connection
-                    replace(tempCache, updatedConnection);
-                    _this.cache = cloneDeep__default["default"](tempCache);
-                    _this.cacheSubject.next(tempCache);
-                });
-            });
-        };
         /**
          * Update cache when basiq login failed to get actual connections statuses
          */
@@ -3514,9 +3644,9 @@
         };
         return BankConnectionService;
     }(RestService));
-    BankConnectionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankConnectionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankConnectionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankConnectionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankConnectionService, decorators: [{
+    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'
@@ -3529,9 +3659,7 @@
      */
     var BasiqService = /** @class */ (function (_super) {
         __extends(BasiqService, _super);
-        function BasiqService(http, eventDispatcherService, environment, toastService, 
-        // init BankConnectionService to listen events
-        bankConnectionService) {
+        function BasiqService(http, eventDispatcherService, environment, toastService, bankConnectionService) {
             var _this = _super.call(this, http, eventDispatcherService, environment, toastService) || this;
             _this.http = http;
             _this.eventDispatcherService = eventDispatcherService;
@@ -3549,23 +3677,60 @@
             this.listenNotifications();
         };
         /**
-         * Create Basiq job for the new bank connection creation
+         * Create a new Bank connection based on Basiq job.
+         * Here we have nested requests because we need to get a job id before we create a bank connection.
+         * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components
+         * we interact with basiq service.
          */
-        BasiqService.prototype.createConnection = function (data, userId, connection) {
+        BasiqService.prototype.createConnection = function (loginData, userId) {
             var _this = this;
-            return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", data).pipe(operators.map(function (response) {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_JOB_CREATED, { jobId: response.id, connection: connection }));
-                return response.id;
+            // Send login data to basiq API to create a basiq job
+            return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", loginData)
+                .pipe(operators.mergeMap(function (response) {
+                // Create bank connection based on basiq job
+                return _this.bankConnectionService.add(classTransformer.plainToClass(BankConnection, { basiqJob: { externalId: response.id } }));
+            }), operators.catchError(function (error) {
+                // Show error when user provided wrong login data
+                if (error.status === 401) {
+                    _this.toastService.error('Invalid credentials');
+                }
+                return throwError.throwError(error);
             }));
         };
         /**
          * Update disconnected bank connection
+         * Here we have nested requests because we need to get a job id before we create a bank connection.
+         * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components
+         * we interact with basiq service.
          */
         BasiqService.prototype.updateConnection = function (data, userId, connection) {
             var _this = this;
-            return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", Object.assign(data, { id: connection.externalId })).pipe(operators.map(function (response) {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_CONNECTION_UPDATED, { jobId: response.id, connection: connection }));
-                return response.id;
+            // Send login data to basiq API to create a basiq job
+            return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", Object.assign(data, { id: connection.externalId }))
+                .pipe(
+            // Create bank connection based on basiq job
+            operators.mergeMap(function (response) {
+                return _this.bankConnectionService.add(classTransformer.plainToClass(BankConnection, Object.assign({ id: connection.id, basiqJob: { externalId: response.id } })));
+            }), operators.catchError(function (error) {
+                // Show error when user provided wrong login data
+                if (error.status === 401) {
+                    _this.toastService.error('Invalid credentials');
+                }
+                // Show error when user provided another login (not login he used before)
+                if (error.status === 400) {
+                    _this.toastService.error('Please enter the login you used before');
+                }
+                return throwError.throwError(error);
+            }));
+        };
+        BasiqService.prototype.getByConnection = function (connection) {
+            return this.get().pipe(operators.map(function (bankAccounts) {
+                return new BankAccountCollection(bankAccounts).filterBy('bankConnection.id', connection.id);
+            }));
+        };
+        BasiqService.prototype.getNotImportedByConnection = function (savedAccounts, connection) {
+            return this.getByConnection(connection).pipe(operators.map(function (bankAccounts) {
+                return bankAccounts.removeBy('accountId', savedAccounts.mapBy('accountId'));
             }));
         };
         /**
@@ -3582,9 +3747,9 @@
         return BasiqService;
     }(RestService));
     BasiqService.basiqApiUrl = 'https://au-api.basiq.io';
-    BasiqService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: BankConnectionService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BasiqService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqService, decorators: [{
+    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' }, { token: ToastService }, { token: BankConnectionService }], 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'
@@ -3636,9 +3801,9 @@
         };
         return BasiqTokenService;
     }());
-    BasiqTokenService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqTokenService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BasiqTokenService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqTokenService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqTokenService, decorators: [{
+    BasiqTokenService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasiqTokenService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqTokenService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -3676,9 +3841,9 @@
         };
         return BasiqInterceptor;
     }());
-    BasiqInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqInterceptor, deps: [{ token: BasiqTokenService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BasiqInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqInterceptor });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BasiqInterceptor, decorators: [{
+    BasiqInterceptor.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqInterceptor, deps: [{ token: BasiqTokenService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BasiqInterceptor.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqInterceptor });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BasiqInterceptor, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () { return [{ type: BasiqTokenService }]; } });
 
@@ -3687,9 +3852,9 @@
         }
         return InterceptorsModule;
     }());
-    InterceptorsModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: InterceptorsModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
-    InterceptorsModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: InterceptorsModule });
-    InterceptorsModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: InterceptorsModule, providers: [
+    InterceptorsModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: InterceptorsModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
+    InterceptorsModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: InterceptorsModule });
+    InterceptorsModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: InterceptorsModule, providers: [
             {
                 provide: i1.HTTP_INTERCEPTORS,
                 useClass: CorelogicInterceptor,
@@ -3722,254 +3887,91 @@
                 multi: true
             }
         ] });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: InterceptorsModule, decorators: [{
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: InterceptorsModule, decorators: [{
                 type: i0.NgModule,
                 args: [{
                         providers: [
                             {
                                 provide: i1.HTTP_INTERCEPTORS,
                                 useClass: CorelogicInterceptor,
-                                multi: true
-                            },
-                            // @TODO move to user module
-                            {
-                                provide: i1.HTTP_INTERCEPTORS,
-                                useClass: FinancialYearInterceptor,
-                                multi: true
-                            },
-                            {
-                                provide: i1.HTTP_INTERCEPTORS,
-                                useClass: JwtInterceptor,
-                                multi: true
-                            },
-                            {
-                                provide: i1.HTTP_INTERCEPTORS,
-                                useClass: UserSwitcherInterceptor,
-                                multi: true
-                            },
-                            {
-                                provide: i1.HTTP_INTERCEPTORS,
-                                useClass: PreloaderInterceptor,
-                                multi: true
-                            },
-                            {
-                                provide: i1.HTTP_INTERCEPTORS,
-                                useClass: BasiqInterceptor,
-                                multi: true
-                            }
-                        ]
-                    }]
-            }] });
-
-    var TtCoreModule = /** @class */ (function () {
-        function TtCoreModule() {
-        }
-        TtCoreModule.forRoot = function (environment) {
-            localStorage.setItem('api_uri', environment['api_uri']);
-            return {
-                ngModule: TtCoreModule,
-                providers: [
-                    {
-                        provide: 'environment',
-                        useValue: environment
-                    }
-                ]
-            };
-        };
-        return TtCoreModule;
-    }());
-    TtCoreModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
-    TtCoreModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, imports: [i1$1.CommonModule,
-            InterceptorsModule] });
-    TtCoreModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, imports: [[
-                i1$1.CommonModule,
-                InterceptorsModule
-            ]] });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TtCoreModule, decorators: [{
-                type: i0.NgModule,
-                args: [{
-                        declarations: [],
-                        imports: [
-                            i1$1.CommonModule,
-                            InterceptorsModule
-                        ]
-                    }]
-            }] });
-
-    var AccountSetupItemCollection = /** @class */ (function (_super) {
-        __extends(AccountSetupItemCollection, _super);
-        function AccountSetupItemCollection(items) {
-            var _this = _super.call(this, compact__default["default"](items)) || this;
-            _this.sortBy('isCompleted', false);
-            return _this;
-        }
-        AccountSetupItemCollection.prototype.isCompleted = function () {
-            return this.filterBy('isCompleted', true).length === this.length;
-        };
-        return AccountSetupItemCollection;
-    }(Collection));
-
-    var BankCollection = /** @class */ (function (_super) {
-        __extends(BankCollection, _super);
-        function BankCollection(banks) {
-            var _this = _super.call(this, banks) || this;
-            _this.sortByPopularity();
-            return _this;
-        }
-        BankCollection.prototype.sortByPopularity = function () {
-            this.items.sort(function (bank1, bank2) {
-                // Banks already sorted on backend by name, so we just need to up top-10 banks
-                return (BankCollection.tobBanksIds.includes(bank1.id) && !BankCollection.tobBanksIds.includes(bank2.id)) ? -1 : 1;
-            });
-        };
-        return BankCollection;
-    }(Collection));
-    BankCollection.tobBanksIds = [124, 13, 134, 172, 126, 142, 135, 137, 138, 128];
-
-    var TYPE_LOAN = [
-        exports.BankAccountTypeEnum.MORTGAGE,
-        exports.BankAccountTypeEnum.CREDIT_CARD,
-        exports.BankAccountTypeEnum.LOAN
-    ];
-
-    /**
-     * Collection of bank accounts.
-     */
-    var BankAccountCollection = /** @class */ (function (_super) {
-        __extends(BankAccountCollection, _super);
-        function BankAccountCollection() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * get list of bank accounts with passed types
-         */
-        BankAccountCollection.prototype.getByType = function (types, isExclude) {
-            if (isExclude === void 0) { isExclude = false; }
-            // get types always as array (if only one passed)
-            var typesArray = concat__default["default"](types);
-            return this.items.filter(function (bankAccount) {
-                if (isExclude) {
-                    return !typesArray.includes(bankAccount.type);
-                }
-                return typesArray.includes(bankAccount.type);
-            });
-        };
-        /**
-         * get amount of initial loans
-         */
-        BankAccountCollection.prototype.getInitialLoanAmount = function () {
-            return this.getByType(TYPE_LOAN)
-                .reduce(function (sum, bankAccount) {
-                return sum += bankAccount.balances.length ? bankAccount.getOpeningBalance() : 0;
-            }, 0);
-        };
-        /**
-         * get amount of current loans
-         */
-        BankAccountCollection.prototype.getCurrentLoanAmount = function () {
-            return this.getByType(TYPE_LOAN)
-                .reduce(function (sum, bankAccount) {
-                return sum += bankAccount.currentBalance;
-            }, 0);
-        };
-        /**
-         * get collection filtered by property id
-         */
-        BankAccountCollection.prototype.getByPropertyId = function (id) {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) {
-                return bankAccount.bankAccountProperties.find(function (bankAccountProperty) {
-                    return bankAccountProperty.property.id === id;
-                });
-            }));
-        };
-        /**
-         * get collection filtered by properties ids
-         */
-        BankAccountCollection.prototype.getByPropertiesIds = function (ids) {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) {
-                return bankAccount.bankAccountProperties.find(function (bankAccountProperty) {
-                    return ids.includes(bankAccountProperty.property.id);
-                });
-            }));
-        };
-        /**
-         * get collection of active bank accounts
-         */
-        BankAccountCollection.prototype.getActiveBankAccounts = function () {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) {
-                return bankAccount.isActive();
-            }));
-        };
-        /**
-         * get reduction of loan (reduction of principle) percentage
-         */
-        BankAccountCollection.prototype.getPrincipleReductionPercent = function () {
-            var initialLoans = this.getInitialLoanAmount();
-            var currentLoans = this.getCurrentLoanAmount();
-            if (!initialLoans) {
-                return 0;
-            }
-            return (initialLoans - currentLoans) / initialLoans * 100;
-        };
-        /**
-         * Get collection of loan bank accounts
-         */
-        BankAccountCollection.prototype.getLoanAccounts = function () {
-            return new BankAccountCollection(this.getByType(TYPE_LOAN));
-        };
-        BankAccountCollection.prototype.getSavingsAccounts = function () {
-            return new BankAccountCollection(this.getByType(TYPE_LOAN, true));
-        };
-        BankAccountCollection.prototype.getOpeningBalance = function () {
-            return this.items.reduce(function (sum, bankAccount) { return sum + bankAccount.getOpeningBalance(); }, 0);
-        };
-        Object.defineProperty(BankAccountCollection.prototype, "currentBalance", {
-            get: function () {
-                return this.sumBy('currentBalance');
-            },
-            enumerable: false,
-            configurable: true
-        });
-        /**
-         * Get Collection of bank accounts with property tank type
-         */
-        BankAccountCollection.prototype.getPropertyBankAccounts = function () {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isPropertyTank(); }));
-        };
-        /**
-         * Get Collection of bank accounts with work tank type
-         */
-        BankAccountCollection.prototype.getWorkBankAccounts = function () {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isWorkTank(); }));
-        };
-        /**
-         * Get Collection of bank accounts by tank type
-         */
-        BankAccountCollection.prototype.getByTankType = function (tankType) {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.tankType === tankType; }));
-        };
-        /**
-         * Get list of all bank account properties
-         */
-        BankAccountCollection.prototype.getBankAccountPropertiesList = function () {
-            return flatten__default["default"](this.items.map(function (bankAccount) {
-                return bankAccount.bankAccountProperties;
-            }));
-        };
-        /**
-         * Get lis of unique properties from all bank accounts properties
-         */
-        BankAccountCollection.prototype.getProperties = function () {
-            return uniqBy__default["default"](this.getBankAccountPropertiesList().map(function (bankAccountProperty) {
-                return bankAccountProperty.property;
-            }), 'id');
+                                multi: true
+                            },
+                            // @TODO move to user module
+                            {
+                                provide: i1.HTTP_INTERCEPTORS,
+                                useClass: FinancialYearInterceptor,
+                                multi: true
+                            },
+                            {
+                                provide: i1.HTTP_INTERCEPTORS,
+                                useClass: JwtInterceptor,
+                                multi: true
+                            },
+                            {
+                                provide: i1.HTTP_INTERCEPTORS,
+                                useClass: UserSwitcherInterceptor,
+                                multi: true
+                            },
+                            {
+                                provide: i1.HTTP_INTERCEPTORS,
+                                useClass: PreloaderInterceptor,
+                                multi: true
+                            },
+                            {
+                                provide: i1.HTTP_INTERCEPTORS,
+                                useClass: BasiqInterceptor,
+                                multi: true
+                            }
+                        ]
+                    }]
+            }] });
+
+    var TtCoreModule = /** @class */ (function () {
+        function TtCoreModule() {
+        }
+        TtCoreModule.forRoot = function (environment) {
+            localStorage.setItem('api_uri', environment['api_uri']);
+            return {
+                ngModule: TtCoreModule,
+                providers: [
+                    {
+                        provide: 'environment',
+                        useValue: environment
+                    }
+                ]
+            };
         };
-        BankAccountCollection.prototype.getPropertyBalanceAmount = function (propertyId) {
-            return this.items.reduce(function (sum, bankAccount) {
-                return sum + bankAccount.getPropertyBalanceAmount(propertyId);
-            }, 0);
+        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: [i1$1.CommonModule,
+            InterceptorsModule] });
+    TtCoreModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [[
+                i1$1.CommonModule,
+                InterceptorsModule
+            ]] });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, decorators: [{
+                type: i0.NgModule,
+                args: [{
+                        declarations: [],
+                        imports: [
+                            i1$1.CommonModule,
+                            InterceptorsModule
+                        ]
+                    }]
+            }] });
+
+    var AccountSetupItemCollection = /** @class */ (function (_super) {
+        __extends(AccountSetupItemCollection, _super);
+        function AccountSetupItemCollection(items) {
+            var _this = _super.call(this, compact__default["default"](items)) || this;
+            _this.sortBy('isCompleted', false);
+            return _this;
+        }
+        AccountSetupItemCollection.prototype.isCompleted = function () {
+            return this.filterBy('isCompleted', true).length === this.length;
         };
-        return BankAccountCollection;
+        return AccountSetupItemCollection;
     }(Collection));
 
     exports.TransactionOperationEnum = void 0;
@@ -4908,13 +4910,32 @@
          * Get property with the lowest tax position
          */
         PropertyCollection.prototype.getBestPerformanceTaxProperty = function (transactions, depreciations) {
+            var transactionsByProperty = transactions.groupBy('property.id');
+            var depreciationsByProperty = depreciations.groupBy('property.id');
             return this.items.reduce(function (min, current) {
-                return min.getTaxPosition(transactions.filterBy('property.id', min.id), depreciations.filterBy('property.id', min.id))
-                    > current.getTaxPosition(transactions.filterBy('property.id', current.id), depreciations.filterBy('property.id', current.id))
-                    ? current
-                    : min;
+                var minTaxPosition = min.getTaxPosition(transactionsByProperty.get(min.id), depreciationsByProperty.get(min.id));
+                var currentTaxPosition = current.getTaxPosition(transactionsByProperty.get(current.id), depreciationsByProperty.get(current.id));
+                return minTaxPosition > currentTaxPosition ? current : min;
             }, this.first);
         };
+        /**
+         * Show best performance properties first
+         * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677997/Property+Tank+Dashboard
+         */
+        PropertyCollection.prototype.sortByBestPerformance = function (transactions, depreciations) {
+            var activeProperties = this.getActiveProperties();
+            // nothing to sort when no active properties
+            if (!activeProperties.length) {
+                return this;
+            }
+            var bestProperties = uniqBy__default["default"](this.create([
+                activeProperties.getBestPerformanceGrowthProperty(),
+                activeProperties.getBestPerformanceTaxProperty(transactions, depreciations)
+            ]).toArray(), 'id');
+            var newItems = this.remove(bestProperties).toArray();
+            newItems.unshift.apply(newItems, __spreadArray([], __read(bestProperties)));
+            return this.create(newItems);
+        };
         return PropertyCollection;
     }(Collection));
 
@@ -7514,6 +7535,29 @@
         return AccountSetupItem;
     }(AbstractModel));
 
+    exports.BadgeColorEnum = void 0;
+    (function (BadgeColorEnum) {
+        BadgeColorEnum["DEFAULT"] = "default";
+        BadgeColorEnum["GREEN"] = "green";
+        BadgeColorEnum["GOLD"] = "gold";
+        BadgeColorEnum["GRAY"] = "gray";
+    })(exports.BadgeColorEnum || (exports.BadgeColorEnum = {}));
+
+    /**
+     * Class for UI element badge
+     */
+    var Badge = /** @class */ (function (_super) {
+        __extends(Badge, _super);
+        function Badge(text, color) {
+            var _this = _super.call(this) || this;
+            _this.text = '';
+            _this.text = text;
+            _this.color = color || exports.BadgeColorEnum.DEFAULT;
+            return _this;
+        }
+        return Badge;
+    }(AbstractModel));
+
     /**
      * bank account collection UI class with frontend specific data
      */
@@ -8222,6 +8266,42 @@
         AlphabetColorsEnum["Z"] = "#E3C9CE";
     })(exports.AlphabetColorsEnum || (exports.AlphabetColorsEnum = {}));
 
+    /**
+     * List of objects grouped by passed property
+     */
+    var Dictionary = /** @class */ (function () {
+        function Dictionary(items, path) {
+            if (path === void 0) { path = 'id'; }
+            this.items = {};
+            if (!items.length) {
+                return;
+            }
+            // Do nothing if provided path was not found in the 1st item
+            if (!hasIn__default["default"](items[0], path.split('.')[0])) {
+                return;
+            }
+            this.groupItems(items, path);
+        }
+        Dictionary.prototype.add = function (key, value) {
+            this.items[key] = value;
+        };
+        Dictionary.prototype.get = function (key) {
+            return this.items[key] ? this.items[key] : null;
+        };
+        Dictionary.prototype.groupItems = function (items, path) {
+            var _this = this;
+            items.forEach(function (item) {
+                var key = get__default["default"](item, path);
+                // if object does not have property for grouping it will be grouped as 'other'
+                if (key === undefined) {
+                    key = 'other';
+                }
+                _this.items[key] = item;
+            });
+        };
+        return Dictionary;
+    }());
+
     exports.DepreciationGroupEnum = void 0;
     (function (DepreciationGroupEnum) {
         DepreciationGroupEnum[DepreciationGroupEnum["BUILDING_IMPROVEMENTS"] = 0] = "BUILDING_IMPROVEMENTS";
@@ -8415,6 +8495,17 @@
         classTransformer.Type(function () { return User; })
     ], EmployeeInvite.prototype, "employee", void 0);
 
+    /**
+     * any event happened in the app, which needs to be handled somehow (distributed to other part of the app)
+     */
+    var AppEvent = /** @class */ (function () {
+        function AppEvent(type, payload) {
+            this.type = type;
+            this.payload = payload;
+        }
+        return AppEvent;
+    }());
+
     exports.ExportFormatEnum = void 0;
     (function (ExportFormatEnum) {
         ExportFormatEnum["PDF"] = "PDF";
@@ -10153,9 +10244,9 @@
         };
         return ClientIncomeTypesService;
     }());
-    ClientIncomeTypesService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: ClientIncomeTypesService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientIncomeTypesService, 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'
@@ -10267,9 +10358,9 @@
         };
         return PropertyService;
     }(RestService));
-    PropertyService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyService, 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'
@@ -10364,9 +10455,9 @@
         };
         return IncomeSourceService;
     }(RestService));
-    IncomeSourceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    IncomeSourceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceService, decorators: [{
+    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'
@@ -10454,6 +10545,11 @@
                 return bankAccounts.filter(function (bankAccount) { return bankAccount.isOwner(+localStorage.getItem('userId')); });
             }));
         };
+        BankAccountService.prototype.getByConnection = function (connection) {
+            return this.get().pipe(operators.map(function (bankAccounts) {
+                return new BankAccountCollection(bankAccounts).filterBy('bankConnection.id', connection.id);
+            }));
+        };
         /**
          * Listen to EventDispatcherService events
          */
@@ -10469,9 +10565,9 @@
         };
         return BankAccountService;
     }(RestService));
-    BankAccountService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankAccountService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountService, decorators: [{
+    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'
@@ -10551,9 +10647,9 @@
         };
         return TransactionAllocationService;
     }(RestService));
-    TransactionAllocationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionAllocationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TransactionAllocationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionAllocationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionAllocationService, decorators: [{
+    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'
@@ -10586,9 +10682,9 @@
         }
         return VehicleClaimService;
     }(RestService));
-    VehicleClaimService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleClaimService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    VehicleClaimService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleClaimService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleClaimService, decorators: [{
+    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'
@@ -10923,9 +11019,9 @@
         };
         return TransactionService;
     }(RestService));
-    TransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TransactionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionService, decorators: [{
+    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'
@@ -11061,9 +11157,9 @@
         };
         return AccountSetupService;
     }());
-    AccountSetupService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    AccountSetupService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, decorators: [{
+    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 }, { token: TransactionService }], 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'
@@ -11092,9 +11188,9 @@
         };
         return AddressService;
     }());
-    AddressService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: AddressService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AddressService, decorators: [{
+    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'
@@ -11142,9 +11238,9 @@
         };
         return AssetsService;
     }());
-    AssetsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: AssetsService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AssetsService, decorators: [{
+    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'
@@ -11168,11 +11264,17 @@
             _this.isHydra = true;
             return _this;
         }
+        BankService.prototype.get = function () {
+            return _super.prototype.get.call(this).pipe(operators.map(function (banks) {
+                // exclude basiq banks without login fields (basiq may return broken banks without loginFields)
+                return banks.filter(function (bank) { return !bank.externalId || (bank.externalId && bank.loginFields); });
+            }));
+        };
         return BankService;
     }(RestService));
-    BankService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankService, decorators: [{
+    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'
@@ -11237,9 +11339,9 @@
         };
         return BankTransactionCalculationService;
     }());
-    BankTransactionCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankTransactionCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionCalculationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionCalculationService, decorators: [{
+    BankTransactionCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankTransactionCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionCalculationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankTransactionCalculationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -11265,9 +11367,9 @@
         };
         return BankAccountCalculationService;
     }());
-    BankAccountCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountCalculationService, deps: [{ token: BankTransactionCalculationService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankAccountCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountCalculationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankAccountCalculationService, decorators: [{
+    BankAccountCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountCalculationService, deps: [{ token: BankTransactionCalculationService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BankAccountCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountCalculationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankAccountCalculationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -11342,9 +11444,9 @@
         };
         return BankTransactionService;
     }(RestService));
-    BankTransactionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BankTransactionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BankTransactionService, decorators: [{
+    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'
@@ -11406,9 +11508,9 @@
         };
         return BorrowingExpenseService;
     }());
-    BorrowingExpenseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BorrowingExpenseService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    BorrowingExpenseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BorrowingExpenseService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: BorrowingExpenseService, decorators: [{
+    BorrowingExpenseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BorrowingExpenseService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    BorrowingExpenseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BorrowingExpenseService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BorrowingExpenseService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -11491,9 +11593,9 @@
         };
         return ChartAccountsService;
     }());
-    ChartAccountsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ChartAccountsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsService, decorators: [{
+    ChartAccountsService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ChartAccountsService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -11531,9 +11633,9 @@
         };
         return ChartAccountsDepreciationService;
     }(RestService));
-    ChartAccountsDepreciationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsDepreciationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ChartAccountsDepreciationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsDepreciationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChartAccountsDepreciationService, decorators: [{
+    ChartAccountsDepreciationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsDepreciationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ChartAccountsDepreciationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsDepreciationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ChartAccountsDepreciationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -11573,9 +11675,9 @@
         };
         return SseService;
     }());
-    SseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SseService, deps: [{ token: i0__namespace.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SseService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SseService, decorators: [{
+    SseService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, deps: [{ token: i0__namespace.NgZone }, { token: JwtService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SseService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SseService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -11656,9 +11758,9 @@
         };
         return ChatService;
     }(RestService));
-    ChatService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: ChatService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ChatService, decorators: [{
+    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,
                 args: [{
                         providedIn: 'root'
@@ -11710,9 +11812,9 @@
         };
         return MessageService;
     }(RestService));
-    MessageService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: MessageService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageService, decorators: [{
+    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,
                 args: [{
                         providedIn: 'root'
@@ -11826,9 +11928,9 @@
         };
         return MessageDocumentService;
     }());
-    MessageDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageDocumentService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    MessageDocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageDocumentService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: MessageDocumentService, decorators: [{
+    MessageDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageDocumentService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    MessageDocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageDocumentService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: MessageDocumentService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -11930,9 +12032,9 @@
         };
         return ClientInviteService;
     }(RestService));
-    ClientInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ClientInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientInviteService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientInviteService, decorators: [{
+    ClientInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ClientInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientInviteService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientInviteService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12016,9 +12118,9 @@
         };
         return ClientMovementService;
     }(RestService));
-    ClientMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientMovementService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ClientMovementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientMovementService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientMovementService, decorators: [{
+    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'
@@ -12044,9 +12146,9 @@
         };
         return ClientPortfolioReportService;
     }());
-    ClientPortfolioReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientPortfolioReportService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ClientPortfolioReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientPortfolioReportService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ClientPortfolioReportService, decorators: [{
+    ClientPortfolioReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientPortfolioReportService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ClientPortfolioReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientPortfolioReportService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ClientPortfolioReportService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12105,9 +12207,9 @@
         };
         return DepreciationCapitalProjectService;
     }());
-    DepreciationCapitalProjectService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationCapitalProjectService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    DepreciationCapitalProjectService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationCapitalProjectService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationCapitalProjectService, decorators: [{
+    DepreciationCapitalProjectService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationCapitalProjectService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    DepreciationCapitalProjectService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationCapitalProjectService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: DepreciationCapitalProjectService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12213,9 +12315,9 @@
         };
         return DepreciationService;
     }(RestService));
-    DepreciationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    DepreciationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DepreciationService, decorators: [{
+    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'
@@ -12287,9 +12389,9 @@
         };
         return DocumentFolderService;
     }(RestService));
-    DocumentFolderService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DocumentFolderService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    DocumentFolderService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DocumentFolderService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: DocumentFolderService, decorators: [{
+    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'
@@ -12322,9 +12424,9 @@
         };
         return EmployeeService;
     }(RestService));
-    EmployeeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    EmployeeService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeService, decorators: [{
+    EmployeeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    EmployeeService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12371,9 +12473,9 @@
         };
         return EmployeeInviteService;
     }(RestService));
-    EmployeeInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    EmployeeInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeInviteService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EmployeeInviteService, decorators: [{
+    EmployeeInviteService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeInviteService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    EmployeeInviteService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeInviteService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EmployeeInviteService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12444,9 +12546,9 @@
         };
         return FirmService;
     }());
-    FirmService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: FirmService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FirmService, decorators: [{
+    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'
@@ -12478,9 +12580,9 @@
         };
         return ExportFormatterService;
     }());
-    ExportFormatterService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ExportFormatterService, deps: [{ token: i1__namespace$1.CurrencyPipe }, { token: i1__namespace$1.DatePipe }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ExportFormatterService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ExportFormatterService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ExportFormatterService, decorators: [{
+    ExportFormatterService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ExportFormatterService, deps: [{ token: i1__namespace$1.CurrencyPipe }, { token: i1__namespace$1.DatePipe }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ExportFormatterService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ExportFormatterService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ExportFormatterService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12503,9 +12605,9 @@
         };
         return HeaderTitleService;
     }());
-    HeaderTitleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: HeaderTitleService, deps: [{ token: i1__namespace$2.Router }, { token: i1__namespace$2.ActivatedRoute }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    HeaderTitleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: HeaderTitleService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: HeaderTitleService, decorators: [{
+    HeaderTitleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: HeaderTitleService, deps: [{ token: i1__namespace$2.Router }, { token: i1__namespace$2.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'
@@ -12580,9 +12682,9 @@
         };
         return IncomeSourceForecastService;
     }(RestService));
-    IncomeSourceForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    IncomeSourceForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceForecastService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IncomeSourceForecastService, decorators: [{
+    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'
@@ -12657,9 +12759,9 @@
         };
         return SalaryForecastService;
     }(RestService));
-    SalaryForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SalaryForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SalaryForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SalaryForecastService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SalaryForecastService, decorators: [{
+    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'
@@ -12731,9 +12833,9 @@
         };
         return SoleForecastService;
     }(RestService));
-    SoleForecastService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleForecastService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SoleForecastService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleForecastService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SoleForecastService, decorators: [{
+    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'
@@ -12768,9 +12870,9 @@
         };
         return IntercomService;
     }());
-    IntercomService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IntercomService, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    IntercomService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IntercomService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: IntercomService, decorators: [{
+    IntercomService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IntercomService, deps: [{ token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    IntercomService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IntercomService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: IntercomService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12801,9 +12903,9 @@
         };
         return KompassifyService;
     }());
-    KompassifyService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: KompassifyService, deps: [{ token: i1__namespace$2.Router }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    KompassifyService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: KompassifyService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: KompassifyService, decorators: [{
+    KompassifyService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: KompassifyService, deps: [{ token: i1__namespace$2.Router }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    KompassifyService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: KompassifyService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: KompassifyService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -12936,9 +13038,9 @@
         };
         return LoanService;
     }(RestService));
-    LoanService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: LoanService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    LoanService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: LoanService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: LoanService, decorators: [{
+    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'
@@ -12985,9 +13087,9 @@
         };
         return ServiceNotificationService;
     }(RestService));
-    ServiceNotificationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: ServiceNotificationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServiceNotificationService, decorators: [{
+    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,
                 args: [{
                         providedIn: 'root'
@@ -13042,9 +13144,9 @@
         };
         return PdfFromDomElementService;
     }());
-    PdfFromDomElementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDomElementService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PdfFromDomElementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDomElementService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDomElementService, decorators: [{
+    PdfFromDomElementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDomElementService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PdfFromDomElementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDomElementService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDomElementService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13127,9 +13229,9 @@
         };
         return PdfFromTableService;
     }());
-    PdfFromTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromTableService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PdfFromTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromTableService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromTableService, decorators: [{
+    PdfFromTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromTableService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PdfFromTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromTableService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromTableService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13168,9 +13270,9 @@
         };
         return PdfFromHtmlTableService;
     }(PdfFromTableService));
-    PdfFromHtmlTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromHtmlTableService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PdfFromHtmlTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromHtmlTableService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromHtmlTableService, decorators: [{
+    PdfFromHtmlTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromHtmlTableService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PdfFromHtmlTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromHtmlTableService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromHtmlTableService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13206,9 +13308,9 @@
         };
         return PdfFromDataTableService;
     }(PdfFromTableService));
-    PdfFromDataTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDataTableService, deps: [{ token: ExportFormatterService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PdfFromDataTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDataTableService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PdfFromDataTableService, decorators: [{
+    PdfFromDataTableService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDataTableService, deps: [{ token: ExportFormatterService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PdfFromDataTableService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDataTableService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PdfFromDataTableService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13265,9 +13367,9 @@
         };
         return PropertyTransactionReportService;
     }());
-    PropertyTransactionReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyTransactionReportService, deps: [{ token: PropertyService }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyTransactionReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyTransactionReportService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyTransactionReportService, decorators: [{
+    PropertyTransactionReportService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyTransactionReportService, deps: [{ token: PropertyService }, { token: TransactionService }, { token: DepreciationService }, { token: ChartAccountsService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyTransactionReportService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyTransactionReportService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyTransactionReportService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13393,11 +13495,43 @@
             // Math abs is required for correct percentage calculation
             return properties.purchasePrice - Math.abs(this.getLoanAmount(properties, bankAccounts, loans));
         };
+        /**
+         * Get dictionary of badges for each property in collection
+         */
+        PropertyCalculationService.prototype.getBadgesByProperty = function (properties, transactions, depreciations) {
+            var _this = this;
+            var badgesByProperty = new Dictionary([]);
+            properties.toArray().forEach(function (property) {
+                badgesByProperty.add(property.id, _this.getBadge(property, properties, transactions, depreciations));
+            });
+            return badgesByProperty;
+        };
+        /**
+         * Get Badge for single property in collection
+         */
+        PropertyCalculationService.prototype.getBadge = function (property, properties, transactions, depreciations) {
+            // best performance properties could be only from active properties list
+            var activeProperties = properties.getActiveProperties();
+            var bestPerformanceGrowthProperty = activeProperties.getBestPerformanceGrowthProperty();
+            var bestPerformanceTaxProperty = activeProperties.getBestPerformanceTaxProperty(transactions, depreciations);
+            switch (true) {
+                case !property.isActive:
+                    return new Badge('Inactive', exports.BadgeColorEnum.GRAY);
+                case property.id === bestPerformanceTaxProperty.id && property.id === bestPerformanceGrowthProperty.id:
+                    return new Badge('Best performance growth & tax', exports.BadgeColorEnum.GOLD);
+                case property.id === bestPerformanceTaxProperty.id:
+                    return new Badge('Best performance tax', exports.BadgeColorEnum.GOLD);
+                case property.id === bestPerformanceGrowthProperty.id:
+                    return new Badge('Best performance growth', exports.BadgeColorEnum.GREEN);
+                default:
+                    return new Badge('Monitoring performance');
+            }
+        };
         return PropertyCalculationService;
     }());
-    PropertyCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCalculationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCalculationService, decorators: [{
+    PropertyCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCalculationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCalculationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13417,9 +13551,9 @@
         }
         return PropertyCategoryService;
     }(RestService));
-    PropertyCategoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyCategoryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryService, decorators: [{
+    PropertyCategoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyCategoryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13476,9 +13610,9 @@
         };
         return PropertyDocumentService;
     }(RestService));
-    PropertyDocumentService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyDocumentService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyDocumentService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyDocumentService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyDocumentService, decorators: [{
+    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'
@@ -13579,9 +13713,9 @@
         };
         return PropertyShareService;
     }(RestService));
-    PropertyShareService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyShareService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyShareService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyShareService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyShareService, decorators: [{
+    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'
@@ -13598,9 +13732,9 @@
         }
         return PropertySaleService;
     }(RestService));
-    PropertySaleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertySaleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertySaleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertySaleService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertySaleService, decorators: [{
+    PropertySaleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertySaleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertySaleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertySaleService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertySaleService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13634,9 +13768,9 @@
         };
         return EquityPositionChartService;
     }());
-    EquityPositionChartService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EquityPositionChartService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    EquityPositionChartService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EquityPositionChartService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: EquityPositionChartService, decorators: [{
+    EquityPositionChartService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EquityPositionChartService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    EquityPositionChartService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EquityPositionChartService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: EquityPositionChartService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13685,9 +13819,9 @@
         };
         return PropertyCategoryMovementService;
     }(RestService));
-    PropertyCategoryMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryMovementService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    PropertyCategoryMovementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryMovementService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: PropertyCategoryMovementService, decorators: [{
+    PropertyCategoryMovementService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryMovementService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    PropertyCategoryMovementService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryMovementService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: PropertyCategoryMovementService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13792,9 +13926,9 @@
         };
         return SubscriptionService;
     }());
-    SubscriptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SubscriptionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    SubscriptionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SubscriptionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: SubscriptionService, decorators: [{
+    SubscriptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, deps: [{ token: i1__namespace.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    SubscriptionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SubscriptionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13820,9 +13954,9 @@
         }
         return ServicePriceService;
     }(RestService));
-    ServicePriceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServicePriceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    ServicePriceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServicePriceService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: ServicePriceService, decorators: [{
+    ServicePriceService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServicePriceService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ServicePriceService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServicePriceService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: ServicePriceService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -13911,9 +14045,9 @@
         };
         return TaxReviewService;
     }(RestService));
-    TaxReviewService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TaxReviewService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewService, decorators: [{
+    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'
@@ -13949,9 +14083,9 @@
         };
         return TaxReviewHistoryService;
     }(RestService));
-    TaxReviewHistoryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewHistoryService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TaxReviewHistoryService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewHistoryService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxReviewHistoryService, decorators: [{
+    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'
@@ -14012,9 +14146,9 @@
         };
         return TaxSummaryService;
     }());
-    TaxSummaryService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: TaxSummaryService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxSummaryService, decorators: [{
+    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'
@@ -14066,9 +14200,9 @@
         };
         return TransactionCalculationService;
     }());
-    TransactionCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TransactionCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionCalculationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TransactionCalculationService, decorators: [{
+    TransactionCalculationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionCalculationService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TransactionCalculationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionCalculationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TransactionCalculationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14103,9 +14237,9 @@
         };
         return OccupationService;
     }());
-    OccupationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: OccupationService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    OccupationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: OccupationService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: OccupationService, decorators: [{
+    OccupationService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: OccupationService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    OccupationService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: OccupationService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: OccupationService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14197,6 +14331,9 @@
         UserService.prototype.resetPassword = function (newPassword, resetToken) {
             return this.http.put(this.environment.apiV2 + "/users/password/reset", { newPassword: newPassword, resetToken: resetToken });
         };
+        UserService.prototype.resendConfirmationEmail = function (email) {
+            return this.http.post(this.environment.apiV2 + "/users/confirmation/resend", { email: email });
+        };
         /**
          * Confirm registered user
          */
@@ -14255,9 +14392,9 @@
         };
         return UserService;
     }());
-    UserService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserService, decorators: [{
+    UserService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, deps: [{ token: i1__namespace.HttpClient }, { token: JwtService }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    UserService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: UserService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14307,9 +14444,9 @@
         };
         return UserEventSettingService;
     }(RestService));
-    UserEventSettingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventSettingService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserEventSettingService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventSettingService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventSettingService, decorators: [{
+    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'
@@ -14327,9 +14464,9 @@
         }
         return UserEventTypeService;
     }(RestService));
-    UserEventTypeService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventTypeService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    UserEventTypeService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventTypeService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: UserEventTypeService, decorators: [{
+    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'
@@ -14398,9 +14535,9 @@
         };
         return VehicleService;
     }(RestService));
-    VehicleService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    VehicleService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleService, decorators: [{
+    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'
@@ -14447,9 +14584,9 @@
         };
         return VehicleLogbookService;
     }());
-    VehicleLogbookService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", 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.16", ngImport: i0__namespace, type: VehicleLogbookService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: VehicleLogbookService, 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'
@@ -14498,9 +14635,9 @@
         };
         return XlsxService;
     }());
-    XlsxService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: XlsxService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    XlsxService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: XlsxService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: XlsxService, decorators: [{
+    XlsxService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: XlsxService, deps: [], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    XlsxService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: XlsxService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: XlsxService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14518,9 +14655,9 @@
         }
         return TaxExemptionService;
     }(RestService));
-    TaxExemptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxExemptionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    TaxExemptionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxExemptionService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: TaxExemptionService, decorators: [{
+    TaxExemptionService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxExemptionService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TaxExemptionService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxExemptionService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TaxExemptionService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14609,9 +14746,9 @@
         auth_type: 'rerequest',
         return_scopes: true
     };
-    FacebookService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FacebookService, deps: [{ token: i1__namespace.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i1__namespace$2.Router }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
-    FacebookService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FacebookService, providedIn: 'root' });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: FacebookService, decorators: [{
+    FacebookService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FacebookService, deps: [{ token: i1__namespace.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i1__namespace$2.Router }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    FacebookService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FacebookService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FacebookService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
@@ -14700,9 +14837,9 @@
     var AbstractForm = /** @class */ (function (_super) {
         __extends(AbstractForm, _super);
         function AbstractForm(controls, model, validatorOrOpts, asyncValidator) {
-            if (model === void 0) { model = {}; }
             var _this = _super.call(this, controls, validatorOrOpts, asyncValidator) || this;
-            _this.model = model;
+            _this.onSubmit = new i0.EventEmitter();
+            _this.model = model || _this.createModelInstance();
             _this.modelClass = _this.model.constructor;
             return _this;
         }
@@ -14718,11 +14855,20 @@
             if (!this.valid) {
                 return null;
             }
-            return classTransformer.plainToClass(this.modelClass, Object.assign({}, this.model, this.value, data));
+            var model = this.createModelInstance(Object.assign({}, this.model, this.value, data));
+            this.onSubmit.emit(model);
+            return model;
+        };
+        AbstractForm.prototype.createModelInstance = function (data) {
+            if (data === void 0) { data = {}; }
+            return classTransformer.plainToClass(this.modelClass, data);
         };
         return AbstractForm;
     }(forms.FormGroup));
 
+    /**
+     * Form with bank account loan details
+     */
     var BankAccountLoanForm = /** @class */ (function (_super) {
         __extends(BankAccountLoanForm, _super);
         function BankAccountLoanForm(loan) {
@@ -14742,117 +14888,154 @@
         return BankAccountLoanForm;
     }(AbstractForm));
 
-    var BankAccountPropertyForm = /** @class */ (function (_super) {
-        __extends(BankAccountPropertyForm, _super);
-        function BankAccountPropertyForm(isLoan, bankAccountProperty) {
-            if (bankAccountProperty === void 0) { bankAccountProperty = classTransformer.plainToClass(BankAccountProperty, {}); }
-            return _super.call(this, {
-                property: new forms.FormControl(bankAccountProperty.property, forms.Validators.required),
-                percent: new forms.FormControl({ value: bankAccountProperty.percent, disabled: !isLoan }, forms.Validators.required)
-            }, bankAccountProperty) || this;
-        }
-        return BankAccountPropertyForm;
-    }(AbstractForm));
-
+    /**
+     * Form array with bank account properties
+     */
     var BankAccountPropertiesForm = /** @class */ (function (_super) {
         __extends(BankAccountPropertiesForm, _super);
-        function BankAccountPropertiesForm(isLoan, bankAccountProperties) {
-            if (bankAccountProperties === void 0) { bankAccountProperties = []; }
-            var _this = _super.call(this, bankAccountProperties.length
-                ? bankAccountProperties.map(function (bankAccountProperty) { return new BankAccountPropertyForm(isLoan, bankAccountProperty); })
-                : [new BankAccountPropertyForm(isLoan)]) || this;
-            _this.isLoan = isLoan;
-            _this.bankAccountProperties = bankAccountProperties;
-            return _this;
+        function BankAccountPropertiesForm(bankAccountProperties) {
+            if (bankAccountProperties === void 0) { bankAccountProperties = [classTransformer.plainToClass(BankAccountProperty, {})]; }
+            return _super.call(this, bankAccountProperties.map(function (bankAccountProperty) {
+                return new forms.FormGroup({
+                    property: new forms.FormControl(bankAccountProperty.property, forms.Validators.required),
+                    percent: new forms.FormControl(bankAccountProperty.percent, forms.Validators.required)
+                });
+            })) || this;
         }
         BankAccountPropertiesForm.prototype.add = function () {
-            this.push(new BankAccountPropertyForm(this.isLoan));
+            this.push(new forms.FormGroup({
+                property: new forms.FormControl(null, forms.Validators.required),
+                percent: new forms.FormControl({
+                    value: 100,
+                    disabled: !this.at(0).contains('percent')
+                }, forms.Validators.required)
+            }));
+        };
+        BankAccountPropertiesForm.prototype.enablePercent = function () {
+            this.controls.forEach(function (propertyFormGroup) {
+                propertyFormGroup.get('percent').enable();
+            });
+        };
+        BankAccountPropertiesForm.prototype.disablePercent = function () {
+            this.controls.forEach(function (propertyFormGroup) {
+                propertyFormGroup.get('percent').disable();
+            });
         };
         return BankAccountPropertiesForm;
     }(forms.FormArray));
 
     /**
-     * Form for additional data for bank accounts. Allow user to set tank type, loan and properties for new not-saved bank accounts.
-     * Works with manual and basiq bank accounts.
+     * Form is using for import basiq bank accounts.
+     * Basiq accounts has all data except tank type, properties and loan partially
      */
-    var BankAccountForm = /** @class */ (function (_super) {
-        __extends(BankAccountForm, _super);
-        function BankAccountForm(bankAccount) {
-            if (bankAccount === void 0) { bankAccount = classTransformer.plainToClass(BankAccount, {}); }
+    var BankAccountImportForm = /** @class */ (function (_super) {
+        __extends(BankAccountImportForm, _super);
+        function BankAccountImportForm(bankAccount) {
             var _this = _super.call(this, {
                 tankType: new forms.FormControl(bankAccount.tankType, forms.Validators.required),
             }, bankAccount) || this;
-            _this.bankAccount = bankAccount;
             if (bankAccount.isLoan()) {
                 _this.addControl('loan', new BankAccountLoanForm(bankAccount.loan));
             }
+            // basiq account import form should be disabled (unchecked) by default
+            _this.disable();
             _this.listenEvents();
             return _this;
         }
-        BankAccountForm.prototype.listenEvents = function () {
+        BankAccountImportForm.prototype.listenEvents = function () {
             this.listenTankTypeChanges();
-            this.listenValueChanges();
-        };
-        Object.defineProperty(BankAccountForm.prototype, "properties", {
-            get: function () {
-                return this.get('bankAccountProperties');
-            },
-            enumerable: false,
-            configurable: true
-        });
-        BankAccountForm.prototype.isLoan = function () {
-            return BankAccount.loanTypes.includes(this.bankAccount.type);
-        };
-        BankAccountForm.prototype.isPropertyTank = function () {
-            return this.get('tankType').value === exports.TankTypeEnum.PROPERTY;
-        };
-        BankAccountForm.prototype.confirm = function () {
-            this.markAllAsTouched();
-            if (this.invalid) {
-                return;
-            }
-            this.isConfirmed = true;
-        };
-        BankAccountForm.prototype.addPropertiesArray = function () {
-            var control = new BankAccountPropertiesForm(this.isLoan(), this.bankAccount.bankAccountProperties);
-            // Default form behaviour is: if we add enabled form control to disabled form group then this form group enable.
-            // Disable form control before add to avoid form group enabling.
-            if (this.disabled) {
-                control.disable();
-            }
-            this.addControl('bankAccountProperties', control);
         };
         /**
-         * Add/Remove properties form array depending on selected tank type
+         * Add/Remove bank account properties form depends on selected tank type
          */
-        BankAccountForm.prototype.listenTankTypeChanges = function () {
-            var _this = this;
-            this.get('tankType').valueChanges.subscribe(function () {
-                _this.isPropertyTank() ? _this.addPropertiesArray() : _this.removeControl('bankAccountProperties');
-            });
-        };
-        BankAccountForm.prototype.listenValueChanges = function () {
+        BankAccountImportForm.prototype.listenTankTypeChanges = function () {
             var _this = this;
-            this.valueChanges.subscribe(function () {
-                _this.isConfirmed = false;
+            this.get('tankType').valueChanges.subscribe(function (tankType) {
+                if (tankType === exports.TankTypeEnum.PROPERTY) {
+                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm());
+                    // property percent allowed only for loan bank accounts
+                    if (!_this.contains('loan')) {
+                        _this.get('bankAccountProperties').disablePercent();
+                    }
+                }
+                else {
+                    _this.removeControl('bankAccountProperties');
+                }
             });
         };
-        return BankAccountForm;
+        return BankAccountImportForm;
     }(AbstractForm));
 
     /**
-     * Form is using for manual bank account creation (not Basiq), prepares bank account data for the next saving.
+     * Form is using for single manual bank account creation (not Basiq)
      */
     var BankAccountAddManualForm = /** @class */ (function (_super) {
         __extends(BankAccountAddManualForm, _super);
         function BankAccountAddManualForm(connection) {
-            return _super.call(this, {
+            var _this = _super.call(this, {
                 type: new forms.FormControl(null, forms.Validators.required),
                 accountName: new forms.FormControl(null, forms.Validators.required),
                 currentBalance: new forms.FormControl(null, forms.Validators.required),
                 accountNumber: new forms.FormControl(null, [forms.Validators.required, forms.Validators.pattern(BankAccountAddManualForm.accountNumberPattern)]),
-            }, classTransformer.plainToClass(BankAccount, { bankConnection: connection })) || this;
+                tankType: new forms.FormControl(null, forms.Validators.required),
+            }) || this;
+            _this.connection = connection;
+            _this.listenEvents();
+            return _this;
         }
+        BankAccountAddManualForm.prototype.listenEvents = function () {
+            this.listenTypeChanges();
+            this.listenTankTypeChanges();
+        };
+        /**
+         * Add/Remove loan form depends on selected bank account type
+         */
+        BankAccountAddManualForm.prototype.listenTypeChanges = function () {
+            var _this = this;
+            this.get('type').valueChanges.subscribe(function (type) {
+                if (BankAccount.loanTypes.includes(type)) {
+                    _this.addControl('loan', new BankAccountLoanForm());
+                    // property percent allowed only for loan bank accounts
+                    if (_this.contains('bankAccountProperties')) {
+                        _this.get('bankAccountProperties').enablePercent();
+                    }
+                }
+                else {
+                    _this.removeControl('loan');
+                    // property percent allowed only for loan bank accounts
+                    if (_this.contains('bankAccountProperties')) {
+                        _this.get('bankAccountProperties').disablePercent();
+                    }
+                }
+            });
+        };
+        /**
+         * Add/Remove bank account properties form depends on selected tank type
+         */
+        BankAccountAddManualForm.prototype.listenTankTypeChanges = function () {
+            var _this = this;
+            this.get('tankType').valueChanges.subscribe(function (tankType) {
+                if (tankType === exports.TankTypeEnum.PROPERTY) {
+                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm());
+                    // property percent allowed only for loan bank accounts
+                    if (_this.contains('loan')) {
+                        _this.get('bankAccountProperties').enablePercent();
+                    }
+                    else {
+                        _this.get('bankAccountProperties').disablePercent();
+                    }
+                }
+                else {
+                    _this.removeControl('bankAccountProperties');
+                }
+            });
+        };
+        /**
+         * Attach bank connection to manual bank account
+         */
+        BankAccountAddManualForm.prototype.submit = function () {
+            return _super.prototype.submit.call(this, { bankConnection: this.connection });
+        };
         return BankAccountAddManualForm;
     }(AbstractForm));
     BankAccountAddManualForm.accountNumberPattern = '^[0-9]{6}[ ]{1}[0-9]{1,}$';
@@ -14879,18 +15062,74 @@
         };
     }
 
-    var BankAccountMigrateForm = /** @class */ (function (_super) {
-        __extends(BankAccountMigrateForm, _super);
-        function BankAccountMigrateForm() {
-            return _super.call(this, {
-                migrateFrom: new forms.FormControl(BankAccountMigrateForm.minDate, [forms.Validators.required, dateRangeValidator(BankAccountMigrateForm.minDate, BankAccountMigrateForm.maxDate)]),
-                migrateTo: new forms.FormControl(BankAccountMigrateForm.maxDate, [forms.Validators.required, dateRangeValidator(BankAccountMigrateForm.minDate, BankAccountMigrateForm.maxDate)])
+    /**
+     * Validator check if at least one control in formArray is enabled
+     */
+    function atLeastOneEnabledValidator(arrayName) {
+        return function (formGroup) {
+            return !!formGroup.get(arrayName).controls.find(function (control) { return control.enabled; })
+                ? null
+                : { arrayControlsDisabled: true };
+        };
+    }
+
+    /**
+     * Form for import multiple basiq bank accounts
+     */
+    var BankAccountsImportForm = /** @class */ (function (_super) {
+        __extends(BankAccountsImportForm, _super);
+        function BankAccountsImportForm(bankAccounts) {
+            var _this = _super.call(this, {
+                migrateFrom: new forms.FormControl(BankAccountsImportForm.minDate, [forms.Validators.required, dateRangeValidator(BankAccountsImportForm.minDate, BankAccountsImportForm.maxDate)]),
+                migrateTo: new forms.FormControl(BankAccountsImportForm.maxDate, [forms.Validators.required, dateRangeValidator(BankAccountsImportForm.minDate, BankAccountsImportForm.maxDate)]),
+                bankAccounts: new forms.FormArray(bankAccounts.map(function (bankAccount) { return new BankAccountImportForm(bankAccount); }))
+            }, [], {
+                validators: [atLeastOneEnabledValidator('bankAccounts')]
             }) || this;
+            _this.bankAccounts = bankAccounts;
+            return _this;
         }
-        return BankAccountMigrateForm;
+        BankAccountsImportForm.prototype.submit = function () {
+            var e_1, _a;
+            this.submitted = true;
+            if (this.invalid) {
+                return null;
+            }
+            var bankAccounts = [];
+            try {
+                // form is valid when all selected bank accounts forms are valid
+                for (var _b = __values(this.get('bankAccounts').controls), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var bankAccountImportForm = _c.value;
+                    // skip disabled forms
+                    if (bankAccountImportForm.disabled) {
+                        continue;
+                    }
+                    var bankAccount = bankAccountImportForm.submit({
+                        migrateFrom: this.value.migrateFrom,
+                        migrateTo: this.value.migrateTo
+                    });
+                    if (!bankAccount) {
+                        return null;
+                    }
+                    bankAccounts.push(bankAccount);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            if (!bankAccounts.length) {
+                return null;
+            }
+            return bankAccounts;
+        };
+        return BankAccountsImportForm;
     }(AbstractForm));
-    BankAccountMigrateForm.minDate = new FinancialYear().prevFinYear.startDate;
-    BankAccountMigrateForm.maxDate = new Date();
+    BankAccountsImportForm.minDate = new FinancialYear().prevFinYear.startDate;
+    BankAccountsImportForm.maxDate = new Date();
 
     /**
      * Form with basiq bank login fields.
@@ -14923,15 +15162,11 @@
 
     /**
      * Validation function for autocomplete fields. Checks that the user should select a value from a list rather than type in input field
+     * @TODO Alex: create class AppValidators with static methods and move there all custom validators (line Angular Validators)
      */
-    function requireAutocomplete() {
+    function autocompleteValidator() {
         return function (control) {
-            if (typeof control.value === 'string' && !!control.value) {
-                return { notFromList: true };
-            }
-            else {
-                return null;
-            }
+            return (!control.value || (typeof control.value === 'object')) ? null : { notFromList: true };
         };
     }
 
@@ -14973,21 +15208,6 @@
         };
     }
 
-    /**
-     * Validation function, that checks that the user should select a value from a list rather than type in input field
-     */
-    function requireSelectValidator() {
-        return function (control) {
-            var selection = control.value;
-            if (typeof selection === 'string' && !!selection) {
-                return { notFromList: true };
-            }
-            else {
-                return null;
-            }
-        };
-    }
-
     var ClientIncomeTypesForm = /** @class */ (function (_super) {
         __extends(ClientIncomeTypesForm, _super);
         function ClientIncomeTypesForm(clientIncomeTypes) {
@@ -15015,13 +15235,14 @@
         return LoginForm;
     }(AbstractForm));
 
+    // @TODO Alex: Create a model and handle request fields via class-transformer
     var PasswordForm = /** @class */ (function (_super) {
         __extends(PasswordForm, _super);
         function PasswordForm() {
             return _super.call(this, {
                 password: new forms.FormControl(null, [forms.Validators.required, passwordValidator()]),
                 confirm: new forms.FormControl(null, forms.Validators.required),
-            }, {}, passwordMatchValidator('password', 'confirm')) || this;
+            }, { password: null, confirm: null }, passwordMatchValidator('password', 'confirm')) || this;
         }
         return PasswordForm;
     }(AbstractForm));
@@ -15070,6 +15291,7 @@
         return RegisterFirmForm;
     }(AbstractForm));
 
+    // @TODO Alex: Create a model and handle request fields via class-transformer
     var ResetPasswordForm = /** @class */ (function (_super) {
         __extends(ResetPasswordForm, _super);
         function ResetPasswordForm() {
@@ -15335,7 +15557,7 @@
         __extends(MyTaxIncomeStatementsForm, _super);
         function MyTaxIncomeStatementsForm(incomeStatements, user) {
             var _this = _super.call(this, {
-                occupation: new forms.FormControl(user.clientDetails.occupation, [forms.Validators.required, requireSelectValidator()]),
+                occupation: new forms.FormControl(user.clientDetails.occupation, [forms.Validators.required, autocompleteValidator()]),
                 allowanceTotalAmount: new forms.FormControl({
                     value: incomeStatements.allowanceTotalAmount,
                     disabled: true
@@ -15606,20 +15828,19 @@
     exports.AssetsService = AssetsService;
     exports.AuthService = AuthService;
     exports.BANK_ACCOUNT_TYPES = BANK_ACCOUNT_TYPES;
+    exports.Badge = Badge;
     exports.Bank = Bank;
     exports.BankAccount = BankAccount;
     exports.BankAccountAddManualForm = BankAccountAddManualForm;
     exports.BankAccountCalculationService = BankAccountCalculationService;
     exports.BankAccountChartData = BankAccountChartData;
     exports.BankAccountCollection = BankAccountCollection;
-    exports.BankAccountForm = BankAccountForm;
+    exports.BankAccountImportForm = BankAccountImportForm;
     exports.BankAccountLoanForm = BankAccountLoanForm;
-    exports.BankAccountMigrateForm = BankAccountMigrateForm;
     exports.BankAccountPropertiesForm = BankAccountPropertiesForm;
     exports.BankAccountProperty = BankAccountProperty;
-    exports.BankAccountPropertyForm = BankAccountPropertyForm;
     exports.BankAccountService = BankAccountService;
-    exports.BankCollection = BankCollection;
+    exports.BankAccountsImportForm = BankAccountsImportForm;
     exports.BankConnection = BankConnection;
     exports.BankConnectionService = BankConnectionService;
     exports.BankLoginData = BankLoginData;
@@ -15688,6 +15909,7 @@
     exports.DepreciationReportItem = DepreciationReportItem;
     exports.DepreciationReportItemCollection = DepreciationReportItemCollection;
     exports.DepreciationService = DepreciationService;
+    exports.Dictionary = Dictionary;
     exports.Document = Document;
     exports.DocumentFolder = DocumentFolder;
     exports.DocumentFolderService = DocumentFolderService;
@@ -15875,6 +16097,7 @@
     exports.XlsxService = XlsxService;
     exports.atLeastOneCheckedValidator = atLeastOneCheckedValidator;
     exports.atoLinks = atoLinks;
+    exports.autocompleteValidator = autocompleteValidator;
     exports.cloneDeep = cloneDeep;
     exports.compare = compare;
     exports.compareMatOptions = compareMatOptions;
@@ -15885,8 +16108,6 @@
     exports.passwordMatchValidator = passwordMatchValidator;
     exports.passwordValidator = passwordValidator;
     exports.replace = replace;
-    exports.requireAutocomplete = requireAutocomplete;
-    exports.requireSelectValidator = requireSelectValidator;
     exports.roundTo = roundTo;
     exports.sort = sort;
     exports.sortDeep = sortDeep;