taxtank-core 0.28.35 → 0.28.37

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('lodash/flatten'), require('lodash/hasIn'), require('lodash/first'), require('moment'), require('moment-range'), require('lodash/uniqBy'), require('lodash/concat'), require('rxjs/internal/observable/throwError'), require('lodash/cloneDeep'), require('event-source-polyfill/src/eventsource.min.js'), require('lodash/compact'), require('lodash/differenceBy'), require('@angular/forms'), require('lodash/merge'), require('lodash/isEqual'), require('lodash/fromPairs'), require('lodash'), 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', 'lodash/flatten', 'lodash/hasIn', 'lodash/first', 'moment', 'moment-range', 'lodash/uniqBy', 'lodash/concat', 'rxjs/internal/observable/throwError', 'lodash/cloneDeep', 'event-source-polyfill/src/eventsource.min.js', 'lodash/compact', 'lodash/differenceBy', '@angular/forms', 'lodash/merge', 'lodash/isEqual', 'lodash/fromPairs', 'lodash', '@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.flatten, global.hasIn, global.first, global.moment$1, global.momentRange, global.uniqBy, global.concat, global.rxjs["internal/observable/throwError"], global.cloneDeep$1, global.eventsource_min_js, global.compact, global.differenceBy, global.ng.forms, global.merge, global.isEqual, global.fromPairs, global._, 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, flatten, hasIn, first, moment$1, momentRange, uniqBy, concat, throwError, cloneDeep$1, eventsource_min_js, compact, differenceBy, forms, merge, isEqual, fromPairs, _, 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/operators'), require('rxjs'), require('class-transformer'), require('@auth0/angular-jwt'), require('lodash/get'), require('lodash/flatten'), require('lodash/hasIn'), require('lodash/first'), require('lodash/last'), require('lodash/uniqBy'), require('lodash/concat'), require('rxjs/internal/observable/throwError'), require('moment'), require('moment-range'), require('lodash/cloneDeep'), require('event-source-polyfill/src/eventsource.min.js'), require('lodash/compact'), require('lodash/differenceBy'), require('@angular/forms'), require('lodash/merge'), require('lodash/isEqual'), require('lodash/fromPairs'), require('lodash'), 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/operators', 'rxjs', 'class-transformer', '@auth0/angular-jwt', 'lodash/get', 'lodash/flatten', 'lodash/hasIn', 'lodash/first', 'lodash/last', 'lodash/uniqBy', 'lodash/concat', 'rxjs/internal/observable/throwError', 'moment', 'moment-range', 'lodash/cloneDeep', 'event-source-polyfill/src/eventsource.min.js', 'lodash/compact', 'lodash/differenceBy', '@angular/forms', 'lodash/merge', 'lodash/isEqual', 'lodash/fromPairs', 'lodash', '@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.operators, global.rxjs, global.classTransformer, global.angularJwt, global.get, global.flatten, global.hasIn, global.first, global.last, global.uniqBy, global.concat, global.rxjs["internal/observable/throwError"], global.moment$1, global.momentRange, global.cloneDeep$1, global.eventsource_min_js, global.compact, global.differenceBy, global.ng.forms, global.merge, global.isEqual, global.fromPairs, global._, global.ng.router, global.clone, global.html2pdf, global.jsPDF, global.autoTable, global.stripeJs, global.xlsx, global.FileSaver));
+})(this, (function (exports, i0, i1$1, i1, operators, rxjs, classTransformer, angularJwt, get, flatten, hasIn, first, last, uniqBy, concat, throwError, moment$1, momentRange, cloneDeep$1, eventsource_min_js, compact, differenceBy, forms, merge, isEqual, fromPairs, _, 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 }; }
 
@@ -28,13 +28,13 @@
     var i1__namespace$1 = /*#__PURE__*/_interopNamespace(i1$1);
     var i1__namespace = /*#__PURE__*/_interopNamespace(i1);
     var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
-    var last__default = /*#__PURE__*/_interopDefaultLegacy(last);
     var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
     var hasIn__default = /*#__PURE__*/_interopDefaultLegacy(hasIn);
     var first__default = /*#__PURE__*/_interopDefaultLegacy(first);
-    var moment__namespace = /*#__PURE__*/_interopNamespace(moment$1);
+    var last__default = /*#__PURE__*/_interopDefaultLegacy(last);
     var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
     var concat__default = /*#__PURE__*/_interopDefaultLegacy(concat);
+    var moment__namespace = /*#__PURE__*/_interopNamespace(moment$1);
     var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep$1);
     var compact__default = /*#__PURE__*/_interopDefaultLegacy(compact);
     var differenceBy__default = /*#__PURE__*/_interopDefaultLegacy(differenceBy);
@@ -113,28 +113,27 @@
             this.corelogicService = corelogicService;
             this.environment = environment;
         }
-        /**
-         * Check if requested url requested core logic, but not core logic auth api
-         * @param req
-         */
-        CorelogicInterceptor.prototype.addToken = function (req) {
-            // don't need token for this endpoint
-            if (req.url.includes(this.environment.coreLogicUrl + "/access/oauth/token")) {
-                return req;
+        CorelogicInterceptor.prototype.intercept = function (request, next) {
+            var _this = this;
+            // skip non-corelogic requests
+            if (!request.url.includes(this.environment.coreLogicUrl)) {
+                return next.handle(request);
             }
-            // add core logic token to request headers
-            if (req.url.includes(this.environment.coreLogicUrl)) {
-                return req.clone({
-                    setHeaders: {
-                        Authorization: 'Bearer ' + this.corelogicService._accessToken
-                    }
-                });
+            // don't need token for this endpoint
+            if (request.url.includes(this.environment.coreLogicUrl + "/access/oauth/token")) {
+                return next.handle(request);
             }
-            // return request without changes if url not related with core logic
-            return req;
+            return this.corelogicService.getAccessToken()
+                .pipe(operators.mergeMap(function (token) {
+                return next.handle(_this.addToken(request, token));
+            }));
         };
-        CorelogicInterceptor.prototype.intercept = function (request, next) {
-            return next.handle(this.addToken(request));
+        CorelogicInterceptor.prototype.addToken = function (request, token) {
+            return request.clone({
+                setHeaders: {
+                    Authorization: 'Bearer ' + token
+                }
+            });
         };
         return CorelogicInterceptor;
     }());
@@ -557,62 +556,63 @@
         AppEventTypeEnum[AppEventTypeEnum["BASIQ_CONSENT_UPDATED"] = 5] = "BASIQ_CONSENT_UPDATED";
         AppEventTypeEnum[AppEventTypeEnum["BASIQ_CONNECTION_UPDATED"] = 6] = "BASIQ_CONNECTION_UPDATED";
         AppEventTypeEnum[AppEventTypeEnum["BASIQ_JOB_CREATED"] = 7] = "BASIQ_JOB_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["CLIENT_INVITE_ACCEPTED"] = 8] = "CLIENT_INVITE_ACCEPTED";
-        AppEventTypeEnum[AppEventTypeEnum["CLIENT_OPEN_CHAT"] = 9] = "CLIENT_OPEN_CHAT";
-        AppEventTypeEnum[AppEventTypeEnum["CLIENT_TRANSFER_TO_OTHER_EMPLOYEE"] = 10] = "CLIENT_TRANSFER_TO_OTHER_EMPLOYEE";
-        AppEventTypeEnum[AppEventTypeEnum["CURRENT_USER_GET_FAILED"] = 11] = "CURRENT_USER_GET_FAILED";
-        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_DELETED"] = 12] = "DEPRECIATION_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATIONS_CREATED"] = 13] = "DEPRECIATIONS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_UPDATED_WITH_RECEIPT"] = 14] = "DEPRECIATION_UPDATED_WITH_RECEIPT";
-        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT"] = 15] = "DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT";
-        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_RECEIPT_CREATED"] = 16] = "DEPRECIATION_RECEIPT_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_RECEIPT_DELETED"] = 17] = "DEPRECIATION_RECEIPT_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_CREATED"] = 18] = "INCOME_SOURCES_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_UPDATED"] = 19] = "INCOME_SOURCES_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_CREATED"] = 20] = "INCOME_SOURCES_FORECASTS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_UPDATED"] = 21] = "INCOME_SOURCES_FORECASTS_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["LOAN_UPDATED"] = 22] = "LOAN_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["LOAN_PAYOUT_UPDATED"] = 23] = "LOAN_PAYOUT_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["MESSAGE_CREATED"] = 24] = "MESSAGE_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_CREATED"] = 25] = "MESSAGE_FILE_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_DELETED"] = 26] = "MESSAGE_FILE_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["NOTIFICATION_ADDED"] = 27] = "NOTIFICATION_ADDED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DEPRECIATION_CALCULATION_UPDATED"] = 28] = "PROPERTY_DEPRECIATION_CALCULATION_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED"] = 29] = "PROPERTY_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED_WITH_DOCUMENT"] = 30] = "PROPERTY_UPDATED_WITH_DOCUMENT";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DOCUMENT_ADDED"] = 31] = "PROPERTY_DOCUMENT_ADDED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_CREATED"] = 32] = "PROPERTY_MOVEMENT_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_UPDATED"] = 33] = "PROPERTY_MOVEMENT_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_DELETED"] = 34] = "PROPERTY_MOVEMENT_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SHARE_UPDATED"] = 35] = "PROPERTY_SHARE_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_ADDED"] = 36] = "PROPERTY_SALE_ADDED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_DELETED"] = 37] = "PROPERTY_SALE_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_ADDED"] = 38] = "PROPERTY_SUBSCRIPTION_ADDED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_DELETED"] = 39] = "PROPERTY_SUBSCRIPTION_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_VALUATION_DOCUMENT_CREATED"] = 40] = "PROPERTY_VALUATION_DOCUMENT_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["SERVICE_SUBSCRIPTION_UPDATED"] = 41] = "SERVICE_SUBSCRIPTION_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["SOLE_BUSINESS_CREATED"] = 42] = "SOLE_BUSINESS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["SOLE_DEPRECIATION_METHOD_UPDATED"] = 43] = "SOLE_DEPRECIATION_METHOD_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_CREATED"] = 44] = "SOLE_DETAILS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_UPDATED"] = 45] = "SOLE_DETAILS_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 46] = "TAX_REVIEW_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 47] = "TRANSACTION_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 48] = "TRANSACTION_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 49] = "TRANSACTION_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 50] = "TRANSACTION_UPDATED_WITH_RECEIPT";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 51] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 52] = "TRANSACTION_RECEIPT_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 53] = "TRANSACTION_RECEIPT_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 54] = "TRANSACTIONS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 55] = "USER_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 56] = "VEHICLE_CLAIM_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 57] = "VEHICLE_CLAIM_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 58] = "VEHICLE_CLAIM_DETAILS_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 59] = "VEHICLE_CLAIM_DETAILS_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 60] = "VEHICLE_LOGBOOK_CREATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 61] = "VEHICLE_LOGBOOK_UPDATED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 62] = "VEHICLE_LOGBOOK_DELETED";
-        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 63] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["BASIQ_LOGIN_FINISHED"] = 8] = "BASIQ_LOGIN_FINISHED";
+        AppEventTypeEnum[AppEventTypeEnum["CLIENT_INVITE_ACCEPTED"] = 9] = "CLIENT_INVITE_ACCEPTED";
+        AppEventTypeEnum[AppEventTypeEnum["CLIENT_OPEN_CHAT"] = 10] = "CLIENT_OPEN_CHAT";
+        AppEventTypeEnum[AppEventTypeEnum["CLIENT_TRANSFER_TO_OTHER_EMPLOYEE"] = 11] = "CLIENT_TRANSFER_TO_OTHER_EMPLOYEE";
+        AppEventTypeEnum[AppEventTypeEnum["CURRENT_USER_GET_FAILED"] = 12] = "CURRENT_USER_GET_FAILED";
+        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_DELETED"] = 13] = "DEPRECIATION_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATIONS_CREATED"] = 14] = "DEPRECIATIONS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_UPDATED_WITH_RECEIPT"] = 15] = "DEPRECIATION_UPDATED_WITH_RECEIPT";
+        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT"] = 16] = "DEPRECIATION_UPDATED_WITH_DELETED_RECEIPT";
+        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_RECEIPT_CREATED"] = 17] = "DEPRECIATION_RECEIPT_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["DEPRECIATION_RECEIPT_DELETED"] = 18] = "DEPRECIATION_RECEIPT_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_CREATED"] = 19] = "INCOME_SOURCES_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_UPDATED"] = 20] = "INCOME_SOURCES_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_CREATED"] = 21] = "INCOME_SOURCES_FORECASTS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["INCOME_SOURCES_FORECASTS_UPDATED"] = 22] = "INCOME_SOURCES_FORECASTS_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["LOAN_UPDATED"] = 23] = "LOAN_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["LOAN_PAYOUT_UPDATED"] = 24] = "LOAN_PAYOUT_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["MESSAGE_CREATED"] = 25] = "MESSAGE_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_CREATED"] = 26] = "MESSAGE_FILE_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["MESSAGE_FILE_DELETED"] = 27] = "MESSAGE_FILE_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["NOTIFICATION_ADDED"] = 28] = "NOTIFICATION_ADDED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DEPRECIATION_CALCULATION_UPDATED"] = 29] = "PROPERTY_DEPRECIATION_CALCULATION_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED"] = 30] = "PROPERTY_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_UPDATED_WITH_DOCUMENT"] = 31] = "PROPERTY_UPDATED_WITH_DOCUMENT";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_DOCUMENT_ADDED"] = 32] = "PROPERTY_DOCUMENT_ADDED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_CREATED"] = 33] = "PROPERTY_MOVEMENT_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_UPDATED"] = 34] = "PROPERTY_MOVEMENT_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_MOVEMENT_DELETED"] = 35] = "PROPERTY_MOVEMENT_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SHARE_UPDATED"] = 36] = "PROPERTY_SHARE_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_ADDED"] = 37] = "PROPERTY_SALE_ADDED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SALE_DELETED"] = 38] = "PROPERTY_SALE_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_ADDED"] = 39] = "PROPERTY_SUBSCRIPTION_ADDED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_SUBSCRIPTION_DELETED"] = 40] = "PROPERTY_SUBSCRIPTION_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["PROPERTY_VALUATION_DOCUMENT_CREATED"] = 41] = "PROPERTY_VALUATION_DOCUMENT_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["SERVICE_SUBSCRIPTION_UPDATED"] = 42] = "SERVICE_SUBSCRIPTION_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["SOLE_BUSINESS_CREATED"] = 43] = "SOLE_BUSINESS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["SOLE_DEPRECIATION_METHOD_UPDATED"] = 44] = "SOLE_DEPRECIATION_METHOD_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_CREATED"] = 45] = "SOLE_DETAILS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["SOLE_DETAILS_UPDATED"] = 46] = "SOLE_DETAILS_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["TAX_REVIEW_UPDATED"] = 47] = "TAX_REVIEW_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_CREATED"] = 48] = "TRANSACTION_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_DELETED"] = 49] = "TRANSACTION_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED"] = 50] = "TRANSACTION_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_RECEIPT"] = 51] = "TRANSACTION_UPDATED_WITH_RECEIPT";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_UPDATED_WITH_DELETED_RECEIPT"] = 52] = "TRANSACTION_UPDATED_WITH_DELETED_RECEIPT";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_CREATED"] = 53] = "TRANSACTION_RECEIPT_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTION_RECEIPT_DELETED"] = 54] = "TRANSACTION_RECEIPT_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["TRANSACTIONS_CREATED"] = 55] = "TRANSACTIONS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["USER_UPDATED"] = 56] = "USER_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_UPDATED"] = 57] = "VEHICLE_CLAIM_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_CREATED"] = 58] = "VEHICLE_CLAIM_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_UPDATED"] = 59] = "VEHICLE_CLAIM_DETAILS_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_CLAIM_DETAILS_CREATED"] = 60] = "VEHICLE_CLAIM_DETAILS_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_CREATED"] = 61] = "VEHICLE_LOGBOOK_CREATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_UPDATED"] = 62] = "VEHICLE_LOGBOOK_UPDATED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_DELETED"] = 63] = "VEHICLE_LOGBOOK_DELETED";
+        AppEventTypeEnum[AppEventTypeEnum["VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED"] = 64] = "VEHICLE_LOGBOOK_BEST_PERIOD_UPDATED";
     })(exports.AppEventTypeEnum || (exports.AppEventTypeEnum = {}));
 
     var EventDispatcherService = /** @class */ (function () {
@@ -983,6 +983,7 @@
         CLIENT_MOVEMENTS_GET: new Endpoint('GET', '\\/client-movements'),
         CLIENT_MOVEMENTS_POST: new Endpoint('POST', '\\/client-movements'),
         COUNTRIES_GET: new Endpoint('GET', '\\/countries'),
+        CORELOGIC_TOKEN_GET: new Endpoint('GET', '/access\\/oauth\\/token.*$'),
         DEPRECIATIONS_OPENING_GET: new Endpoint('GET', '\\/depreciations\\/\\opening-balance\.\*'),
         DEPRECIATIONS_GET: new Endpoint('GET', '\\/depreciations'),
         DEPRECIATIONS_POST: new Endpoint('POST', '\\/depreciations'),
@@ -1546,156 +1547,6 @@
                         }] }, { type: ToastService }];
         } });
 
-    var AbstractModel = /** @class */ (function () {
-        function AbstractModel() {
-        }
-        AbstractModel.prototype.hasValue = function (value, path) {
-            if (path === void 0) { path = 'id'; }
-            return get__default["default"](path) === value;
-        };
-        return AbstractModel;
-    }());
-
-    var BankAccount$1 = /** @class */ (function (_super) {
-        __extends(BankAccount, _super);
-        function BankAccount() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return BankAccount;
-    }(AbstractModel));
-
-    exports.BankAccountTypeEnum = void 0;
-    (function (BankAccountTypeEnum) {
-        BankAccountTypeEnum[BankAccountTypeEnum["TRANSACTION"] = 1] = "TRANSACTION";
-        BankAccountTypeEnum[BankAccountTypeEnum["SAVINGS"] = 2] = "SAVINGS";
-        BankAccountTypeEnum[BankAccountTypeEnum["CREDIT_CARD"] = 3] = "CREDIT_CARD";
-        // @TODO Alex: should be removed by backend (TT-2107)
-        // MORTGAGE = 4,
-        BankAccountTypeEnum[BankAccountTypeEnum["LOAN"] = 5] = "LOAN";
-        BankAccountTypeEnum[BankAccountTypeEnum["INVESTMENT"] = 6] = "INVESTMENT";
-        BankAccountTypeEnum[BankAccountTypeEnum["TERM_DEPOSIT"] = 7] = "TERM_DEPOSIT";
-        BankAccountTypeEnum[BankAccountTypeEnum["OFFSET"] = 10] = "OFFSET";
-    })(exports.BankAccountTypeEnum || (exports.BankAccountTypeEnum = {}));
-
-    exports.BankAccountStatusEnum = void 0;
-    (function (BankAccountStatusEnum) {
-        BankAccountStatusEnum[BankAccountStatusEnum["INACTIVE"] = 0] = "INACTIVE";
-        BankAccountStatusEnum[BankAccountStatusEnum["ACTIVE"] = 1] = "ACTIVE";
-    })(exports.BankAccountStatusEnum || (exports.BankAccountStatusEnum = {}));
-
-    var Loan$1 = /** @class */ (function (_super) {
-        __extends(Loan, _super);
-        function Loan() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return Loan;
-    }(AbstractModel));
-
-    exports.LoanVehicleTypeEnum = void 0;
-    (function (LoanVehicleTypeEnum) {
-        LoanVehicleTypeEnum[LoanVehicleTypeEnum["AUTO_LOAN"] = 6] = "AUTO_LOAN";
-        LoanVehicleTypeEnum[LoanVehicleTypeEnum["CHATTEL_MORTGAGE"] = 9] = "CHATTEL_MORTGAGE";
-        LoanVehicleTypeEnum[LoanVehicleTypeEnum["COMMERCIAL_HIRE_PURCHASE"] = 10] = "COMMERCIAL_HIRE_PURCHASE";
-    })(exports.LoanVehicleTypeEnum || (exports.LoanVehicleTypeEnum = {}));
-
-    // @Todo no base model from backend list
-    /**
-     * Loan payment class
-     */
-    var LoanPayment = /** @class */ (function (_super) {
-        __extends(LoanPayment, _super);
-        function LoanPayment() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return LoanPayment;
-    }(AbstractModel));
-    __decorate([
-        classTransformer.Type(function () { return Date; })
-    ], LoanPayment.prototype, "date", void 0);
-
-    var LoanPayout$1 = /** @class */ (function (_super) {
-        __extends(LoanPayout, _super);
-        function LoanPayout() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return LoanPayout;
-    }(AbstractModel));
-
-    exports.LoanPayoutTypeEnum = void 0;
-    (function (LoanPayoutTypeEnum) {
-        LoanPayoutTypeEnum[LoanPayoutTypeEnum["REFINANCE"] = 1] = "REFINANCE";
-        LoanPayoutTypeEnum[LoanPayoutTypeEnum["PAYOUT"] = 2] = "PAYOUT";
-    })(exports.LoanPayoutTypeEnum || (exports.LoanPayoutTypeEnum = {}));
-
-    var LoanPayout = /** @class */ (function (_super) {
-        __extends(LoanPayout, _super);
-        function LoanPayout() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * Check if payout type is refinance
-         */
-        LoanPayout.prototype.isRefinance = function () {
-            return this.type === exports.LoanPayoutTypeEnum.REFINANCE;
-        };
-        return LoanPayout;
-    }(LoanPayout$1));
-
-    var FinancialYear = /** @class */ (function () {
-        function FinancialYear(date) {
-            this.yearStartDate = '-07-01';
-            this.yearEndDate = '-06-30';
-            if (date) {
-                this.year = date instanceof Date ? FinancialYear.toFinYear(date) : date;
-            }
-            else {
-                this.year = +localStorage.getItem('financialYear') || FinancialYear.toFinYear(new Date());
-            }
-            this.setStartDate(this.year);
-            this.setEndDate(this.year);
-        }
-        FinancialYear.prototype.includes = function (date) {
-            return this.year === new FinancialYear(date).year;
-        };
-        FinancialYear.toFinYear = function (date) {
-            return date.getFullYear() + (date.getMonth() >= this.startMonthIndex ? 1 : 0);
-        };
-        Object.defineProperty(FinancialYear.prototype, "prevFinYear", {
-            get: function () {
-                return new FinancialYear(new Date("" + (new Date().getFullYear() - 1) + this.yearStartDate));
-            },
-            enumerable: false,
-            configurable: true
-        });
-        /**
-         * Get date by desired month
-         */
-        FinancialYear.prototype.getMonthDate = function (monthIndex) {
-            if (monthIndex >= FinancialYear.startMonthIndex) {
-                return new Date(this.year - 1 + "-" + (monthIndex + 1) + "-01");
-            }
-            return new Date(this.year + "-" + (monthIndex + 1) + "-01");
-        };
-        FinancialYear.prototype.setStartDate = function (year) {
-            this.startDate = new Date("" + (year - 1) + this.yearStartDate);
-        };
-        FinancialYear.prototype.setEndDate = function (year) {
-            this.endDate = new Date("" + year + this.yearEndDate);
-        };
-        FinancialYear.prototype.getPastMonths = function () {
-            var months = [];
-            var now = new Date();
-            var endDate = this.endDate < now ? this.endDate : now;
-            for (var d = this.startDate; d <= endDate; d.setMonth(d.getMonth() + 1)) {
-                months.push(d.getMonth());
-            }
-            return months;
-        };
-        return FinancialYear;
-    }());
-    FinancialYear.weeksInYear = 52;
-    FinancialYear.startMonthIndex = 6;
-
     /**
      * List of collections grouped by passed property
      */
@@ -1956,519 +1807,1013 @@
         return Collection;
     }());
 
-    var ExportDataTable = /** @class */ (function () {
-        function ExportDataTable() {
-        }
-        return ExportDataTable;
-    }());
-
-    var ExportableCollection = /** @class */ (function (_super) {
-        __extends(ExportableCollection, _super);
-        function ExportableCollection() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        ExportableCollection.prototype.getExportFooter = function (type) {
-            return [];
-        };
-        ;
-        ExportableCollection.prototype.export = function (type) {
-            return classTransformer.plainToClass(ExportDataTable, {
-                header: this.getExportHeader(type),
-                body: this.getExportBody(type),
-                footer: [this.getExportFooter(type)]
-            });
-        };
-        return ExportableCollection;
-    }(Collection));
+    exports.BankAccountTypeEnum = void 0;
+    (function (BankAccountTypeEnum) {
+        BankAccountTypeEnum[BankAccountTypeEnum["TRANSACTION"] = 1] = "TRANSACTION";
+        BankAccountTypeEnum[BankAccountTypeEnum["SAVINGS"] = 2] = "SAVINGS";
+        BankAccountTypeEnum[BankAccountTypeEnum["CREDIT_CARD"] = 3] = "CREDIT_CARD";
+        // @TODO Alex: should be removed by backend (TT-2107)
+        // MORTGAGE = 4,
+        BankAccountTypeEnum[BankAccountTypeEnum["LOAN"] = 5] = "LOAN";
+        BankAccountTypeEnum[BankAccountTypeEnum["INVESTMENT"] = 6] = "INVESTMENT";
+        BankAccountTypeEnum[BankAccountTypeEnum["TERM_DEPOSIT"] = 7] = "TERM_DEPOSIT";
+        BankAccountTypeEnum[BankAccountTypeEnum["OFFSET"] = 10] = "OFFSET";
+    })(exports.BankAccountTypeEnum || (exports.BankAccountTypeEnum = {}));
 
-    /**
-     * export table column
-     */
-    var ExportCell = /** @class */ (function () {
-        function ExportCell() {
-        }
-        return ExportCell;
-    }());
+    var TYPE_LOAN = [
+        exports.BankAccountTypeEnum.CREDIT_CARD,
+        exports.BankAccountTypeEnum.LOAN
+    ];
 
     /**
-     * type of export table column value
+     * Collection of bank accounts.
      */
-    var ExportCellTypeEnum;
-    (function (ExportCellTypeEnum) {
-        ExportCellTypeEnum[ExportCellTypeEnum["STRING"] = 0] = "STRING";
-        ExportCellTypeEnum[ExportCellTypeEnum["CURRENCY"] = 1] = "CURRENCY";
-        ExportCellTypeEnum[ExportCellTypeEnum["DATE"] = 2] = "DATE";
-    })(ExportCellTypeEnum || (ExportCellTypeEnum = {}));
-
-    var LoanPaymentCollection = /** @class */ (function (_super) {
-        __extends(LoanPaymentCollection, _super);
-        function LoanPaymentCollection() {
+    var BankAccountCollection = /** @class */ (function (_super) {
+        __extends(BankAccountCollection, _super);
+        function BankAccountCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        LoanPaymentCollection.prototype.getExportHeader = function () {
-            return [
-                'Pmt No.',
-                'Date',
-                'Payment Due',
-                'Interest Accrued',
-                'Principal Paid',
-                'Principal Balance',
-                'Payout'
-            ];
-        };
-        LoanPaymentCollection.prototype.getExportBody = function () {
-            return this.items.map(function (payment) {
-                return [
-                    classTransformer.plainToClass(ExportCell, { value: payment.number, type: ExportCellTypeEnum.STRING }),
-                    classTransformer.plainToClass(ExportCell, { value: payment.date, type: ExportCellTypeEnum.DATE }),
-                    classTransformer.plainToClass(ExportCell, { value: payment.paymentDue, type: ExportCellTypeEnum.CURRENCY }),
-                    classTransformer.plainToClass(ExportCell, { value: payment.interestAccrued, type: ExportCellTypeEnum.CURRENCY }),
-                    classTransformer.plainToClass(ExportCell, { value: payment.principalPaid, type: ExportCellTypeEnum.CURRENCY }),
-                    classTransformer.plainToClass(ExportCell, { value: payment.principalBalance, type: ExportCellTypeEnum.CURRENCY }),
-                    classTransformer.plainToClass(ExportCell, { value: payment.payout, type: ExportCellTypeEnum.CURRENCY }),
-                ];
+        /**
+         * 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);
             });
         };
-        Object.defineProperty(LoanPaymentCollection.prototype, "paymentDue", {
+        /**
+         * 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('paymentDue');
+                return this.sumBy('currentBalance');
             },
             enumerable: false,
             configurable: true
         });
-        LoanPaymentCollection.prototype.getByFinYear = function (finYear) {
-            if (finYear === void 0) { finYear = new FinancialYear(); }
-            return this.filter(function (payment) {
-                return new Date(payment.date) >= finYear.startDate &&
-                    new Date(payment.date) <= finYear.endDate;
-            });
-        };
-        LoanPaymentCollection.prototype.getForCurrentYear = function () {
-            return this.getByFinYear(new FinancialYear());
-        };
-        return LoanPaymentCollection;
-    }(ExportableCollection));
-
-    var Loan = /** @class */ (function (_super) {
-        __extends(Loan, _super);
-        function Loan() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
         /**
-         * Check if loan type is related to LoanVehicleTypeEnum
+         * Get Collection of bank accounts with property tank type
          */
-        Loan.prototype.isVehicle = function () {
-            return !this.bankAccount && this.type in exports.LoanVehicleTypeEnum;
+        BankAccountCollection.prototype.getPropertyBankAccounts = function () {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isPropertyTank(); }));
         };
         /**
-         * Get the last payment for passed financial year
-         * @param year financial year for filter
+         * Get Collection of bank accounts with work tank type
          */
-        Loan.prototype.getLastPaymentByYear = function (year) {
-            var finYear = new FinancialYear(new Date(year.toString()));
-            return last__default["default"](this.payments.filter(function (payment) { return payment.date > finYear.startDate && payment.date < finYear.endDate; }));
+        BankAccountCollection.prototype.getWorkBankAccounts = function () {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isWorkTank(); }));
         };
         /**
-         * The size of loan interest
-         * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
-         * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+         * Get Collection of bank accounts by tank type
          */
-        Loan.prototype.getInterest = function () {
-            return new LoanPaymentCollection(this.payments).paymentDue - this.amount;
+        BankAccountCollection.prototype.getByTankType = function (tankType) {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.tankType === tankType; }));
         };
         /**
-         * The last payment size
-         * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
-         * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+         * Get list of all bank account properties
          */
-        Loan.prototype.getBalloonPayment = function () {
-            var lastPaymentDueAmount = new LoanPaymentCollection(this.payments).last.paymentDue;
-            return (lastPaymentDueAmount - this.repaymentAmount) > 0 ? lastPaymentDueAmount - this.repaymentAmount : 0;
+        BankAccountCollection.prototype.getBankAccountPropertiesList = function () {
+            return flatten__default["default"](this.items.map(function (bankAccount) {
+                return bankAccount.bankAccountProperties;
+            }));
         };
         /**
-         * Percent of ballon payment from all payments
-         * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
-         * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+         * Get lis of unique properties from all bank accounts properties
          */
-        Loan.prototype.getBalloonPaymentPercentage = function () {
-            return this.getBalloonPayment() / new LoanPaymentCollection(this.payments).paymentDue * 100;
+        BankAccountCollection.prototype.getProperties = function () {
+            return uniqBy__default["default"](this.getBankAccountPropertiesList().map(function (bankAccountProperty) {
+                return bankAccountProperty.property;
+            }), 'id');
         };
-        return Loan;
-    }(Loan$1));
+        BankAccountCollection.prototype.getPropertyBalanceAmount = function (propertyId) {
+            return this.items.reduce(function (sum, bankAccount) {
+                return sum + bankAccount.getPropertyBalanceAmount(propertyId);
+            }, 0);
+        };
+        return BankAccountCollection;
+    }(Collection));
+
+    var UserEventTypeTypeEnum;
+    (function (UserEventTypeTypeEnum) {
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTERED"] = 1000] = "REGISTERED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PASSWORD_RESET_REQUEST"] = 1001] = "PASSWORD_RESET_REQUEST";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["APP_FEATURES"] = 1010] = "APP_FEATURES";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIBED"] = 2000] = "SUBSCRIBED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["UNSUBSCRIBED"] = 2001] = "UNSUBSCRIBED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_UPDATE"] = 2004] = "SUBSCRIPTION_UPDATE";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_TRIAL_UPDATE"] = 2005] = "SUBSCRIPTION_TRIAL_UPDATE";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_PAYMENT_FAILED"] = 2006] = "SUBSCRIPTION_PAYMENT_FAILED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE"] = 2010] = "CLIENT_INVITE";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_TO_REGISTER"] = 2011] = "CLIENT_INVITE_TO_REGISTER";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_ACCEPTED"] = 2012] = "FIRM_INVITE_ACCEPTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_REJECTED"] = 2013] = "FIRM_INVITE_REJECTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_REGISTERED"] = 2014] = "FIRM_INVITE_REGISTERED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE"] = 2020] = "PROPERTY_SHARE_INVITE";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_TO_REGISTER"] = 2021] = "PROPERTY_SHARE_INVITE_TO_REGISTER";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_ACCEPTED"] = 2022] = "PROPERTY_SHARE_INVITE_ACCEPTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_REJECTED"] = 2023] = "PROPERTY_SHARE_INVITE_REJECTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_REGISTERED"] = 2024] = "PROPERTY_SHARE_INVITE_REGISTERED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_REQUESTED"] = 2025] = "PROPERTY_SHARE_CHANGE_REQUESTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_ACCEPTED"] = 2026] = "PROPERTY_SHARE_CHANGE_ACCEPTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_REJECTED"] = 2027] = "PROPERTY_SHARE_CHANGE_REJECTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["OWNER_SUBSCRIBED"] = 2028] = "OWNER_SUBSCRIBED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["OWNER_UNSUBSCRIBED"] = 2029] = "OWNER_UNSUBSCRIBED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_NEW_ACCOUNTS"] = 2030] = "BASIQ_NEW_ACCOUNTS";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_FIRST_IMPORT_COMPLETE"] = 2031] = "BASIQ_FIRST_IMPORT_COMPLETE";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_AUTHORIZATION_FAIL"] = 2032] = "BASIQ_AUTHORIZATION_FAIL";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["TRANSACTION_ALLOCATE_REMINDER"] = 2033] = "TRANSACTION_ALLOCATE_REMINDER";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTRATION_INVITE"] = 2040] = "REGISTRATION_INVITE";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTRATION_INVITE_ACCEPTED"] = 2041] = "REGISTRATION_INVITE_ACCEPTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_EMAIL_CONFIRMED"] = 2050] = "CLIENT_EMAIL_CONFIRMED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["TAX_REVIEW_REQUESTED"] = 2060] = "TAX_REVIEW_REQUESTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_TO_REGISTER"] = 3000] = "FIRM_INVITE_TO_REGISTER";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE"] = 3001] = "FIRM_INVITE";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_ACCEPTED"] = 3002] = "CLIENT_INVITE_ACCEPTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_REJECTED"] = 3003] = "CLIENT_INVITE_REJECTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_REGISTERED"] = 3004] = "CLIENT_INVITE_REGISTERED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_NEW_CLIENT"] = 3005] = "FIRM_NEW_CLIENT";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_LOST_CLIENT"] = 3006] = "FIRM_LOST_CLIENT";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_INVITE"] = 3010] = "EMPLOYEE_INVITE";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_LOST_CLIENT"] = 3011] = "EMPLOYEE_LOST_CLIENT";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_NEW_CLIENT"] = 3012] = "EMPLOYEE_NEW_CLIENT";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_INVITE_ACCEPTED"] = 3013] = "EMPLOYEE_INVITE_ACCEPTED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_EMAIL_CONFIRMED"] = 3020] = "EMPLOYEE_EMAIL_CONFIRMED";
+        UserEventTypeTypeEnum[UserEventTypeTypeEnum["TAX_REVIEW_RECEIVED"] = 3030] = "TAX_REVIEW_RECEIVED";
+    })(UserEventTypeTypeEnum || (UserEventTypeTypeEnum = {}));
+
     /**
-     * 30 years is default mortgage term
+     * any event happened in the app, which needs to be handled somehow (distributed to other part of the app)
      */
-    Loan.mortgageDefaultTerm = 360;
+    var AppEvent = /** @class */ (function () {
+        function AppEvent(type, payload) {
+            this.type = type;
+            this.payload = payload;
+        }
+        return AppEvent;
+    }());
+
     /**
-     * 5 years is default bank loan term
+     * Class describe configuration options for basiq connect control
+     * https://www.npmjs.com/package/@basiq/basiq-connect-control
      */
-    Loan.loanDefaultTerm = 60;
-    __decorate([
-        classTransformer.Type(function () { return LoanPayment; })
-    ], Loan.prototype, "payments", void 0);
-    __decorate([
-        classTransformer.Type(function () { return Date; })
-    ], Loan.prototype, "commencementDate", void 0);
-    __decorate([
-        classTransformer.Type(function () { return LoanPayout; })
-    ], Loan.prototype, "payout", void 0);
-
-    exports.TankTypeEnum = void 0;
-    (function (TankTypeEnum) {
-        TankTypeEnum[TankTypeEnum["PROPERTY"] = 1] = "PROPERTY";
-        TankTypeEnum[TankTypeEnum["WORK"] = 2] = "WORK";
-        TankTypeEnum[TankTypeEnum["OTHER"] = 3] = "OTHER";
-        TankTypeEnum[TankTypeEnum["SOLE"] = 4] = "SOLE";
-    })(exports.TankTypeEnum || (exports.TankTypeEnum = {}));
-
-    var BankAccountBalance = /** @class */ (function (_super) {
-        __extends(BankAccountBalance, _super);
-        function BankAccountBalance() {
-            return _super !== null && _super.apply(this, arguments) || this;
+    var BasiqConfig = /** @class */ (function () {
+        function BasiqConfig(options) {
+            // ID of the DOM element to which Basiq Connect Control will be rendered;
+            this.containerId = 'basiq-control';
+            Object.assign(this, options);
         }
-        return BankAccountBalance;
-    }(AbstractModel));
+        return BasiqConfig;
+    }());
 
-    var BankAccountProperty$1 = /** @class */ (function (_super) {
-        __extends(BankAccountProperty, _super);
-        function BankAccountProperty() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return BankAccountProperty;
-    }(AbstractModel));
+    var AbstractModel = /** @class */ (function () {
+        function AbstractModel() {
+        }
+        AbstractModel.prototype.hasValue = function (value, path) {
+            if (path === void 0) { path = 'id'; }
+            return get__default["default"](path) === value;
+        };
+        return AbstractModel;
+    }());
 
-    var Property$1 = /** @class */ (function (_super) {
-        __extends(Property, _super);
-        function Property() {
+    var BasiqJob$1 = /** @class */ (function (_super) {
+        __extends(BasiqJob, _super);
+        function BasiqJob() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        return Property;
+        return BasiqJob;
     }(AbstractModel));
 
-    var PropertySubscription$1 = /** @class */ (function (_super) {
-        __extends(PropertySubscription, _super);
-        function PropertySubscription() {
+    var BasiqJob = /** @class */ (function (_super) {
+        __extends(BasiqJob, _super);
+        function BasiqJob() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        return PropertySubscription;
-    }(AbstractModel));
+        return BasiqJob;
+    }(BasiqJob$1));
 
-    var User$1 = /** @class */ (function (_super) {
-        __extends(User, _super);
-        function User() {
-            return _super !== null && _super.apply(this, arguments) || this;
+    var BasiqJobStep = /** @class */ (function () {
+        function BasiqJobStep() {
         }
-        return User;
-    }(AbstractModel));
+        BasiqJobStep.prototype.isVerifyCredentials = function () {
+            return this.title === 'verify-credentials';
+        };
+        BasiqJobStep.prototype.isInProgress = function () {
+            return this.status === 'in-progress';
+        };
+        BasiqJobStep.prototype.isSuccess = function () {
+            return this.status === 'success';
+        };
+        return BasiqJobStep;
+    }());
 
-    exports.UserStatusEnum = void 0;
-    (function (UserStatusEnum) {
-        UserStatusEnum[UserStatusEnum["INACTIVE"] = 0] = "INACTIVE";
-        UserStatusEnum[UserStatusEnum["ON_BOARDING"] = 1] = "ON_BOARDING";
-        UserStatusEnum[UserStatusEnum["ACTIVE"] = 2] = "ACTIVE";
-    })(exports.UserStatusEnum || (exports.UserStatusEnum = {}));
+    var BasiqJobResponse = /** @class */ (function () {
+        function BasiqJobResponse() {
+        }
+        BasiqJobResponse.prototype.getVerifyCredentialsStep = function () {
+            return this.steps.find(function (step) { return step.isVerifyCredentials(); });
+        };
+        return BasiqJobResponse;
+    }());
+    __decorate([
+        classTransformer.Type(function () { return BasiqJobStep; })
+    ], BasiqJobResponse.prototype, "steps", void 0);
 
-    exports.UserRolesEnum = void 0;
-    (function (UserRolesEnum) {
-        UserRolesEnum["FIRM_OWNER"] = "ROLE_FIRM_OWNER";
-        UserRolesEnum["FIRM_MANAGER"] = "ROLE_FIRM_MANAGER";
-        UserRolesEnum["CLIENT"] = "ROLE_CLIENT";
-        UserRolesEnum["EMPLOYEE"] = "ROLE_EMPLOYEE";
-        UserRolesEnum["ACCOUNTANT"] = "ROLE_ACCOUNTANT";
-        UserRolesEnum["ADVISOR"] = "ROLE_ADVISOR";
-        UserRolesEnum["USER"] = "ROLE_USER";
-        UserRolesEnum["SUBSCRIPTION"] = "ROLE_USER_SUBSCRIPTION";
-        UserRolesEnum["WORK_TANK"] = "ROLE_USER_WORK";
-        UserRolesEnum["PROPERTY_TANK"] = "ROLE_USER_PROPERTY";
-        UserRolesEnum["SOLE_TANK"] = "ROLE_USER_SOLE";
-        UserRolesEnum["SWITCH_USER"] = "ROLE_PREVIOUS_ADMIN";
-    })(exports.UserRolesEnum || (exports.UserRolesEnum = {}));
+    /**
+     * access token, needed to access basiq connect ui (https://github.com/basiqio/basiq-connect-ui)
+     */
+    var BasiqToken = /** @class */ (function () {
+        function BasiqToken(value, expiresAt) {
+            this.value = value;
+            this.expiresAt = expiresAt;
+        }
+        BasiqToken.prototype.isExpired = function () {
+            return this.expiresAt < new Date();
+        };
+        return BasiqToken;
+    }());
 
-    var Address$1 = /** @class */ (function (_super) {
-        __extends(Address, _super);
-        function Address() {
+    var Bank$1 = /** @class */ (function (_super) {
+        __extends(Bank, _super);
+        function Bank() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        return Address;
+        return Bank;
     }(AbstractModel));
 
-    var Country$1 = /** @class */ (function (_super) {
-        __extends(Country, _super);
-        function Country() {
-            return _super !== null && _super.apply(this, arguments) || this;
+    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 = {}));
+
+    /**
+     * Bank subclass, average bank response time for some operations in milliseconds
+     * Used for basiq banks functionality to improve bank login UI/UX (loading progress)
+     */
+    var BankExternalStats = /** @class */ (function () {
+        function BankExternalStats() {
         }
-        return Country;
-    }(AbstractModel));
+        return BankExternalStats;
+    }());
 
-    var Country = /** @class */ (function (_super) {
-        __extends(Country, _super);
-        function Country() {
+    var Bank = /** @class */ (function (_super) {
+        __extends(Bank, _super);
+        function Bank() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        Object.defineProperty(Country.prototype, "countryWithCode", {
-            /**
-             * Return country name with phone code
-             */
-            get: function () {
-                return this.name + " (+" + this.callingCode + ")";
-            },
-            enumerable: false,
-            configurable: true
-        });
-        /**
-         * Check if country calling code is Australian or not
-         */
-        Country.prototype.isAustralianCode = function () {
-            return this.callingCode === '61';
+        Bank.prototype.getPhotoPlaceholder = function () {
+            return this.name[0] + this.name[1];
         };
-        return Country;
-    }(Country$1));
-
-    exports.AddressTypeEnum = void 0;
-    (function (AddressTypeEnum) {
-        AddressTypeEnum[AddressTypeEnum["STREET"] = 1] = "STREET";
-        AddressTypeEnum[AddressTypeEnum["POSTAL"] = 2] = "POSTAL";
-    })(exports.AddressTypeEnum || (exports.AddressTypeEnum = {}));
-
-    var Address = /** @class */ (function (_super) {
-        __extends(Address, _super);
-        function Address() {
-            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            _this.type = exports.AddressTypeEnum.STREET;
-            return _this;
-        }
-        Address.prototype.toString = function () {
-            return [this.unitNumber, this.address, this.city, this.state, this.postcode].filter(Boolean).join(', ');
+        Bank.prototype.getPhoto = function () {
+            if (!this.logo) {
+                return null;
+            }
+            return this.logo.includes('http') ? "" + this.logo : localStorage.getItem('api_uri') + "/" + this.logo;
         };
-        Object.defineProperty(Address.prototype, "name", {
-            get: function () {
-                return "" + (this.unitNumber ? this.unitNumber + '/' : '') + this.address;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Address.prototype, "nameLong", {
-            get: function () {
-                return this.name + ", " + this.city + ", " + this.state;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        return Address;
-    }(Address$1));
+        return Bank;
+    }(Bank$1));
     __decorate([
-        classTransformer.Type((function () { return Country; }))
-    ], Address.prototype, "country", void 0);
-
-    var _a$4;
-    var USER_WORK_POSITION = (_a$4 = {},
-        _a$4[exports.UserRolesEnum.EMPLOYEE] = 'Employee',
-        _a$4[exports.UserRolesEnum.FIRM_MANAGER] = 'Manager',
-        _a$4[exports.UserRolesEnum.FIRM_OWNER] = 'Firm Owner',
-        _a$4);
+        classTransformer.Transform(function (_a) {
+            var value = _a.value;
+            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);
+    __decorate([
+        classTransformer.Type(function () { return BankExternalStats; })
+    ], Bank.prototype, "externalStats", void 0);
 
-    var ClientDetails$1 = /** @class */ (function (_super) {
-        __extends(ClientDetails, _super);
-        function ClientDetails() {
+    var BankAccount$1 = /** @class */ (function (_super) {
+        __extends(BankAccount, _super);
+        function BankAccount() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        return ClientDetails;
+        return BankAccount;
     }(AbstractModel));
 
-    var ClientDetails = /** @class */ (function (_super) {
-        __extends(ClientDetails, _super);
-        function ClientDetails() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return ClientDetails;
-    }(ClientDetails$1));
+    exports.BankAccountStatusEnum = void 0;
+    (function (BankAccountStatusEnum) {
+        BankAccountStatusEnum[BankAccountStatusEnum["INACTIVE"] = 0] = "INACTIVE";
+        BankAccountStatusEnum[BankAccountStatusEnum["ACTIVE"] = 1] = "ACTIVE";
+    })(exports.BankAccountStatusEnum || (exports.BankAccountStatusEnum = {}));
 
-    var EmployeeDetails$1 = /** @class */ (function (_super) {
-        __extends(EmployeeDetails, _super);
-        function EmployeeDetails() {
+    var Loan$1 = /** @class */ (function (_super) {
+        __extends(Loan, _super);
+        function Loan() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        return EmployeeDetails;
+        return Loan;
     }(AbstractModel));
 
-    var Firm$1 = /** @class */ (function (_super) {
-        __extends(Firm, _super);
-        function Firm() {
+    exports.LoanVehicleTypeEnum = void 0;
+    (function (LoanVehicleTypeEnum) {
+        LoanVehicleTypeEnum[LoanVehicleTypeEnum["AUTO_LOAN"] = 6] = "AUTO_LOAN";
+        LoanVehicleTypeEnum[LoanVehicleTypeEnum["CHATTEL_MORTGAGE"] = 9] = "CHATTEL_MORTGAGE";
+        LoanVehicleTypeEnum[LoanVehicleTypeEnum["COMMERCIAL_HIRE_PURCHASE"] = 10] = "COMMERCIAL_HIRE_PURCHASE";
+    })(exports.LoanVehicleTypeEnum || (exports.LoanVehicleTypeEnum = {}));
+
+    // @Todo no base model from backend list
+    /**
+     * Loan payment class
+     */
+    var LoanPayment = /** @class */ (function (_super) {
+        __extends(LoanPayment, _super);
+        function LoanPayment() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        return Firm;
+        return LoanPayment;
     }(AbstractModel));
+    __decorate([
+        classTransformer.Type(function () { return Date; })
+    ], LoanPayment.prototype, "date", void 0);
 
-    var Phone$1 = /** @class */ (function (_super) {
-        __extends(Phone, _super);
-        function Phone() {
+    var LoanPayout$1 = /** @class */ (function (_super) {
+        __extends(LoanPayout, _super);
+        function LoanPayout() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        return Phone;
+        return LoanPayout;
     }(AbstractModel));
 
-    exports.PhoneTypeEnum = void 0;
-    (function (PhoneTypeEnum) {
-        PhoneTypeEnum[PhoneTypeEnum["MOBILE"] = 1] = "MOBILE";
-        PhoneTypeEnum[PhoneTypeEnum["OFFICE"] = 2] = "OFFICE";
-    })(exports.PhoneTypeEnum || (exports.PhoneTypeEnum = {}));
-
-    var Phone = /** @class */ (function (_super) {
-        __extends(Phone, _super);
-        function Phone() {
-            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            _this.type = exports.PhoneTypeEnum.MOBILE;
-            return _this;
-        }
-        Phone.prototype.toString = function () {
-            return "+" + this.country.callingCode + " " + this.number;
-        };
-        return Phone;
-    }(Phone$1));
+    exports.LoanPayoutTypeEnum = void 0;
+    (function (LoanPayoutTypeEnum) {
+        LoanPayoutTypeEnum[LoanPayoutTypeEnum["REFINANCE"] = 1] = "REFINANCE";
+        LoanPayoutTypeEnum[LoanPayoutTypeEnum["PAYOUT"] = 2] = "PAYOUT";
+    })(exports.LoanPayoutTypeEnum || (exports.LoanPayoutTypeEnum = {}));
 
-    var Firm = /** @class */ (function (_super) {
-        __extends(Firm, _super);
-        function Firm() {
+    var LoanPayout = /** @class */ (function (_super) {
+        __extends(LoanPayout, _super);
+        function LoanPayout() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
         /**
-         * get firm photo link
+         * Check if payout type is refinance
          */
-        Firm.prototype.getPhoto = function () {
-            return this.photo;
+        LoanPayout.prototype.isRefinance = function () {
+            return this.type === exports.LoanPayoutTypeEnum.REFINANCE;
+        };
+        return LoanPayout;
+    }(LoanPayout$1));
+
+    var FinancialYear = /** @class */ (function () {
+        function FinancialYear(date) {
+            this.yearStartDate = '-07-01';
+            this.yearEndDate = '-06-30';
+            if (date) {
+                this.year = date instanceof Date ? FinancialYear.toFinYear(date) : date;
+            }
+            else {
+                this.year = +localStorage.getItem('financialYear') || FinancialYear.toFinYear(new Date());
+            }
+            this.setStartDate(this.year);
+            this.setEndDate(this.year);
+        }
+        FinancialYear.prototype.includes = function (date) {
+            return this.year === new FinancialYear(date).year;
+        };
+        FinancialYear.toFinYear = function (date) {
+            return date.getFullYear() + (date.getMonth() >= this.startMonthIndex ? 1 : 0);
         };
+        Object.defineProperty(FinancialYear.prototype, "prevFinYear", {
+            get: function () {
+                return new FinancialYear(new Date("" + (new Date().getFullYear() - 1) + this.yearStartDate));
+            },
+            enumerable: false,
+            configurable: true
+        });
         /**
-         * get firm initials
+         * Get date by desired month
          */
-        Firm.prototype.getPhotoPlaceholder = function () {
-            return "" + this.name[0].toUpperCase() + this.name[1];
+        FinancialYear.prototype.getMonthDate = function (monthIndex) {
+            if (monthIndex >= FinancialYear.startMonthIndex) {
+                return new Date(this.year - 1 + "-" + (monthIndex + 1) + "-01");
+            }
+            return new Date(this.year + "-" + (monthIndex + 1) + "-01");
         };
-        return Firm;
-    }(Firm$1));
-    __decorate([
-        classTransformer.Type(function () { return User; })
-    ], Firm.prototype, "owner", void 0);
-    __decorate([
-        classTransformer.Type(function () { return Address; })
-    ], Firm.prototype, "address", void 0);
-    __decorate([
-        classTransformer.Type(function () { return Phone; })
-    ], Firm.prototype, "phone", void 0);
-
-    var EmployeeDetails = /** @class */ (function (_super) {
-        __extends(EmployeeDetails, _super);
-        function EmployeeDetails() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return EmployeeDetails;
-    }(EmployeeDetails$1));
-    __decorate([
-        classTransformer.Type(function () { return Firm; })
-    ], EmployeeDetails.prototype, "firm", void 0);
-
-    var ServiceSubscription$1 = /** @class */ (function (_super) {
-        __extends(ServiceSubscription, _super);
-        function ServiceSubscription() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return ServiceSubscription;
-    }(AbstractModel));
-
-    var ServiceSubscriptionItem$1 = /** @class */ (function (_super) {
-        __extends(ServiceSubscriptionItem, _super);
-        function ServiceSubscriptionItem() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return ServiceSubscriptionItem;
-    }(AbstractModel));
-
-    var ServicePrice$1 = /** @class */ (function (_super) {
-        __extends(ServicePrice, _super);
-        function ServicePrice() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return ServicePrice;
-    }(AbstractModel));
+        FinancialYear.prototype.setStartDate = function (year) {
+            this.startDate = new Date("" + (year - 1) + this.yearStartDate);
+        };
+        FinancialYear.prototype.setEndDate = function (year) {
+            this.endDate = new Date("" + year + this.yearEndDate);
+        };
+        FinancialYear.prototype.getPastMonths = function () {
+            var months = [];
+            var now = new Date();
+            var endDate = this.endDate < now ? this.endDate : now;
+            for (var d = this.startDate; d <= endDate; d.setMonth(d.getMonth() + 1)) {
+                months.push(d.getMonth());
+            }
+            return months;
+        };
+        return FinancialYear;
+    }());
+    FinancialYear.weeksInYear = 52;
+    FinancialYear.startMonthIndex = 6;
 
-    var ServiceProduct$1 = /** @class */ (function (_super) {
-        __extends(ServiceProduct, _super);
-        function ServiceProduct() {
-            return _super !== null && _super.apply(this, arguments) || this;
+    var ExportDataTable = /** @class */ (function () {
+        function ExportDataTable() {
         }
-        return ServiceProduct;
-    }(AbstractModel));
-
-    exports.ServiceProductStatusEnum = void 0;
-    (function (ServiceProductStatusEnum) {
-        ServiceProductStatusEnum[ServiceProductStatusEnum["ARCHIVED"] = 0] = "ARCHIVED";
-        ServiceProductStatusEnum[ServiceProductStatusEnum["ACTIVE"] = 1] = "ACTIVE";
-    })(exports.ServiceProductStatusEnum || (exports.ServiceProductStatusEnum = {}));
-
-    exports.ServiceProductIdEnum = void 0;
-    (function (ServiceProductIdEnum) {
-        ServiceProductIdEnum[ServiceProductIdEnum["WORK_TANK_OLD"] = 1] = "WORK_TANK_OLD";
-        ServiceProductIdEnum[ServiceProductIdEnum["PROPERTY_OLD"] = 2] = "PROPERTY_OLD";
-        ServiceProductIdEnum[ServiceProductIdEnum["PROPERTY_TANK"] = 3] = "PROPERTY_TANK";
-        ServiceProductIdEnum[ServiceProductIdEnum["WORK_TANK"] = 4] = "WORK_TANK";
-        ServiceProductIdEnum[ServiceProductIdEnum["PROPERTIES"] = 5] = "PROPERTIES";
-        ServiceProductIdEnum[ServiceProductIdEnum["SOLE_TANK"] = 6] = "SOLE_TANK";
-    })(exports.ServiceProductIdEnum || (exports.ServiceProductIdEnum = {}));
+        return ExportDataTable;
+    }());
 
-    var ServiceProduct = /** @class */ (function (_super) {
-        __extends(ServiceProduct, _super);
-        function ServiceProduct() {
+    var ExportableCollection = /** @class */ (function (_super) {
+        __extends(ExportableCollection, _super);
+        function ExportableCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        ServiceProduct.prototype.isProperties = function () {
-            return [exports.ServiceProductIdEnum.PROPERTY_OLD, exports.ServiceProductIdEnum.PROPERTIES].includes(this.id);
-        };
-        ServiceProduct.prototype.isWorkTank = function () {
-            return [exports.ServiceProductIdEnum.WORK_TANK_OLD, exports.ServiceProductIdEnum.WORK_TANK].includes(this.id);
-        };
-        ServiceProduct.prototype.isSoleTank = function () {
-            return this.id === exports.ServiceProductIdEnum.SOLE_TANK;
+        ExportableCollection.prototype.getExportFooter = function (type) {
+            return [];
         };
-        ServiceProduct.prototype.isArchived = function () {
-            return this.status === exports.ServiceProductStatusEnum.ARCHIVED;
+        ;
+        ExportableCollection.prototype.export = function (type) {
+            return classTransformer.plainToClass(ExportDataTable, {
+                header: this.getExportHeader(type),
+                body: this.getExportBody(type),
+                footer: [this.getExportFooter(type)]
+            });
         };
-        return ServiceProduct;
-    }(ServiceProduct$1));
+        return ExportableCollection;
+    }(Collection));
 
-    var ServicePrice = /** @class */ (function (_super) {
-        __extends(ServicePrice, _super);
-        function ServicePrice() {
-            return _super !== null && _super.apply(this, arguments) || this;
+    /**
+     * export table column
+     */
+    var ExportCell = /** @class */ (function () {
+        function ExportCell() {
         }
-        ServicePrice.prototype.toSubscriptionItem = function () {
-            return classTransformer.plainToClass(ServiceSubscriptionItem, { price: this, quantity: this.product.minQty });
-        };
-        return ServicePrice;
-    }(ServicePrice$1));
-    __decorate([
-        classTransformer.Type(function () { return ServiceProduct; })
-    ], ServicePrice.prototype, "product", void 0);
+        return ExportCell;
+    }());
 
     /**
-     * backend bd doesn't support dynamic prices, as far as we have just one product like that we keep it hardcoded
+     * type of export table column value
      */
-    var PROPERTY_TANK_PRICE = 9;
-    var ServiceSubscriptionItem = /** @class */ (function (_super) {
-        __extends(ServiceSubscriptionItem, _super);
-        function ServiceSubscriptionItem() {
+    var ExportCellTypeEnum;
+    (function (ExportCellTypeEnum) {
+        ExportCellTypeEnum[ExportCellTypeEnum["STRING"] = 0] = "STRING";
+        ExportCellTypeEnum[ExportCellTypeEnum["CURRENCY"] = 1] = "CURRENCY";
+        ExportCellTypeEnum[ExportCellTypeEnum["DATE"] = 2] = "DATE";
+    })(ExportCellTypeEnum || (ExportCellTypeEnum = {}));
+
+    var LoanPaymentCollection = /** @class */ (function (_super) {
+        __extends(LoanPaymentCollection, _super);
+        function LoanPaymentCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        Object.defineProperty(ServiceSubscriptionItem.prototype, "total", {
+        LoanPaymentCollection.prototype.getExportHeader = function () {
+            return [
+                'Pmt No.',
+                'Date',
+                'Payment Due',
+                'Interest Accrued',
+                'Principal Paid',
+                'Principal Balance',
+                'Payout'
+            ];
+        };
+        LoanPaymentCollection.prototype.getExportBody = function () {
+            return this.items.map(function (payment) {
+                return [
+                    classTransformer.plainToClass(ExportCell, { value: payment.number, type: ExportCellTypeEnum.STRING }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.date, type: ExportCellTypeEnum.DATE }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.paymentDue, type: ExportCellTypeEnum.CURRENCY }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.interestAccrued, type: ExportCellTypeEnum.CURRENCY }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.principalPaid, type: ExportCellTypeEnum.CURRENCY }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.principalBalance, type: ExportCellTypeEnum.CURRENCY }),
+                    classTransformer.plainToClass(ExportCell, { value: payment.payout, type: ExportCellTypeEnum.CURRENCY }),
+                ];
+            });
+        };
+        Object.defineProperty(LoanPaymentCollection.prototype, "paymentDue", {
             get: function () {
-                var price = this.price.amount * this.quantity;
-                if (this.price.product.id === exports.ServiceProductIdEnum.PROPERTIES) {
-                    price += PROPERTY_TANK_PRICE;
-                }
-                return price;
+                return this.sumBy('paymentDue');
             },
             enumerable: false,
             configurable: true
         });
-        return ServiceSubscriptionItem;
+        LoanPaymentCollection.prototype.getByFinYear = function (finYear) {
+            if (finYear === void 0) { finYear = new FinancialYear(); }
+            return this.filter(function (payment) {
+                return new Date(payment.date) >= finYear.startDate &&
+                    new Date(payment.date) <= finYear.endDate;
+            });
+        };
+        LoanPaymentCollection.prototype.getForCurrentYear = function () {
+            return this.getByFinYear(new FinancialYear());
+        };
+        return LoanPaymentCollection;
+    }(ExportableCollection));
+
+    var Loan = /** @class */ (function (_super) {
+        __extends(Loan, _super);
+        function Loan() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        /**
+         * Check if loan type is related to LoanVehicleTypeEnum
+         */
+        Loan.prototype.isVehicle = function () {
+            return !this.bankAccount && this.type in exports.LoanVehicleTypeEnum;
+        };
+        /**
+         * Get the last payment for passed financial year
+         * @param year financial year for filter
+         */
+        Loan.prototype.getLastPaymentByYear = function (year) {
+            var finYear = new FinancialYear(new Date(year.toString()));
+            return last__default["default"](this.payments.filter(function (payment) { return payment.date > finYear.startDate && payment.date < finYear.endDate; }));
+        };
+        /**
+         * The size of loan interest
+         * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
+         * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+         */
+        Loan.prototype.getInterest = function () {
+            return new LoanPaymentCollection(this.payments).paymentDue - this.amount;
+        };
+        /**
+         * The last payment size
+         * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
+         * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+         */
+        Loan.prototype.getBalloonPayment = function () {
+            var lastPaymentDueAmount = new LoanPaymentCollection(this.payments).last.paymentDue;
+            return (lastPaymentDueAmount - this.repaymentAmount) > 0 ? lastPaymentDueAmount - this.repaymentAmount : 0;
+        };
+        /**
+         * Percent of ballon payment from all payments
+         * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/212369955/Loans+vehicle+loans
+         * @TODO Vik/Nicole: need to update documentation. Derek gave the right formulas to Mikhail
+         */
+        Loan.prototype.getBalloonPaymentPercentage = function () {
+            return this.getBalloonPayment() / new LoanPaymentCollection(this.payments).paymentDue * 100;
+        };
+        return Loan;
+    }(Loan$1));
+    /**
+     * 30 years is default mortgage term
+     */
+    Loan.mortgageDefaultTerm = 360;
+    /**
+     * 5 years is default bank loan term
+     */
+    Loan.loanDefaultTerm = 60;
+    __decorate([
+        classTransformer.Type(function () { return LoanPayment; })
+    ], Loan.prototype, "payments", void 0);
+    __decorate([
+        classTransformer.Type(function () { return Date; })
+    ], Loan.prototype, "commencementDate", void 0);
+    __decorate([
+        classTransformer.Type(function () { return LoanPayout; })
+    ], Loan.prototype, "payout", void 0);
+
+    exports.TankTypeEnum = void 0;
+    (function (TankTypeEnum) {
+        TankTypeEnum[TankTypeEnum["PROPERTY"] = 1] = "PROPERTY";
+        TankTypeEnum[TankTypeEnum["WORK"] = 2] = "WORK";
+        TankTypeEnum[TankTypeEnum["OTHER"] = 3] = "OTHER";
+        TankTypeEnum[TankTypeEnum["SOLE"] = 4] = "SOLE";
+    })(exports.TankTypeEnum || (exports.TankTypeEnum = {}));
+
+    var BankAccountBalance = /** @class */ (function (_super) {
+        __extends(BankAccountBalance, _super);
+        function BankAccountBalance() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return BankAccountBalance;
+    }(AbstractModel));
+
+    var BankAccountProperty$1 = /** @class */ (function (_super) {
+        __extends(BankAccountProperty, _super);
+        function BankAccountProperty() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return BankAccountProperty;
+    }(AbstractModel));
+
+    var Property$1 = /** @class */ (function (_super) {
+        __extends(Property, _super);
+        function Property() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return Property;
+    }(AbstractModel));
+
+    var PropertySubscription$1 = /** @class */ (function (_super) {
+        __extends(PropertySubscription, _super);
+        function PropertySubscription() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return PropertySubscription;
+    }(AbstractModel));
+
+    var User$1 = /** @class */ (function (_super) {
+        __extends(User, _super);
+        function User() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return User;
+    }(AbstractModel));
+
+    exports.UserStatusEnum = void 0;
+    (function (UserStatusEnum) {
+        UserStatusEnum[UserStatusEnum["INACTIVE"] = 0] = "INACTIVE";
+        UserStatusEnum[UserStatusEnum["ON_BOARDING"] = 1] = "ON_BOARDING";
+        UserStatusEnum[UserStatusEnum["ACTIVE"] = 2] = "ACTIVE";
+    })(exports.UserStatusEnum || (exports.UserStatusEnum = {}));
+
+    exports.UserRolesEnum = void 0;
+    (function (UserRolesEnum) {
+        UserRolesEnum["FIRM_OWNER"] = "ROLE_FIRM_OWNER";
+        UserRolesEnum["FIRM_MANAGER"] = "ROLE_FIRM_MANAGER";
+        UserRolesEnum["CLIENT"] = "ROLE_CLIENT";
+        UserRolesEnum["EMPLOYEE"] = "ROLE_EMPLOYEE";
+        UserRolesEnum["ACCOUNTANT"] = "ROLE_ACCOUNTANT";
+        UserRolesEnum["ADVISOR"] = "ROLE_ADVISOR";
+        UserRolesEnum["USER"] = "ROLE_USER";
+        UserRolesEnum["SUBSCRIPTION"] = "ROLE_USER_SUBSCRIPTION";
+        UserRolesEnum["WORK_TANK"] = "ROLE_USER_WORK";
+        UserRolesEnum["PROPERTY_TANK"] = "ROLE_USER_PROPERTY";
+        UserRolesEnum["SOLE_TANK"] = "ROLE_USER_SOLE";
+        UserRolesEnum["SWITCH_USER"] = "ROLE_PREVIOUS_ADMIN";
+    })(exports.UserRolesEnum || (exports.UserRolesEnum = {}));
+
+    var Address$1 = /** @class */ (function (_super) {
+        __extends(Address, _super);
+        function Address() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return Address;
+    }(AbstractModel));
+
+    var Country$1 = /** @class */ (function (_super) {
+        __extends(Country, _super);
+        function Country() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return Country;
+    }(AbstractModel));
+
+    var Country = /** @class */ (function (_super) {
+        __extends(Country, _super);
+        function Country() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        Object.defineProperty(Country.prototype, "countryWithCode", {
+            /**
+             * Return country name with phone code
+             */
+            get: function () {
+                return this.name + " (+" + this.callingCode + ")";
+            },
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * Check if country calling code is Australian or not
+         */
+        Country.prototype.isAustralianCode = function () {
+            return this.callingCode === '61';
+        };
+        return Country;
+    }(Country$1));
+    Country.australia = classTransformer.plainToClass(Country, { id: 14, name: 'Australia', callingCode: '61' });
+
+    exports.AddressTypeEnum = void 0;
+    (function (AddressTypeEnum) {
+        AddressTypeEnum[AddressTypeEnum["STREET"] = 1] = "STREET";
+        AddressTypeEnum[AddressTypeEnum["POSTAL"] = 2] = "POSTAL";
+    })(exports.AddressTypeEnum || (exports.AddressTypeEnum = {}));
+
+    var Address = /** @class */ (function (_super) {
+        __extends(Address, _super);
+        function Address() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.type = exports.AddressTypeEnum.STREET;
+            return _this;
+        }
+        Address.prototype.toString = function () {
+            return [this.unitNumber, this.address, this.city, this.state, this.postcode].filter(Boolean).join(', ');
+        };
+        Object.defineProperty(Address.prototype, "name", {
+            get: function () {
+                return "" + (this.unitNumber ? this.unitNumber + '/' : '') + this.address;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Address.prototype, "nameLong", {
+            get: function () {
+                return this.name + " " + this.city + " " + this.state + " " + this.postcode;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return Address;
+    }(Address$1));
+    __decorate([
+        classTransformer.Type((function () { return Country; }))
+    ], Address.prototype, "country", void 0);
+
+    var _a$4;
+    var USER_WORK_POSITION = (_a$4 = {},
+        _a$4[exports.UserRolesEnum.EMPLOYEE] = 'Employee',
+        _a$4[exports.UserRolesEnum.FIRM_MANAGER] = 'Manager',
+        _a$4[exports.UserRolesEnum.FIRM_OWNER] = 'Firm Owner',
+        _a$4);
+
+    var ClientDetails$1 = /** @class */ (function (_super) {
+        __extends(ClientDetails, _super);
+        function ClientDetails() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ClientDetails;
+    }(AbstractModel));
+
+    var ClientDetails = /** @class */ (function (_super) {
+        __extends(ClientDetails, _super);
+        function ClientDetails() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ClientDetails;
+    }(ClientDetails$1));
+
+    var EmployeeDetails$1 = /** @class */ (function (_super) {
+        __extends(EmployeeDetails, _super);
+        function EmployeeDetails() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return EmployeeDetails;
+    }(AbstractModel));
+
+    var Firm$1 = /** @class */ (function (_super) {
+        __extends(Firm, _super);
+        function Firm() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return Firm;
+    }(AbstractModel));
+
+    var Phone$1 = /** @class */ (function (_super) {
+        __extends(Phone, _super);
+        function Phone() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return Phone;
+    }(AbstractModel));
+
+    exports.PhoneTypeEnum = void 0;
+    (function (PhoneTypeEnum) {
+        PhoneTypeEnum[PhoneTypeEnum["MOBILE"] = 1] = "MOBILE";
+        PhoneTypeEnum[PhoneTypeEnum["OFFICE"] = 2] = "OFFICE";
+    })(exports.PhoneTypeEnum || (exports.PhoneTypeEnum = {}));
+
+    var Phone = /** @class */ (function (_super) {
+        __extends(Phone, _super);
+        function Phone() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.country = Country.australia;
+            _this.type = exports.PhoneTypeEnum.MOBILE;
+            return _this;
+        }
+        Phone.prototype.toString = function () {
+            return "+" + this.country.callingCode + " " + this.number;
+        };
+        return Phone;
+    }(Phone$1));
+    __decorate([
+        classTransformer.Type(function () { return Country; })
+    ], Phone.prototype, "country", void 0);
+
+    var Firm = /** @class */ (function (_super) {
+        __extends(Firm, _super);
+        function Firm() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        /**
+         * get firm photo link
+         */
+        Firm.prototype.getPhoto = function () {
+            return this.photo;
+        };
+        /**
+         * get firm initials
+         */
+        Firm.prototype.getPhotoPlaceholder = function () {
+            return "" + this.name[0].toUpperCase() + this.name[1];
+        };
+        return Firm;
+    }(Firm$1));
+    __decorate([
+        classTransformer.Type(function () { return User; })
+    ], Firm.prototype, "owner", void 0);
+    __decorate([
+        classTransformer.Type(function () { return Address; })
+    ], Firm.prototype, "address", void 0);
+    __decorate([
+        classTransformer.Type(function () { return Phone; })
+    ], Firm.prototype, "phone", void 0);
+
+    var EmployeeDetails = /** @class */ (function (_super) {
+        __extends(EmployeeDetails, _super);
+        function EmployeeDetails() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return EmployeeDetails;
+    }(EmployeeDetails$1));
+    __decorate([
+        classTransformer.Type(function () { return Firm; })
+    ], EmployeeDetails.prototype, "firm", void 0);
+
+    var ServiceSubscription$1 = /** @class */ (function (_super) {
+        __extends(ServiceSubscription, _super);
+        function ServiceSubscription() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ServiceSubscription;
+    }(AbstractModel));
+
+    var ServiceSubscriptionItem$1 = /** @class */ (function (_super) {
+        __extends(ServiceSubscriptionItem, _super);
+        function ServiceSubscriptionItem() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ServiceSubscriptionItem;
+    }(AbstractModel));
+
+    var ServicePrice$1 = /** @class */ (function (_super) {
+        __extends(ServicePrice, _super);
+        function ServicePrice() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ServicePrice;
+    }(AbstractModel));
+
+    var ServiceProduct$1 = /** @class */ (function (_super) {
+        __extends(ServiceProduct, _super);
+        function ServiceProduct() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ServiceProduct;
+    }(AbstractModel));
+
+    exports.ServiceProductStatusEnum = void 0;
+    (function (ServiceProductStatusEnum) {
+        ServiceProductStatusEnum[ServiceProductStatusEnum["ARCHIVED"] = 0] = "ARCHIVED";
+        ServiceProductStatusEnum[ServiceProductStatusEnum["ACTIVE"] = 1] = "ACTIVE";
+    })(exports.ServiceProductStatusEnum || (exports.ServiceProductStatusEnum = {}));
+
+    exports.ServiceProductIdEnum = void 0;
+    (function (ServiceProductIdEnum) {
+        ServiceProductIdEnum[ServiceProductIdEnum["WORK_TANK_OLD"] = 1] = "WORK_TANK_OLD";
+        ServiceProductIdEnum[ServiceProductIdEnum["PROPERTY_OLD"] = 2] = "PROPERTY_OLD";
+        ServiceProductIdEnum[ServiceProductIdEnum["PROPERTY_TANK"] = 3] = "PROPERTY_TANK";
+        ServiceProductIdEnum[ServiceProductIdEnum["WORK_TANK"] = 4] = "WORK_TANK";
+        ServiceProductIdEnum[ServiceProductIdEnum["PROPERTIES"] = 5] = "PROPERTIES";
+        ServiceProductIdEnum[ServiceProductIdEnum["SOLE_TANK"] = 6] = "SOLE_TANK";
+    })(exports.ServiceProductIdEnum || (exports.ServiceProductIdEnum = {}));
+
+    var ServiceProduct = /** @class */ (function (_super) {
+        __extends(ServiceProduct, _super);
+        function ServiceProduct() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ServiceProduct.prototype.isProperties = function () {
+            return [exports.ServiceProductIdEnum.PROPERTY_OLD, exports.ServiceProductIdEnum.PROPERTIES].includes(this.id);
+        };
+        ServiceProduct.prototype.isWorkTank = function () {
+            return [exports.ServiceProductIdEnum.WORK_TANK_OLD, exports.ServiceProductIdEnum.WORK_TANK].includes(this.id);
+        };
+        ServiceProduct.prototype.isSoleTank = function () {
+            return this.id === exports.ServiceProductIdEnum.SOLE_TANK;
+        };
+        ServiceProduct.prototype.isArchived = function () {
+            return this.status === exports.ServiceProductStatusEnum.ARCHIVED;
+        };
+        return ServiceProduct;
+    }(ServiceProduct$1));
+
+    var ServicePrice = /** @class */ (function (_super) {
+        __extends(ServicePrice, _super);
+        function ServicePrice() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ServicePrice.prototype.toSubscriptionItem = function () {
+            return classTransformer.plainToClass(ServiceSubscriptionItem, { price: this, quantity: this.product.minQty });
+        };
+        return ServicePrice;
+    }(ServicePrice$1));
+    __decorate([
+        classTransformer.Type(function () { return ServiceProduct; })
+    ], ServicePrice.prototype, "product", void 0);
+
+    /**
+     * backend bd doesn't support dynamic prices, as far as we have just one product like that we keep it hardcoded
+     */
+    var PROPERTY_TANK_PRICE = 9;
+    var ServiceSubscriptionItem = /** @class */ (function (_super) {
+        __extends(ServiceSubscriptionItem, _super);
+        function ServiceSubscriptionItem() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        Object.defineProperty(ServiceSubscriptionItem.prototype, "total", {
+            get: function () {
+                var price = this.price.amount * this.quantity;
+                if (this.price.product.id === exports.ServiceProductIdEnum.PROPERTIES) {
+                    price += PROPERTY_TANK_PRICE;
+                }
+                return price;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return ServiceSubscriptionItem;
     }(ServiceSubscriptionItem$1));
     __decorate([
         classTransformer.Type(function () { return ServicePrice; })
@@ -5691,74 +6036,6 @@
         return BankConnection;
     }(AbstractModel));
 
-    var BasiqJob$1 = /** @class */ (function (_super) {
-        __extends(BasiqJob, _super);
-        function BasiqJob() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return BasiqJob;
-    }(AbstractModel));
-
-    var BasiqJob = /** @class */ (function (_super) {
-        __extends(BasiqJob, _super);
-        function BasiqJob() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return BasiqJob;
-    }(BasiqJob$1));
-
-    var Bank$1 = /** @class */ (function (_super) {
-        __extends(Bank, _super);
-        function Bank() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        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() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        Bank.prototype.getPhotoPlaceholder = function () {
-            return this.name[0] + this.name[1];
-        };
-        Bank.prototype.getPhoto = function () {
-            if (!this.logo) {
-                return null;
-            }
-            return this.logo.includes('http') ? "" + this.logo : localStorage.getItem('api_uri') + "/" + this.logo;
-        };
-        return Bank;
-    }(Bank$1));
-    __decorate([
-        classTransformer.Transform(function (_a) {
-            var value = _a.value;
-            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) {
         BankConnectionStatusEnum[BankConnectionStatusEnum["PENDING"] = 1] = "PENDING";
@@ -5940,245 +6217,317 @@
         BankAccount.prototype.isActive = function () {
             return this.status === exports.BankAccountStatusEnum.ACTIVE;
         };
-        /**
-         * first import (transactions) of basiq accounts
-         */
-        BankAccount.prototype.isFirstImport = function () {
-            return !this.lastTransactionDate && !this.isManual;
-        };
-        /**
-         * Check if passed user id is owner of bank account
-         */
-        BankAccount.prototype.isOwner = function (userId) {
-            return this.bankConnection.user.id === userId;
-        };
-        return BankAccount;
-    }(BankAccount$1));
-    __decorate([
-        classTransformer.Type(function () { return BankAccountProperty; })
-    ], BankAccount.prototype, "bankAccountProperties", void 0);
-    __decorate([
-        classTransformer.Type(function () { return SoleBusinessAllocation; })
-    ], BankAccount.prototype, "businessAllocations", void 0);
-    __decorate([
-        classTransformer.Type(function () { return BankAccountBalance; })
-    ], BankAccount.prototype, "balances", void 0);
-    __decorate([
-        classTransformer.Type(function () { return Loan; })
-    ], BankAccount.prototype, "loan", void 0);
-    __decorate([
-        classTransformer.Type(function () { return BankConnection; })
-    ], BankAccount.prototype, "bankConnection", void 0);
-    __decorate([
-        classTransformer.Transform(function (_b) {
-            var value = _b.value;
-            return value === 4 ? exports.BankAccountTypeEnum.LOAN : value;
-        })
-    ], BankAccount.prototype, "type", void 0);
-
-    var TYPE_LOAN = [
-        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);
+        /**
+         * first import (transactions) of basiq accounts
+         */
+        BankAccount.prototype.isFirstImport = function () {
+            return !this.lastTransactionDate && !this.isManual;
         };
         /**
-         * get collection filtered by property id
+         * Check if passed user id is owner of bank account
          */
-        BankAccountCollection.prototype.getByPropertyId = function (id) {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) {
-                return bankAccount.bankAccountProperties.find(function (bankAccountProperty) {
-                    return bankAccountProperty.property.id === id;
-                });
-            }));
+        BankAccount.prototype.isOwner = function (userId) {
+            return this.bankConnection.user.id === userId;
         };
+        return BankAccount;
+    }(BankAccount$1));
+    __decorate([
+        classTransformer.Type(function () { return BankAccountProperty; })
+    ], BankAccount.prototype, "bankAccountProperties", void 0);
+    __decorate([
+        classTransformer.Type(function () { return SoleBusinessAllocation; })
+    ], BankAccount.prototype, "businessAllocations", void 0);
+    __decorate([
+        classTransformer.Type(function () { return BankAccountBalance; })
+    ], BankAccount.prototype, "balances", void 0);
+    __decorate([
+        classTransformer.Type(function () { return Loan; })
+    ], BankAccount.prototype, "loan", void 0);
+    __decorate([
+        classTransformer.Type(function () { return BankConnection; })
+    ], BankAccount.prototype, "bankConnection", void 0);
+    __decorate([
+        classTransformer.Transform(function (_b) {
+            var value = _b.value;
+            return value === 4 ? exports.BankAccountTypeEnum.LOAN : value;
+        })
+    ], BankAccount.prototype, "type", void 0);
+
+    /**
+     * bank account collection UI class with frontend specific data
+     */
+    var BankAccountChartData = /** @class */ (function () {
+        function BankAccountChartData(bankAccounts) {
+            this.bankAccounts = bankAccounts;
+        }
         /**
-         * get collection filtered by properties ids
+         * set value of pie chart data
          */
-        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);
-                });
-            }));
+        BankAccountChartData.prototype.getBalancePieChartData = function () {
+            return this.bankAccounts.map(function (bankAccount) {
+                return {
+                    name: bankAccount.accountName,
+                    data: Math.abs(bankAccount.currentBalance)
+                };
+            });
         };
         /**
-         * get collection of active bank accounts
+         * set value of bar chart data
          */
-        BankAccountCollection.prototype.getActiveBankAccounts = function () {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) {
-                return bankAccount.isActive();
-            }));
+        BankAccountChartData.prototype.getBalanceBarChartData = function () {
+            return [{
+                    name: 'Balance',
+                    data: this.bankAccounts.map(function (bankAccount) {
+                        return {
+                            label: bankAccount.accountName,
+                            value: bankAccount.currentBalance
+                        };
+                    })
+                }];
         };
+        return BankAccountChartData;
+    }());
+
+    /**
+     * Const which contains array of bank account types
+     */
+    var BANK_ACCOUNT_TYPES = [
+        { key: exports.BankAccountTypeEnum.CREDIT_CARD, value: 'Credit Card Accounts' },
+        { key: exports.BankAccountTypeEnum.TERM_DEPOSIT, value: 'Deposit Accounts' },
+        { key: exports.BankAccountTypeEnum.INVESTMENT, value: 'Investment Accounts' },
+        { key: exports.BankAccountTypeEnum.LOAN, value: 'Loan Accounts' },
+        { key: exports.BankAccountTypeEnum.OFFSET, value: 'Offset' },
+        { key: exports.BankAccountTypeEnum.SAVINGS, value: 'Savings Accounts' },
+        { key: exports.BankAccountTypeEnum.TRANSACTION, value: 'Transaction Accounts' },
+    ];
+
+    /**
+     * Login data object for basiq banks
+     */
+    var BankLoginData = /** @class */ (function () {
+        function BankLoginData() {
+        }
+        return BankLoginData;
+    }());
+
+    /**
+     * enum with months indexes.
+     * item value match with js Date month index from 0 to 11
+     * Order of items match with financial year months order
+     */
+    exports.MonthNumberEnum = void 0;
+    (function (MonthNumberEnum) {
+        MonthNumberEnum[MonthNumberEnum["JULY"] = 6] = "JULY";
+        MonthNumberEnum[MonthNumberEnum["AUGUST"] = 7] = "AUGUST";
+        MonthNumberEnum[MonthNumberEnum["SEPTEMBER"] = 8] = "SEPTEMBER";
+        MonthNumberEnum[MonthNumberEnum["OCTOBER"] = 9] = "OCTOBER";
+        MonthNumberEnum[MonthNumberEnum["NOVEMBER"] = 10] = "NOVEMBER";
+        MonthNumberEnum[MonthNumberEnum["DECEMBER"] = 11] = "DECEMBER";
+        MonthNumberEnum[MonthNumberEnum["JANUARY"] = 0] = "JANUARY";
+        MonthNumberEnum[MonthNumberEnum["FEBRUARY"] = 1] = "FEBRUARY";
+        MonthNumberEnum[MonthNumberEnum["MARCH"] = 2] = "MARCH";
+        MonthNumberEnum[MonthNumberEnum["APRIL"] = 3] = "APRIL";
+        MonthNumberEnum[MonthNumberEnum["MAY"] = 4] = "MAY";
+        MonthNumberEnum[MonthNumberEnum["JUNE"] = 5] = "JUNE";
+    })(exports.MonthNumberEnum || (exports.MonthNumberEnum = {}));
+
+    /**
+     * @TODO move to pipe/translation
+     * enum with months short names.
+     * Order of items match with financial year months order
+     */
+    exports.MonthNameShortEnum = void 0;
+    (function (MonthNameShortEnum) {
+        MonthNameShortEnum["JULY"] = "Jul";
+        MonthNameShortEnum["AUGUST"] = "Aug";
+        MonthNameShortEnum["SEPTEMBER"] = "Sep";
+        MonthNameShortEnum["OCTOBER"] = "Oct";
+        MonthNameShortEnum["NOVEMBER"] = "Nov";
+        MonthNameShortEnum["DECEMBER"] = "Dec";
+        MonthNameShortEnum["JANUARY"] = "Jan";
+        MonthNameShortEnum["FEBRUARY"] = "Feb";
+        MonthNameShortEnum["MARCH"] = "Mar";
+        MonthNameShortEnum["APRIL"] = "Apr";
+        MonthNameShortEnum["MAY"] = "May";
+        MonthNameShortEnum["JUNE"] = "Jun";
+    })(exports.MonthNameShortEnum || (exports.MonthNameShortEnum = {}));
+
+    /**
+     * bank transactions collection UI class with frontend specific data
+     */
+    var BankTransactionChartData = /** @class */ (function () {
+        function BankTransactionChartData(bankTransactions) {
+            this.bankTransactions = bankTransactions;
+        }
         /**
-         * get reduction of loan (reduction of principle) percentage
+         * get value of bar chart data
          */
-        BankAccountCollection.prototype.getPrincipleReductionPercent = function () {
-            var initialLoans = this.getInitialLoanAmount();
-            var currentLoans = this.getCurrentLoanAmount();
-            if (!initialLoans) {
-                return 0;
+        BankTransactionChartData.prototype.getCashInOutBarChartData = function (months) {
+            var chartData = this.calculateCashInOutBarChartData();
+            if (!months) {
+                return chartData;
             }
-            return (initialLoans - currentLoans) / initialLoans * 100;
+            return this.filterChartDataByMonths(months, chartData);
         };
         /**
-         * Get collection of loan bank accounts
+         * get value of line chart data
          */
-        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);
+        BankTransactionChartData.prototype.getBalanceLineChartData = function (months) {
+            var chartData = this.calculateBalanceLineChartData();
+            if (!months) {
+                return chartData;
+            }
+            return this.filterChartDataByMonths(months, chartData);
         };
-        Object.defineProperty(BankAccountCollection.prototype, "currentBalance", {
-            get: function () {
-                return this.sumBy('currentBalance');
-            },
-            enumerable: false,
-            configurable: true
-        });
         /**
-         * Get Collection of bank accounts with property tank type
+         * set bar chart data
          */
-        BankAccountCollection.prototype.getPropertyBankAccounts = function () {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isPropertyTank(); }));
+        BankTransactionChartData.prototype.calculateCashInOutBarChartData = function () {
+            var chartData = [{
+                    name: 'Cash In',
+                    data: []
+                }, {
+                    name: 'Cash Out',
+                    data: []
+                }];
+            var _loop_1 = function (key) {
+                if (exports.MonthNameShortEnum.hasOwnProperty(key)) {
+                    var bankTransactionsForMonth = this_1.bankTransactions.filter(function (bankTransaction) {
+                        return +bankTransaction.date.getMonth() === +exports.MonthNumberEnum[key];
+                    });
+                    var cashInForMonth = bankTransactionsForMonth
+                        .filter(function (bankTransaction) { return bankTransaction.isCredit(); })
+                        .reduce(function (sum, bankTransaction) { return sum += bankTransaction.allocatedAmount; }, 0);
+                    var cashOutForMonth = bankTransactionsForMonth
+                        .filter(function (bankTransaction) { return bankTransaction.isDebit(); })
+                        .reduce(function (sum, bankTransaction) { return sum += bankTransaction.allocatedAmount; }, 0);
+                    chartData[0].data.push({
+                        label: exports.MonthNameShortEnum[key],
+                        value: cashInForMonth
+                    });
+                    chartData[1].data.push({
+                        label: exports.MonthNameShortEnum[key],
+                        value: cashOutForMonth
+                    });
+                }
+            };
+            var this_1 = this;
+            for (var key in exports.MonthNameShortEnum) {
+                _loop_1(key);
+            }
+            return chartData;
         };
         /**
-         * Get Collection of bank accounts with work tank type
+         * set line chart data
          */
-        BankAccountCollection.prototype.getWorkBankAccounts = function () {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isWorkTank(); }));
+        BankTransactionChartData.prototype.calculateBalanceLineChartData = function () {
+            var chartData = [{
+                    name: 'Balance',
+                    data: []
+                }];
+            var _loop_2 = function (key) {
+                if (exports.MonthNameShortEnum.hasOwnProperty(key)) {
+                    var bankTransactionsForMonth = this_2.bankTransactions.filter(function (bankTransaction) {
+                        return +bankTransaction.date.getMonth() === +exports.MonthNumberEnum[key];
+                    });
+                    var balanceForMonth = bankTransactionsForMonth.reduce(function (sum, bankTransaction) {
+                        if (bankTransaction.isCredit()) {
+                            return sum += bankTransaction.allocatedAmount;
+                        }
+                        else {
+                            return sum -= bankTransaction.allocatedAmount;
+                        }
+                    }, 0);
+                    chartData[0].data.push({
+                        label: exports.MonthNameShortEnum[key],
+                        value: balanceForMonth
+                    });
+                }
+            };
+            var this_2 = this;
+            for (var key in exports.MonthNameShortEnum) {
+                _loop_2(key);
+            }
+            return chartData;
         };
         /**
-         * Get Collection of bank accounts by tank type
+         * filter chart data for passed months
          */
-        BankAccountCollection.prototype.getByTankType = function (tankType) {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.tankType === tankType; }));
+        BankTransactionChartData.prototype.filterChartDataByMonths = function (months, chartData) {
+            var monthsNames = months.map(function (month) { return exports.MonthNumberEnum[month]; }).map(function (key) { return exports.MonthNameShortEnum[key]; });
+            var filteredChartData = cloneDeep__default["default"](chartData);
+            filteredChartData.forEach(function (chartDataItem) {
+                chartDataItem.data = chartDataItem.data.filter(function (serie) { return monthsNames.includes(serie.label); });
+            });
+            return filteredChartData;
         };
+        return BankTransactionChartData;
+    }());
+
+    exports.BankTransactionSummaryFieldsEnum = void 0;
+    (function (BankTransactionSummaryFieldsEnum) {
+        BankTransactionSummaryFieldsEnum["AMOUNT"] = "amount";
+        BankTransactionSummaryFieldsEnum["ALLOCATED_AMOUNT"] = "allocatedAmount";
+    })(exports.BankTransactionSummaryFieldsEnum || (exports.BankTransactionSummaryFieldsEnum = {}));
+
+    var Document$1 = /** @class */ (function (_super) {
+        __extends(Document, _super);
+        function Document() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return Document;
+    }(AbstractModel));
+
+    /**
+     * Enum with document types which used to API url prefix
+     */
+    exports.DocumentApiUrlPrefixEnum = void 0;
+    (function (DocumentApiUrlPrefixEnum) {
+        DocumentApiUrlPrefixEnum["FOLDERS"] = "folders";
+        DocumentApiUrlPrefixEnum["PROPERTIES"] = "properties";
+    })(exports.DocumentApiUrlPrefixEnum || (exports.DocumentApiUrlPrefixEnum = {}));
+
+    var Document = /** @class */ (function (_super) {
+        __extends(Document, _super);
+        function Document() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.type = exports.AssetTypeEnum.DOCUMENTS;
+            _this.entityType = exports.AssetEntityTypeEnum.FOLDERS;
+            return _this;
+        }
         /**
-         * Get list of all bank account properties
+         * Get folder as document parent entity
          */
-        BankAccountCollection.prototype.getBankAccountPropertiesList = function () {
-            return flatten__default["default"](this.items.map(function (bankAccount) {
-                return bankAccount.bankAccountProperties;
-            }));
+        Document.prototype.getEntity = function () {
+            return this.folder;
         };
         /**
-         * Get lis of unique properties from all bank accounts properties
+         * Get API url prefix
          */
-        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);
+        Document.prototype.getApiUrlPrefix = function () {
+            return exports.DocumentApiUrlPrefixEnum.FOLDERS;
         };
-        return BankAccountCollection;
-    }(Collection));
+        return Document;
+    }(Document$1));
 
-    var UserEventTypeTypeEnum;
-    (function (UserEventTypeTypeEnum) {
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTERED"] = 1000] = "REGISTERED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PASSWORD_RESET_REQUEST"] = 1001] = "PASSWORD_RESET_REQUEST";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["APP_FEATURES"] = 1010] = "APP_FEATURES";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIBED"] = 2000] = "SUBSCRIBED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["UNSUBSCRIBED"] = 2001] = "UNSUBSCRIBED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_UPDATE"] = 2004] = "SUBSCRIPTION_UPDATE";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_TRIAL_UPDATE"] = 2005] = "SUBSCRIPTION_TRIAL_UPDATE";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["SUBSCRIPTION_PAYMENT_FAILED"] = 2006] = "SUBSCRIPTION_PAYMENT_FAILED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE"] = 2010] = "CLIENT_INVITE";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_TO_REGISTER"] = 2011] = "CLIENT_INVITE_TO_REGISTER";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_ACCEPTED"] = 2012] = "FIRM_INVITE_ACCEPTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_REJECTED"] = 2013] = "FIRM_INVITE_REJECTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_REGISTERED"] = 2014] = "FIRM_INVITE_REGISTERED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE"] = 2020] = "PROPERTY_SHARE_INVITE";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_TO_REGISTER"] = 2021] = "PROPERTY_SHARE_INVITE_TO_REGISTER";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_ACCEPTED"] = 2022] = "PROPERTY_SHARE_INVITE_ACCEPTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_REJECTED"] = 2023] = "PROPERTY_SHARE_INVITE_REJECTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_INVITE_REGISTERED"] = 2024] = "PROPERTY_SHARE_INVITE_REGISTERED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_REQUESTED"] = 2025] = "PROPERTY_SHARE_CHANGE_REQUESTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_ACCEPTED"] = 2026] = "PROPERTY_SHARE_CHANGE_ACCEPTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["PROPERTY_SHARE_CHANGE_REJECTED"] = 2027] = "PROPERTY_SHARE_CHANGE_REJECTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["OWNER_SUBSCRIBED"] = 2028] = "OWNER_SUBSCRIBED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["OWNER_UNSUBSCRIBED"] = 2029] = "OWNER_UNSUBSCRIBED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_NEW_ACCOUNTS"] = 2030] = "BASIQ_NEW_ACCOUNTS";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_FIRST_IMPORT_COMPLETE"] = 2031] = "BASIQ_FIRST_IMPORT_COMPLETE";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["BASIQ_AUTHORIZATION_FAIL"] = 2032] = "BASIQ_AUTHORIZATION_FAIL";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["TRANSACTION_ALLOCATE_REMINDER"] = 2033] = "TRANSACTION_ALLOCATE_REMINDER";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTRATION_INVITE"] = 2040] = "REGISTRATION_INVITE";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["REGISTRATION_INVITE_ACCEPTED"] = 2041] = "REGISTRATION_INVITE_ACCEPTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_EMAIL_CONFIRMED"] = 2050] = "CLIENT_EMAIL_CONFIRMED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["TAX_REVIEW_REQUESTED"] = 2060] = "TAX_REVIEW_REQUESTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE_TO_REGISTER"] = 3000] = "FIRM_INVITE_TO_REGISTER";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_INVITE"] = 3001] = "FIRM_INVITE";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_ACCEPTED"] = 3002] = "CLIENT_INVITE_ACCEPTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_REJECTED"] = 3003] = "CLIENT_INVITE_REJECTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["CLIENT_INVITE_REGISTERED"] = 3004] = "CLIENT_INVITE_REGISTERED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_NEW_CLIENT"] = 3005] = "FIRM_NEW_CLIENT";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["FIRM_LOST_CLIENT"] = 3006] = "FIRM_LOST_CLIENT";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_INVITE"] = 3010] = "EMPLOYEE_INVITE";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_LOST_CLIENT"] = 3011] = "EMPLOYEE_LOST_CLIENT";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_NEW_CLIENT"] = 3012] = "EMPLOYEE_NEW_CLIENT";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_INVITE_ACCEPTED"] = 3013] = "EMPLOYEE_INVITE_ACCEPTED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["EMPLOYEE_EMAIL_CONFIRMED"] = 3020] = "EMPLOYEE_EMAIL_CONFIRMED";
-        UserEventTypeTypeEnum[UserEventTypeTypeEnum["TAX_REVIEW_RECEIVED"] = 3030] = "TAX_REVIEW_RECEIVED";
-    })(UserEventTypeTypeEnum || (UserEventTypeTypeEnum = {}));
+    var DocumentFolder$1 = /** @class */ (function (_super) {
+        __extends(DocumentFolder, _super);
+        function DocumentFolder() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return DocumentFolder;
+    }(AbstractModel));
 
-    /**
-     * 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;
+    var DocumentFolder = /** @class */ (function (_super) {
+        __extends(DocumentFolder, _super);
+        function DocumentFolder() {
+            return _super !== null && _super.apply(this, arguments) || this;
         }
-        return AppEvent;
-    }());
+        return DocumentFolder;
+    }(DocumentFolder$1));
+    __decorate([
+        classTransformer.Type(function () { return Document; })
+    ], DocumentFolder.prototype, "documents", void 0);
 
     /**
      * BankConnection means user account at specific bank (usually each user has only one at the same bank)
@@ -6278,6 +6627,7 @@
          */
         BasiqService.prototype.listenEvents = function () {
             this.listenNotifications();
+            this.listenJobs();
         };
         /**
          * Create a new Bank connection based on Basiq job.
@@ -6290,6 +6640,7 @@
             // 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) {
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_JOB_CREATED, response.id));
                 // Create bank connection based on basiq job
                 return _this.bankConnectionService.add(classTransformer.plainToClass(BankConnection, { basiqJob: { externalId: response.id } }));
             }), operators.catchError(function (error) {
@@ -6311,8 +6662,12 @@
             // Send login data and connection id to basiq API to create a basiq job
             return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", Object.assign(data, { id: connection.externalId }))
                 .pipe(operators.mergeMap(function (response) {
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_JOB_CREATED, response.id));
                 // Create bank connection based on basiq job
-                return _this.bankConnectionService.add(classTransformer.plainToClass(BankConnection, { id: connection.id, basiqJob: { externalId: response.id } }));
+                return _this.bankConnectionService.add(classTransformer.plainToClass(BankConnection, {
+                    id: connection.id,
+                    basiqJob: { externalId: response.id }
+                }));
             }), operators.catchError(function (error) {
                 // Show error when user provided wrong login data
                 if (error.status === 401) {
@@ -6335,6 +6690,35 @@
                 return bankAccounts.removeBy('accountId', savedAccounts.mapBy('accountId'));
             }));
         };
+        /**
+         * Get status of credentials verifying. Expected statuses: 'in-progress', 'failed' or 'success'
+         * We send this request by interval until basiq return success or failed
+         * @TODO Alex (TT-2431): check logic and try to remove subscribe, use pipes instead
+         * @TODO Alex (TT-2431): implement some limit and handle (message or something) if basiq stuck
+         * @TODO Alex (TT-2431): check logic and handle case when user cancelled loading
+         */
+        BasiqService.prototype.checkBankCredentials = function (jobId) {
+            var _this = this;
+            this.http.get(BasiqService.basiqApiUrl + "/jobs/" + jobId)
+                .pipe(
+            // unsubscribe after each request to avoid wrong requests (example: user cancelled too long login and login to another bank, then we will send 2 different requests)
+            operators.take(1), 
+            // get verify-credentials step from basiq job
+            operators.map(function (response) { return classTransformer.plainToClass(BasiqJobResponse, response).getVerifyCredentialsStep(); }), 
+            // check credentials status again if not finished
+            operators.filter(function (step) {
+                if (!step.isInProgress()) {
+                    return true;
+                }
+                setTimeout(function () {
+                    _this.checkBankCredentials(jobId);
+                }, BasiqService.bankCredintialsCheckInterval);
+                return false;
+            }))
+                .subscribe(function (step) {
+                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_LOGIN_FINISHED, step.isSuccess()));
+            });
+        };
         /**
          * listen to notifications to update basiq accounts list
          */
@@ -6346,9 +6730,22 @@
                 }
             });
         };
+        /**
+         * Listen Basiq job created to check its verify credentials status
+         */
+        BasiqService.prototype.listenJobs = function () {
+            var _this = this;
+            this.eventDispatcherService.on(exports.AppEventTypeEnum.BASIQ_JOB_CREATED).subscribe(function (jobId) {
+                _this.checkBankCredentials(jobId);
+            });
+        };
         return BasiqService;
     }(RestService));
     BasiqService.basiqApiUrl = 'https://au-api.basiq.io';
+    /**
+     * Basiq does not provide a hook, so we have to check job status manually every x seconds
+     */
+    BasiqService.bankCredintialsCheckInterval = 3000;
     BasiqService.ɵfac = i0__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: [{
@@ -6363,20 +6760,6 @@
                         }] }, { type: ToastService }, { type: BankConnectionService }];
         } });
 
-    /**
-     * access token, needed to access basiq connect ui (https://github.com/basiqio/basiq-connect-ui)
-     */
-    var BasiqToken = /** @class */ (function () {
-        function BasiqToken(value, expiresAt) {
-            this.value = value;
-            this.expiresAt = expiresAt;
-        }
-        BasiqToken.prototype.isExpired = function () {
-            return this.expiresAt < new Date();
-        };
-        return BasiqToken;
-    }());
-
     var BasiqTokenService = /** @class */ (function () {
         function BasiqTokenService(http, environment) {
             this.http = http;
@@ -6634,6 +7017,12 @@
          */
         UserService.prototype.createBasiq = function () {
             var _this = this;
+            var _a;
+            // no need to create basiqId if already exist
+            // @TODO Alex (TT-2431): move this check to component or separated method
+            if ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.basiqId) {
+                return rxjs.of(this.cache.basiqId);
+            }
             return this.http.post(this.environment.apiV2 + "/basiq/user", {})
                 .pipe(operators.map(function (basiqId) {
                 _this.cache = classTransformer.plainToClass(User, Object.assign(_this.cache, { basiqId: basiqId }));
@@ -6794,86 +7183,27 @@
                         useValue: environment
                     }
                 ]
-            };
-        };
-        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 Document$1 = /** @class */ (function (_super) {
-        __extends(Document, _super);
-        function Document() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return Document;
-    }(AbstractModel));
-
-    /**
-     * Enum with document types which used to API url prefix
-     */
-    exports.DocumentApiUrlPrefixEnum = void 0;
-    (function (DocumentApiUrlPrefixEnum) {
-        DocumentApiUrlPrefixEnum["FOLDERS"] = "folders";
-        DocumentApiUrlPrefixEnum["PROPERTIES"] = "properties";
-    })(exports.DocumentApiUrlPrefixEnum || (exports.DocumentApiUrlPrefixEnum = {}));
-
-    var Document = /** @class */ (function (_super) {
-        __extends(Document, _super);
-        function Document() {
-            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            _this.type = exports.AssetTypeEnum.DOCUMENTS;
-            _this.entityType = exports.AssetEntityTypeEnum.FOLDERS;
-            return _this;
-        }
-        /**
-         * Get folder as document parent entity
-         */
-        Document.prototype.getEntity = function () {
-            return this.folder;
-        };
-        /**
-         * Get API url prefix
-         */
-        Document.prototype.getApiUrlPrefix = function () {
-            return exports.DocumentApiUrlPrefixEnum.FOLDERS;
-        };
-        return Document;
-    }(Document$1));
-
-    var DocumentFolder$1 = /** @class */ (function (_super) {
-        __extends(DocumentFolder, _super);
-        function DocumentFolder() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return DocumentFolder;
-    }(AbstractModel));
-
-    var DocumentFolder = /** @class */ (function (_super) {
-        __extends(DocumentFolder, _super);
-        function DocumentFolder() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        return DocumentFolder;
-    }(DocumentFolder$1));
-    __decorate([
-        classTransformer.Type(function () { return Document; })
-    ], DocumentFolder.prototype, "documents", void 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 VehicleClaimCollection = /** @class */ (function (_super) {
         __extends(VehicleClaimCollection, _super);
@@ -9403,244 +9733,14 @@
     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
-     */
-    var BankAccountChartData = /** @class */ (function () {
-        function BankAccountChartData(bankAccounts) {
-            this.bankAccounts = bankAccounts;
-        }
-        /**
-         * set value of pie chart data
-         */
-        BankAccountChartData.prototype.getBalancePieChartData = function () {
-            return this.bankAccounts.map(function (bankAccount) {
-                return {
-                    name: bankAccount.accountName,
-                    data: Math.abs(bankAccount.currentBalance)
-                };
-            });
-        };
-        /**
-         * set value of bar chart data
-         */
-        BankAccountChartData.prototype.getBalanceBarChartData = function () {
-            return [{
-                    name: 'Balance',
-                    data: this.bankAccounts.map(function (bankAccount) {
-                        return {
-                            label: bankAccount.accountName,
-                            value: bankAccount.currentBalance
-                        };
-                    })
-                }];
-        };
-        return BankAccountChartData;
-    }());
-
-    /**
-     * Const which contains array of bank account types
-     */
-    var BANK_ACCOUNT_TYPES = [
-        { key: exports.BankAccountTypeEnum.CREDIT_CARD, value: 'Credit Card Accounts' },
-        { key: exports.BankAccountTypeEnum.TERM_DEPOSIT, value: 'Deposit Accounts' },
-        { key: exports.BankAccountTypeEnum.INVESTMENT, value: 'Investment Accounts' },
-        { key: exports.BankAccountTypeEnum.LOAN, value: 'Loan Accounts' },
-        { key: exports.BankAccountTypeEnum.OFFSET, value: 'Offset' },
-        { key: exports.BankAccountTypeEnum.SAVINGS, value: 'Savings Accounts' },
-        { key: exports.BankAccountTypeEnum.TRANSACTION, value: 'Transaction Accounts' },
-    ];
-
-    /**
-     * Login data object for basiq banks
-     */
-    var BankLoginData = /** @class */ (function () {
-        function BankLoginData() {
-        }
-        return BankLoginData;
-    }());
-
-    /**
-     * enum with months indexes.
-     * item value match with js Date month index from 0 to 11
-     * Order of items match with financial year months order
-     */
-    exports.MonthNumberEnum = void 0;
-    (function (MonthNumberEnum) {
-        MonthNumberEnum[MonthNumberEnum["JULY"] = 6] = "JULY";
-        MonthNumberEnum[MonthNumberEnum["AUGUST"] = 7] = "AUGUST";
-        MonthNumberEnum[MonthNumberEnum["SEPTEMBER"] = 8] = "SEPTEMBER";
-        MonthNumberEnum[MonthNumberEnum["OCTOBER"] = 9] = "OCTOBER";
-        MonthNumberEnum[MonthNumberEnum["NOVEMBER"] = 10] = "NOVEMBER";
-        MonthNumberEnum[MonthNumberEnum["DECEMBER"] = 11] = "DECEMBER";
-        MonthNumberEnum[MonthNumberEnum["JANUARY"] = 0] = "JANUARY";
-        MonthNumberEnum[MonthNumberEnum["FEBRUARY"] = 1] = "FEBRUARY";
-        MonthNumberEnum[MonthNumberEnum["MARCH"] = 2] = "MARCH";
-        MonthNumberEnum[MonthNumberEnum["APRIL"] = 3] = "APRIL";
-        MonthNumberEnum[MonthNumberEnum["MAY"] = 4] = "MAY";
-        MonthNumberEnum[MonthNumberEnum["JUNE"] = 5] = "JUNE";
-    })(exports.MonthNumberEnum || (exports.MonthNumberEnum = {}));
-
-    /**
-     * @TODO move to pipe/translation
-     * enum with months short names.
-     * Order of items match with financial year months order
-     */
-    exports.MonthNameShortEnum = void 0;
-    (function (MonthNameShortEnum) {
-        MonthNameShortEnum["JULY"] = "Jul";
-        MonthNameShortEnum["AUGUST"] = "Aug";
-        MonthNameShortEnum["SEPTEMBER"] = "Sep";
-        MonthNameShortEnum["OCTOBER"] = "Oct";
-        MonthNameShortEnum["NOVEMBER"] = "Nov";
-        MonthNameShortEnum["DECEMBER"] = "Dec";
-        MonthNameShortEnum["JANUARY"] = "Jan";
-        MonthNameShortEnum["FEBRUARY"] = "Feb";
-        MonthNameShortEnum["MARCH"] = "Mar";
-        MonthNameShortEnum["APRIL"] = "Apr";
-        MonthNameShortEnum["MAY"] = "May";
-        MonthNameShortEnum["JUNE"] = "Jun";
-    })(exports.MonthNameShortEnum || (exports.MonthNameShortEnum = {}));
-
-    /**
-     * bank transactions collection UI class with frontend specific data
-     */
-    var BankTransactionChartData = /** @class */ (function () {
-        function BankTransactionChartData(bankTransactions) {
-            this.bankTransactions = bankTransactions;
-        }
-        /**
-         * get value of bar chart data
-         */
-        BankTransactionChartData.prototype.getCashInOutBarChartData = function (months) {
-            var chartData = this.calculateCashInOutBarChartData();
-            if (!months) {
-                return chartData;
-            }
-            return this.filterChartDataByMonths(months, chartData);
-        };
-        /**
-         * get value of line chart data
-         */
-        BankTransactionChartData.prototype.getBalanceLineChartData = function (months) {
-            var chartData = this.calculateBalanceLineChartData();
-            if (!months) {
-                return chartData;
-            }
-            return this.filterChartDataByMonths(months, chartData);
-        };
-        /**
-         * set bar chart data
-         */
-        BankTransactionChartData.prototype.calculateCashInOutBarChartData = function () {
-            var chartData = [{
-                    name: 'Cash In',
-                    data: []
-                }, {
-                    name: 'Cash Out',
-                    data: []
-                }];
-            var _loop_1 = function (key) {
-                if (exports.MonthNameShortEnum.hasOwnProperty(key)) {
-                    var bankTransactionsForMonth = this_1.bankTransactions.filter(function (bankTransaction) {
-                        return +bankTransaction.date.getMonth() === +exports.MonthNumberEnum[key];
-                    });
-                    var cashInForMonth = bankTransactionsForMonth
-                        .filter(function (bankTransaction) { return bankTransaction.isCredit(); })
-                        .reduce(function (sum, bankTransaction) { return sum += bankTransaction.allocatedAmount; }, 0);
-                    var cashOutForMonth = bankTransactionsForMonth
-                        .filter(function (bankTransaction) { return bankTransaction.isDebit(); })
-                        .reduce(function (sum, bankTransaction) { return sum += bankTransaction.allocatedAmount; }, 0);
-                    chartData[0].data.push({
-                        label: exports.MonthNameShortEnum[key],
-                        value: cashInForMonth
-                    });
-                    chartData[1].data.push({
-                        label: exports.MonthNameShortEnum[key],
-                        value: cashOutForMonth
-                    });
-                }
-            };
-            var this_1 = this;
-            for (var key in exports.MonthNameShortEnum) {
-                _loop_1(key);
-            }
-            return chartData;
-        };
-        /**
-         * set line chart data
-         */
-        BankTransactionChartData.prototype.calculateBalanceLineChartData = function () {
-            var chartData = [{
-                    name: 'Balance',
-                    data: []
-                }];
-            var _loop_2 = function (key) {
-                if (exports.MonthNameShortEnum.hasOwnProperty(key)) {
-                    var bankTransactionsForMonth = this_2.bankTransactions.filter(function (bankTransaction) {
-                        return +bankTransaction.date.getMonth() === +exports.MonthNumberEnum[key];
-                    });
-                    var balanceForMonth = bankTransactionsForMonth.reduce(function (sum, bankTransaction) {
-                        if (bankTransaction.isCredit()) {
-                            return sum += bankTransaction.allocatedAmount;
-                        }
-                        else {
-                            return sum -= bankTransaction.allocatedAmount;
-                        }
-                    }, 0);
-                    chartData[0].data.push({
-                        label: exports.MonthNameShortEnum[key],
-                        value: balanceForMonth
-                    });
-                }
-            };
-            var this_2 = this;
-            for (var key in exports.MonthNameShortEnum) {
-                _loop_2(key);
-            }
-            return chartData;
-        };
-        /**
-         * filter chart data for passed months
-         */
-        BankTransactionChartData.prototype.filterChartDataByMonths = function (months, chartData) {
-            var monthsNames = months.map(function (month) { return exports.MonthNumberEnum[month]; }).map(function (key) { return exports.MonthNameShortEnum[key]; });
-            var filteredChartData = cloneDeep__default["default"](chartData);
-            filteredChartData.forEach(function (chartDataItem) {
-                chartDataItem.data = chartDataItem.data.filter(function (serie) { return monthsNames.includes(serie.label); });
-            });
-            return filteredChartData;
-        };
-        return BankTransactionChartData;
-    }());
-
-    exports.BankTransactionSummaryFieldsEnum = void 0;
-    (function (BankTransactionSummaryFieldsEnum) {
-        BankTransactionSummaryFieldsEnum["AMOUNT"] = "amount";
-        BankTransactionSummaryFieldsEnum["ALLOCATED_AMOUNT"] = "allocatedAmount";
-    })(exports.BankTransactionSummaryFieldsEnum || (exports.BankTransactionSummaryFieldsEnum = {}));
-
-    /**
-     * Class describe configuration options for basiq connect control
-     * https://www.npmjs.com/package/@basiq/basiq-connect-control
-     */
-    var BasiqConfig = /** @class */ (function () {
-        function BasiqConfig(options) {
-            // ID of the DOM element to which Basiq Connect Control will be rendered;
-            this.containerId = 'basiq-control';
-            Object.assign(this, options);
+            var _this = _super.call(this) || this;
+            _this.text = '';
+            _this.text = text;
+            _this.color = color || exports.BadgeColorEnum.DEFAULT;
+            return _this;
         }
-        return BasiqConfig;
-    }());
+        return Badge;
+    }(AbstractModel));
 
     var BorrowingExpense$1 = /** @class */ (function (_super) {
         __extends(BorrowingExpense, _super);
@@ -17451,93 +17551,6 @@
         return AbstractForm;
     }(forms.FormGroup));
 
-    /**
-     * Form with loan details.
-     * Loan could be created from bank account (Bank Loan) or directly from loan page (Vehicle Loan)
-     */
-    var LoanForm = /** @class */ (function (_super) {
-        __extends(LoanForm, _super);
-        function LoanForm(loan) {
-            if (loan === void 0) { loan = classTransformer.plainToClass(Loan, {}); }
-            var _this = _super.call(this, {
-                type: new forms.FormControl(loan.type, forms.Validators.required),
-                amount: new forms.FormControl(loan.amount, forms.Validators.required),
-                interestRate: new forms.FormControl(loan.interestRate, [forms.Validators.required, forms.Validators.min(0), forms.Validators.max(100)]),
-                commencementDate: new forms.FormControl(loan.commencementDate, forms.Validators.required),
-                repaymentAmount: new forms.FormControl(loan.repaymentAmount, forms.Validators.required),
-                repaymentFrequency: new forms.FormControl(loan.repaymentFrequency, forms.Validators.required),
-                term: new forms.FormControl(loan.term, forms.Validators.required),
-                // interestType is predefined for vehicle loans
-                interestType: new forms.FormControl({ value: loan.interestType, disabled: !loan.bankAccount }, forms.Validators.required),
-                // availableRedraw is predefined for vehicle loans
-                availableRedraw: new forms.FormControl({ value: loan.availableRedraw, disabled: !loan.bankAccount }, forms.Validators.required),
-                // repaymentType is predefined for vehicle loans
-                repaymentType: new forms.FormControl({ value: loan.repaymentType, disabled: !loan.bankAccount }, forms.Validators.required),
-            }, loan) || this;
-            _this.loan = loan;
-            // Set data which always the same for vehicle loans
-            if (!loan.bankAccount) {
-                Object.assign(_this.model, {
-                    repaymentType: exports.LoanRepaymentTypeEnum.PRINCIPAL_AND_INTEREST,
-                    availableRedraw: 0,
-                    interestType: exports.LoanInterestTypeEnum.FIXED_RATE
-                });
-            }
-            _this.updateTermValidation();
-            _this.listenEvents();
-            return _this;
-        }
-        LoanForm.prototype.listenEvents = function () {
-            // We need to set term automatically only for bank loans.
-            // For vehicle loans user should fill it manually with validation depended of frequency
-            if (!!this.loan.bankAccount) {
-                this.listenTypeChanges();
-            }
-            else {
-                this.listenRepaymentFrequencyChanges();
-            }
-        };
-        /**
-         * Set term automatically by loan type changes
-         */
-        LoanForm.prototype.listenTypeChanges = function () {
-            var _this = this;
-            this.get('type').valueChanges.subscribe(function (type) {
-                _this.get('term').setValue(LoanForm.mortgageLoanTypes.includes(type) ? Loan.mortgageDefaultTerm : Loan.loanDefaultTerm);
-            });
-        };
-        /**
-         * term validation depends on selected repaymentFrequency
-         */
-        LoanForm.prototype.listenRepaymentFrequencyChanges = function () {
-            var _this = this;
-            this.get('repaymentFrequency').valueChanges.subscribe(function () {
-                _this.updateTermValidation();
-            });
-        };
-        /**
-         * For vehicle loans term has a maximum value depended of repayment frequency
-         */
-        LoanForm.prototype.updateTermValidation = function () {
-            // no need terms for bank loans
-            if (!!this.loan.bankAccount) {
-                return;
-            }
-            var currentRepaymentFrequency = this.get('repaymentFrequency').value;
-            // term validation depends on selected repayment frequency, so can not validate when frequency is empty
-            // repaymentType is required field, so we don't need to clear validation
-            if (!currentRepaymentFrequency) {
-                return;
-            }
-            var termControl = this.get('term');
-            var maxTermValue = exports.LoanMaxNumberOfPaymentsEnum[exports.LoanRepaymentFrequencyEnum[currentRepaymentFrequency]];
-            termControl.setValidators([forms.Validators.max(maxTermValue)]);
-            termControl.updateValueAndValidity();
-        };
-        return LoanForm;
-    }(AbstractForm));
-    LoanForm.mortgageLoanTypes = [exports.LoanTypeEnum.MORTGAGE, exports.LoanTypeEnum.HOME_EQUITY_LINE_OF_CREDIT, exports.LoanTypeEnum.HOME_LOAN];
-
     /**
      * Check if at least one form field is true, otherwise form is invalid.
      * Use with groups of boolean form controls (checkbox, toggle, etc.)
@@ -17671,6 +17684,259 @@
         };
     }
 
+    /**
+     * Validator for address, check if corelogic suggestion selected correctly
+     */
+    function addressCorelogicValidator() {
+        return function (form) {
+            if (form.isCorelogicRequired) {
+                if (form.get('corelogicLocId').hasError('required')) {
+                    return { address: 'Street, city, state or postal code not specified' };
+                }
+                if (form.get('corelogicRefId').hasError('required')) {
+                    return { address: 'Unit/House number not specified' };
+                }
+            }
+            return null;
+        };
+    }
+
+    /**
+     * Address form. Works with corelogic or manual address
+     */
+    var AddressForm = /** @class */ (function (_super) {
+        __extends(AddressForm, _super);
+        /**
+         * @param address instance which should be created/edited
+         * @param isCorelogicRequired for example, for property we need corelogic location even for manual address,
+         * so we have to search corelogic location based on manual fields values
+         */
+        function AddressForm(address, isCorelogicRequired) {
+            if (address === void 0) { address = classTransformer.plainToClass(Address, {}); }
+            if (isCorelogicRequired === void 0) { isCorelogicRequired = false; }
+            var _this = _super.call(this, {
+                // prefill search input with address string for edit case
+                searchQuery: new forms.FormControl(address.address ? address.nameLong : null, forms.Validators.required),
+                type: new forms.FormControl(address.type | exports.AddressTypeEnum.STREET, forms.Validators.required),
+                // Corelogic fields
+                corelogicLocId: new forms.FormControl(address.corelogicLocId, conditionalValidator(function () { return isCorelogicRequired; }, forms.Validators.required)),
+                corelogicRefId: new forms.FormControl(address.corelogicRefId, conditionalValidator(function () { return isCorelogicRequired; }, forms.Validators.required)),
+                // manual fields
+                unitNumber: new forms.FormControl({ value: address.unitNumber, disabled: true }),
+                address: new forms.FormControl({ value: address.address, disabled: true }, forms.Validators.required),
+                city: new forms.FormControl({ value: address.city, disabled: true }, forms.Validators.required),
+                state: new forms.FormControl({ value: address.state, disabled: true }, forms.Validators.required),
+                postcode: new forms.FormControl({ value: address.postcode, disabled: true }, forms.Validators.required),
+                country: new forms.FormControl({ value: address.country || Country.australia, disabled: true }, conditionalValidator(function () { return !isCorelogicRequired; }, forms.Validators.required))
+            }, address, addressCorelogicValidator()) || this;
+            _this.isCorelogicRequired = isCorelogicRequired;
+            /**
+             * Emit event to search address in corelogic when user filled enough data for corelogic
+             */
+            _this.onSearch = new i0.EventEmitter();
+            _this.listenEvents();
+            return _this;
+        }
+        Object.defineProperty(AddressForm.prototype, "manualSearchQuery", {
+            /**
+             * Get search query for corelogic location search based on manual fields values
+             */
+            get: function () {
+                if (!this.isManualSearchAvailable()) {
+                    return '';
+                }
+                return this.currentValue.nameLong;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        AddressForm.prototype.listenEvents = function () {
+            this.listenSearchQueryChanges();
+            // no need to search corelogic locality when corelogic is not required
+            if (this.isCorelogicRequired) {
+                this.listenManualFieldsChanges();
+            }
+        };
+        /**
+         * Handle corelogic suggestion select
+         */
+        AddressForm.prototype.onSelectSuggestion = function (suggestion) {
+            // if no suggestion then 'Add manually' option selected
+            if (!suggestion) {
+                this.switchToManual();
+                return;
+            }
+            this.patchValue({
+                corelogicLocId: suggestion.localityId,
+                corelogicRefId: suggestion.propertyId
+            });
+        };
+        /**
+         * Enable manual mode
+         */
+        AddressForm.prototype.switchToManual = function () {
+            this.isManual = true;
+            this.get('searchQuery').disable();
+            this.get('address').enable();
+            this.get('unitNumber').enable();
+            this.get('city').enable();
+            this.get('state').enable();
+            this.get('postcode').enable();
+            if (!this.isCorelogicRequired) {
+                this.get('country').enable();
+                this.get('corelogicLocId').disable();
+                this.get('corelogicRefId').disable();
+            }
+        };
+        /**
+         * Emit event to search address in corelogic when search field changes
+         */
+        AddressForm.prototype.listenSearchQueryChanges = function () {
+            var _this = this;
+            this.get('searchQuery').valueChanges
+                .pipe(
+            // delay to avoid search request for each value change
+            operators.debounceTime(AddressForm.searchDelay), 
+            // skip when value not changed
+            operators.distinctUntilChanged(), 
+            // value could be a string when user search and suggestion when user select option from autocomplete
+            operators.map(function (value) {
+                // no need to search when value is not actually search string
+                if (!value || value instanceof CorelogicSuggestion) {
+                    return '';
+                }
+                // trim to avoid spaces in searchQuery, we should not send request started or finished with spaces
+                // uppercase to make search string similar to corelogic format
+                return value.trim();
+            }), 
+            // do nothing when query is too short
+            operators.filter(function (searchQuery) { return searchQuery.length >= AddressForm.minSearchLength; }))
+                .subscribe(function (searchQuery) {
+                _this.onSearch.emit(searchQuery);
+            });
+        };
+        /**
+         * Check if all fields required for manual corelogic search are filled before request sending
+         */
+        AddressForm.prototype.isManualSearchAvailable = function () {
+            return this.get('address').valid && this.get('city').valid && this.get('state').valid && this.get('postcode').valid;
+        };
+        /**
+         * When corelogic is required we have to search address even for manual address
+         */
+        AddressForm.prototype.listenManualFieldsChanges = function () {
+            var _this = this;
+            // subscribe to whole form because no other fields may be changed in this case except manual address fields we need
+            this.valueChanges
+                .pipe(
+            // delay to avoid search request for each value change
+            operators.debounceTime(AddressForm.searchDelay), 
+            // do nothing when not all required fields filled
+            operators.filter(function () { return _this.isManualSearchAvailable(); }), operators.map(function () { return _this.manualSearchQuery; }), 
+            // skip when value not changed
+            operators.distinctUntilChanged())
+                .subscribe(function () {
+                _this.onSearch.emit(_this.manualSearchQuery);
+            });
+        };
+        return AddressForm;
+    }(AbstractForm));
+    /**
+     * Min search query required length
+     */
+    AddressForm.minSearchLength = 3;
+    /**
+     * Delay before corelogic request
+     */
+    AddressForm.searchDelay = 500;
+
+    /**
+     * Form with loan details.
+     * Loan could be created from bank account (Bank Loan) or directly from loan page (Vehicle Loan)
+     */
+    var LoanForm = /** @class */ (function (_super) {
+        __extends(LoanForm, _super);
+        function LoanForm(loan) {
+            if (loan === void 0) { loan = classTransformer.plainToClass(Loan, {}); }
+            var _this = _super.call(this, {
+                type: new forms.FormControl(loan.type, forms.Validators.required),
+                amount: new forms.FormControl(loan.amount, forms.Validators.required),
+                interestRate: new forms.FormControl(loan.interestRate, [forms.Validators.required, forms.Validators.min(0), forms.Validators.max(100)]),
+                commencementDate: new forms.FormControl(loan.commencementDate, forms.Validators.required),
+                repaymentAmount: new forms.FormControl(loan.repaymentAmount, forms.Validators.required),
+                repaymentFrequency: new forms.FormControl(loan.repaymentFrequency, forms.Validators.required),
+                term: new forms.FormControl(loan.term, forms.Validators.required),
+                // interestType is predefined for vehicle loans
+                interestType: new forms.FormControl({ value: loan.interestType, disabled: !loan.bankAccount }, forms.Validators.required),
+                // availableRedraw is predefined for vehicle loans
+                availableRedraw: new forms.FormControl({ value: loan.availableRedraw, disabled: !loan.bankAccount }, forms.Validators.required),
+                // repaymentType is predefined for vehicle loans
+                repaymentType: new forms.FormControl({ value: loan.repaymentType, disabled: !loan.bankAccount }, forms.Validators.required),
+            }, loan) || this;
+            _this.loan = loan;
+            // Set data which always the same for vehicle loans
+            if (!loan.bankAccount) {
+                Object.assign(_this.model, {
+                    repaymentType: exports.LoanRepaymentTypeEnum.PRINCIPAL_AND_INTEREST,
+                    availableRedraw: 0,
+                    interestType: exports.LoanInterestTypeEnum.FIXED_RATE
+                });
+            }
+            _this.updateTermValidation();
+            _this.listenEvents();
+            return _this;
+        }
+        LoanForm.prototype.listenEvents = function () {
+            // We need to set term automatically only for bank loans.
+            // For vehicle loans user should fill it manually with validation depended of frequency
+            if (!!this.loan.bankAccount) {
+                this.listenTypeChanges();
+            }
+            else {
+                this.listenRepaymentFrequencyChanges();
+            }
+        };
+        /**
+         * Set term automatically by loan type changes
+         */
+        LoanForm.prototype.listenTypeChanges = function () {
+            var _this = this;
+            this.get('type').valueChanges.subscribe(function (type) {
+                _this.get('term').setValue(LoanForm.mortgageLoanTypes.includes(type) ? Loan.mortgageDefaultTerm : Loan.loanDefaultTerm);
+            });
+        };
+        /**
+         * term validation depends on selected repaymentFrequency
+         */
+        LoanForm.prototype.listenRepaymentFrequencyChanges = function () {
+            var _this = this;
+            this.get('repaymentFrequency').valueChanges.subscribe(function () {
+                _this.updateTermValidation();
+            });
+        };
+        /**
+         * For vehicle loans term has a maximum value depended of repayment frequency
+         */
+        LoanForm.prototype.updateTermValidation = function () {
+            // no need terms for bank loans
+            if (!!this.loan.bankAccount) {
+                return;
+            }
+            var currentRepaymentFrequency = this.get('repaymentFrequency').value;
+            // term validation depends on selected repayment frequency, so can not validate when frequency is empty
+            // repaymentType is required field, so we don't need to clear validation
+            if (!currentRepaymentFrequency) {
+                return;
+            }
+            var termControl = this.get('term');
+            var maxTermValue = exports.LoanMaxNumberOfPaymentsEnum[exports.LoanRepaymentFrequencyEnum[currentRepaymentFrequency]];
+            termControl.setValidators([forms.Validators.max(maxTermValue)]);
+            termControl.updateValueAndValidity();
+        };
+        return LoanForm;
+    }(AbstractForm));
+    LoanForm.mortgageLoanTypes = [exports.LoanTypeEnum.MORTGAGE, exports.LoanTypeEnum.HOME_EQUITY_LINE_OF_CREDIT, exports.LoanTypeEnum.HOME_LOAN];
+
     /**
      * Form array with bank account properties
      * @TODO create AbstractFormArray
@@ -17899,6 +18165,30 @@
         return SoleBusinessLossForm;
     }(AbstractForm));
 
+    var phonePattern = /^(((\s*)?([- ()]?\d[- ()]?){0,30}(\s*)?)|)$/;
+    /**
+     * Validator for phone number
+     * Allowed special symbols"-", "(", ")"
+     */
+    function phoneNumberValidator() {
+        return function (control) {
+            return phonePattern.test(control.value) ? null : { phoneInvalid: true };
+        };
+    }
+
+    var PhoneForm = /** @class */ (function (_super) {
+        __extends(PhoneForm, _super);
+        function PhoneForm(phone) {
+            if (phone === void 0) { phone = classTransformer.plainToClass(Phone, {}); }
+            return _super.call(this, {
+                type: new forms.FormControl(phone.type, forms.Validators.required),
+                country: new forms.FormControl(phone.country, forms.Validators.required),
+                number: new forms.FormControl(phone.number, [forms.Validators.required, phoneNumberValidator()])
+            }, phone) || this;
+        }
+        return PhoneForm;
+    }(AbstractForm));
+
     var SoleContactForm = /** @class */ (function (_super) {
         __extends(SoleContactForm, _super);
         function SoleContactForm(contact) {
@@ -17909,10 +18199,8 @@
                 firstName: new forms.FormControl(contact.firstName, forms.Validators.required),
                 lastName: new forms.FormControl(contact.lastName, forms.Validators.required),
                 email: new forms.FormControl(contact.email, [forms.Validators.required, forms.Validators.email]),
-                // @TODO Alex: create phone form and phone form control
-                phone: new forms.FormControl(contact.phone),
-                // @TODO Alex: create address form and address form control
-                address: new forms.FormControl(contact.address)
+                phone: new PhoneForm(contact.phone || classTransformer.plainToClass(Phone, {})),
+                address: new AddressForm(contact.address || classTransformer.plainToClass(Address, {}))
             }, contact) || this;
         }
         return SoleContactForm;
@@ -19178,6 +19466,7 @@
     exports.AccountSetupItemCollection = AccountSetupItemCollection;
     exports.AccountSetupService = AccountSetupService;
     exports.Address = Address;
+    exports.AddressForm = AddressForm;
     exports.AddressService = AddressService;
     exports.AppEvent = AppEvent;
     exports.AssetsService = AssetsService;
@@ -19198,6 +19487,7 @@
     exports.BankAccountsImportForm = BankAccountsImportForm;
     exports.BankConnection = BankConnection;
     exports.BankConnectionService = BankConnectionService;
+    exports.BankExternalStats = BankExternalStats;
     exports.BankLoginData = BankLoginData;
     exports.BankLoginForm = BankLoginForm;
     exports.BankService = BankService;
@@ -19208,8 +19498,11 @@
     exports.BankTransactionService = BankTransactionService;
     exports.BasiqConfig = BasiqConfig;
     exports.BasiqJob = BasiqJob;
+    exports.BasiqJobResponse = BasiqJobResponse;
+    exports.BasiqJobStep = BasiqJobStep;
     exports.BasiqService = BasiqService;
     exports.BasiqToken = BasiqToken;
+    exports.BasiqTokenService = BasiqTokenService;
     exports.BorrowingExpense = BorrowingExpense;
     exports.BorrowingExpenseLoan = BorrowingExpenseLoan;
     exports.BorrowingExpenseService = BorrowingExpenseService;
@@ -19359,6 +19652,7 @@
     exports.PdfFromHtmlTableService = PdfFromHtmlTableService;
     exports.PdfSettings = PdfSettings;
     exports.Phone = Phone;
+    exports.PhoneForm = PhoneForm;
     exports.PreloaderService = PreloaderService;
     exports.Property = Property;
     exports.PropertyCalculationService = PropertyCalculationService;