taxtank-core 0.19.2 → 0.21.0

package/bundles/taxtank-core.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/common/http'), require('rxjs'), require('rxjs/operators'), require('class-transformer'), require('@auth0/angular-jwt'), require('lodash/get'), require('lodash/last'), require('moment'), require('lodash/flatten'), require('lodash/hasIn'), require('lodash/first'), require('lodash/cloneDeep'), require('lodash/compact'), require('lodash/uniqBy'), require('lodash/concat'), require('moment-range'), require('@angular/forms'), require('lodash/fromPairs'), require('lodash'), require('event-source-polyfill/src/eventsource.min.js'), require('@angular/router'), require('lodash/clone'), require('html2pdf.js'), require('jspdf'), require('jspdf-autotable'), require('@stripe/stripe-js'), require('xlsx'), require('file-saver')) :
-    typeof define === 'function' && define.amd ? define('taxtank-core', ['exports', '@angular/core', '@angular/common', '@angular/common/http', 'rxjs', 'rxjs/operators', 'class-transformer', '@auth0/angular-jwt', 'lodash/get', 'lodash/last', 'moment', 'lodash/flatten', 'lodash/hasIn', 'lodash/first', 'lodash/cloneDeep', 'lodash/compact', 'lodash/uniqBy', 'lodash/concat', 'moment-range', '@angular/forms', 'lodash/fromPairs', 'lodash', 'event-source-polyfill/src/eventsource.min.js', '@angular/router', 'lodash/clone', 'html2pdf.js', 'jspdf', 'jspdf-autotable', '@stripe/stripe-js', 'xlsx', 'file-saver'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["taxtank-core"] = {}, global.ng.core, global.ng.common, global.ng.common.http, global.rxjs, global.rxjs.operators, global.classTransformer, global.angularJwt, global.get, global.last, global.moment, global.flatten, global.hasIn, global.first, global.cloneDeep$1, global.compact, global.uniqBy, global.concat, global.momentRange, global.ng.forms, global.fromPairs, global._, global.eventsource_min_js, global.ng.router, global.clone, global.html2pdf, global.jsPDF, global.autoTable, global.stripeJs, global.xlsx, global.FileSaver));
-})(this, (function (exports, i0, i1$1, i1, rxjs, operators, classTransformer, angularJwt, get, last, moment, flatten, hasIn, first, cloneDeep$1, compact, uniqBy, concat, momentRange, forms, fromPairs, _, eventsource_min_js, i1$2, clone, html2pdf, jsPDF, autoTable, stripeJs, xlsx, FileSaver) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/common/http'), require('rxjs'), require('rxjs/operators'), require('class-transformer'), require('@auth0/angular-jwt'), require('lodash/get'), require('lodash/last'), require('moment'), require('lodash/flatten'), require('lodash/hasIn'), require('lodash/first'), require('lodash/uniqBy'), require('lodash/concat'), require('rxjs/internal/observable/throwError'), require('lodash/cloneDeep'), require('lodash/compact'), require('moment-range'), require('@angular/forms'), require('lodash/fromPairs'), require('lodash'), require('event-source-polyfill/src/eventsource.min.js'), require('@angular/router'), require('lodash/clone'), require('html2pdf.js'), require('jspdf'), require('jspdf-autotable'), require('@stripe/stripe-js'), require('xlsx'), require('file-saver')) :
+    typeof define === 'function' && define.amd ? define('taxtank-core', ['exports', '@angular/core', '@angular/common', '@angular/common/http', 'rxjs', 'rxjs/operators', 'class-transformer', '@auth0/angular-jwt', 'lodash/get', 'lodash/last', 'moment', 'lodash/flatten', 'lodash/hasIn', 'lodash/first', 'lodash/uniqBy', 'lodash/concat', 'rxjs/internal/observable/throwError', 'lodash/cloneDeep', 'lodash/compact', 'moment-range', '@angular/forms', 'lodash/fromPairs', 'lodash', 'event-source-polyfill/src/eventsource.min.js', '@angular/router', 'lodash/clone', 'html2pdf.js', 'jspdf', 'jspdf-autotable', '@stripe/stripe-js', 'xlsx', 'file-saver'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["taxtank-core"] = {}, global.ng.core, global.ng.common, global.ng.common.http, global.rxjs, global.rxjs.operators, global.classTransformer, global.angularJwt, global.get, global.last, global.moment, global.flatten, global.hasIn, global.first, global.uniqBy, global.concat, global.rxjs["internal/observable/throwError"], global.cloneDeep$1, global.compact, global.momentRange, global.ng.forms, global.fromPairs, global._, global.eventsource_min_js, global.ng.router, global.clone, global.html2pdf, global.jsPDF, global.autoTable, global.stripeJs, global.xlsx, global.FileSaver));
+})(this, (function (exports, i0, i1$1, i1, rxjs, operators, classTransformer, angularJwt, get, last, moment, flatten, hasIn, first, uniqBy, concat, throwError, cloneDeep$1, compact, momentRange, forms, fromPairs, _, eventsource_min_js, i1$2, clone, html2pdf, jsPDF, autoTable, stripeJs, xlsx, FileSaver) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -33,10 +33,10 @@
     var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
     var hasIn__default = /*#__PURE__*/_interopDefaultLegacy(hasIn);
     var first__default = /*#__PURE__*/_interopDefaultLegacy(first);
-    var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep$1);
-    var compact__default = /*#__PURE__*/_interopDefaultLegacy(compact);
     var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
     var concat__default = /*#__PURE__*/_interopDefaultLegacy(concat);
+    var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep$1);
+    var compact__default = /*#__PURE__*/_interopDefaultLegacy(compact);
     var fromPairs__default = /*#__PURE__*/_interopDefaultLegacy(fromPairs);
     var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
     var i1__namespace$2 = /*#__PURE__*/_interopNamespace(i1$2);
@@ -647,7 +647,7 @@
         };
         AuthService.prototype.login = function (username, password) {
             var _this = this;
-            return this.http.post(this.environment.apiV2 + "/login_check", { username: username, password: password }).pipe(operators.map(function (response) {
+            return this.http.post(this.environment.apiV2 + "/login", { username: username, password: password }).pipe(operators.map(function (response) {
                 _this.setAuth(response);
                 return response;
             }));
@@ -757,6 +757,11 @@
         };
         JwtInterceptor.prototype.handle401Error = function (req, next, err) {
             var _this = this;
+            var _a;
+            // skip 401 errors not from JWT (basiq login case or other)
+            if (!((_a = err.error.message) === null || _a === void 0 ? void 0 : _a.includes('JWT Token'))) {
+                return rxjs.throwError(err);
+            }
             if (req.url.includes('token/refresh') || req.url.includes('login')) {
                 if (req.url.includes('token/refresh')) {
                     this.authService.logoutFront();
@@ -964,6 +969,7 @@
         EMPLOYEES_INVITE_POST: new Endpoint('POST', '\\/employees\\/\\invites'),
         EMPLOYEES_INVITES_REJECT_POST: new Endpoint('POST', '\\/employees\\/\\invites\\/\\d+\\/\\reject'),
         EMPLOYEES_INVITES_RESEND_POST: new Endpoint('POST', '\\/employees\\/\\invites\\/\\d+\\/\\resend'),
+        FACEBOOK_LOGIN_POST: new Endpoint('POST', '\\/users\\/authentication\\/facebook'),
         FIRM_GET: new Endpoint('GET', '\\/firms'),
         FIRM_CURRENT_GET: new Endpoint('GET', '\\/firms\\/current'),
         FIRM_CURRENT_PUT: new Endpoint('PUT', '\\/firms\\/current\.\*'),
@@ -991,7 +997,7 @@
         LOANS_PAYOUT_PUT: new Endpoint('PUT', '\\/loans\\/\\d+\\/payout\\/\\d+'),
         LOANS_PAYOUT_DELETE: new Endpoint('DELETE', '\\/loans\\/\\d+\\/payout\\/\\d+'),
         LOANS_CALCULATION_POST: new Endpoint('POST', '\\/bank-accounts\\/loans\\/calculation'),
-        LOGIN_CHECK_POST: new Endpoint('POST', '\\/login_check'),
+        LOGIN_POST: new Endpoint('POST', '\\/login'),
         NOTIFICATIONS_GET: new Endpoint('GET', '\\/service-notifications'),
         OCCUPATIONS_GET: new Endpoint('GET', '\\/occupations'),
         PROPERTIES_GET: new Endpoint('GET', '\\/properties'),
@@ -1045,6 +1051,7 @@
         TRANSACTIONS_ALLOCATIONS_POST: new Endpoint('POST', '\\/transactions-allocations'),
         TRANSACTIONS_ALLOCATIONS_DELETE: new Endpoint('DELETE', '\\/transactions-allocations\\/\\d+'),
         USER_CONFIRMATION_POST: new Endpoint('POST', '\\/users\\/confirmation'),
+        USER_CONFIRMATION_RESEND_POST: new Endpoint('POST', '\\/users\\/confirmation\\/resend'),
         USER_CURRENT_GET: new Endpoint('GET', '\\/users\\/current'),
         USER_CURRENT_PASSWORD_PUT: new Endpoint('PUT', '\\/users\\/current\\/password\.\*'),
         USER_EVENT_SETTINGS_GET: new Endpoint('GET', '\\/user-event-settings'),
@@ -2792,6 +2799,9 @@
         Collection.prototype.getIds = function () {
             return this.items.map(function (item) { return item['id']; });
         };
+        Collection.prototype.mapBy = function (path) {
+            return this.items.map(function (item) { return get__default["default"](item, path); });
+        };
         Collection.prototype.sortBy = function (field, isDesc) {
             if (field === void 0) { field = 'id'; }
             if (isDesc === void 0) { isDesc = true; }
@@ -2854,8 +2864,8 @@
         Collection.prototype.remove = function (items) {
             return this.filter(function (model) { return !items.map(function (item) { return item.id; }).includes(model.id); });
         };
-        Collection.prototype.removeBy = function (path, value) {
-            return this.filter(function (item) { return get__default["default"](item, path) !== value; });
+        Collection.prototype.removeBy = function (path, values) {
+            return this.filter(function (item) { return !(Array.isArray(values) ? values : [values]).includes(get__default["default"](item, path)); });
         };
         return Collection;
     }());
@@ -3225,6 +3235,20 @@
         return Bank;
     }(AbstractModel));
 
+    var BankPopularEnum;
+    (function (BankPopularEnum) {
+        BankPopularEnum["BANKWEST"] = "Bank of Western Australia trading as BankWest";
+        BankPopularEnum["ANZ"] = "Australia and New Zealand Banking Group Limited";
+        BankPopularEnum["CBA"] = "Commonwealth Bank Australia";
+        BankPopularEnum["WESTPAC"] = "Westpac Banking Corporation";
+        BankPopularEnum["BENDIGO"] = "Bendigo and Adelaide Bank Limited";
+        BankPopularEnum["ING_DIRECT"] = "ING Bank (Australia) Limited (trading as ING Direct)";
+        BankPopularEnum["ST_GEORGE"] = "St. George Bank (a subsidiary of Westpac)";
+        BankPopularEnum["SUNCORP"] = "Suncorp-Metway Limited";
+        BankPopularEnum["CITIBANK"] = "Citibank";
+        BankPopularEnum["BOQ"] = "Bank of Queensland Limited";
+    })(BankPopularEnum || (BankPopularEnum = {}));
+
     var Bank = /** @class */ (function (_super) {
         __extends(Bank, _super);
         function Bank() {
@@ -3247,6 +3271,13 @@
             return value ? value.replace(' ', '%20') : null;
         })
     ], Bank.prototype, "logo", void 0);
+    __decorate([
+        classTransformer.Transform(function (_a) {
+            var obj = _a.obj;
+            return Object.values(BankPopularEnum).includes(obj.name);
+        }),
+        classTransformer.Expose()
+    ], Bank.prototype, "isPopular", void 0);
 
     exports.BankConnectionStatusEnum = void 0;
     (function (BankConnectionStatusEnum) {
@@ -3407,16 +3438,151 @@
         classTransformer.Type(function () { return BankConnection; })
     ], BankAccount.prototype, "bankConnection", void 0);
 
+    var TYPE_LOAN = [
+        exports.BankAccountTypeEnum.MORTGAGE,
+        exports.BankAccountTypeEnum.CREDIT_CARD,
+        exports.BankAccountTypeEnum.LOAN
+    ];
+
     /**
-     * any event happened in the app, which needs to be handled somehow (distributed to other part of the app)
+     * Collection of bank accounts.
      */
-    var AppEvent = /** @class */ (function () {
-        function AppEvent(type, payload) {
-            this.type = type;
-            this.payload = payload;
+    var BankAccountCollection = /** @class */ (function (_super) {
+        __extends(BankAccountCollection, _super);
+        function BankAccountCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
         }
-        return AppEvent;
-    }());
+        /**
+         * get list of bank accounts with passed types
+         */
+        BankAccountCollection.prototype.getByType = function (types, isExclude) {
+            if (isExclude === void 0) { isExclude = false; }
+            // get types always as array (if only one passed)
+            var typesArray = concat__default["default"](types);
+            return this.items.filter(function (bankAccount) {
+                if (isExclude) {
+                    return !typesArray.includes(bankAccount.type);
+                }
+                return typesArray.includes(bankAccount.type);
+            });
+        };
+        /**
+         * get amount of initial loans
+         */
+        BankAccountCollection.prototype.getInitialLoanAmount = function () {
+            return this.getByType(TYPE_LOAN)
+                .reduce(function (sum, bankAccount) {
+                return sum += bankAccount.balances.length ? bankAccount.getOpeningBalance() : 0;
+            }, 0);
+        };
+        /**
+         * get amount of current loans
+         */
+        BankAccountCollection.prototype.getCurrentLoanAmount = function () {
+            return this.getByType(TYPE_LOAN)
+                .reduce(function (sum, bankAccount) {
+                return sum += bankAccount.currentBalance;
+            }, 0);
+        };
+        /**
+         * get collection filtered by property id
+         */
+        BankAccountCollection.prototype.getByPropertyId = function (id) {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) {
+                return bankAccount.bankAccountProperties.find(function (bankAccountProperty) {
+                    return bankAccountProperty.property.id === id;
+                });
+            }));
+        };
+        /**
+         * get collection filtered by properties ids
+         */
+        BankAccountCollection.prototype.getByPropertiesIds = function (ids) {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) {
+                return bankAccount.bankAccountProperties.find(function (bankAccountProperty) {
+                    return ids.includes(bankAccountProperty.property.id);
+                });
+            }));
+        };
+        /**
+         * get collection of active bank accounts
+         */
+        BankAccountCollection.prototype.getActiveBankAccounts = function () {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) {
+                return bankAccount.isActive();
+            }));
+        };
+        /**
+         * get reduction of loan (reduction of principle) percentage
+         */
+        BankAccountCollection.prototype.getPrincipleReductionPercent = function () {
+            var initialLoans = this.getInitialLoanAmount();
+            var currentLoans = this.getCurrentLoanAmount();
+            if (!initialLoans) {
+                return 0;
+            }
+            return (initialLoans - currentLoans) / initialLoans * 100;
+        };
+        /**
+         * Get collection of loan bank accounts
+         */
+        BankAccountCollection.prototype.getLoanAccounts = function () {
+            return new BankAccountCollection(this.getByType(TYPE_LOAN));
+        };
+        BankAccountCollection.prototype.getSavingsAccounts = function () {
+            return new BankAccountCollection(this.getByType(TYPE_LOAN, true));
+        };
+        BankAccountCollection.prototype.getOpeningBalance = function () {
+            return this.items.reduce(function (sum, bankAccount) { return sum + bankAccount.getOpeningBalance(); }, 0);
+        };
+        Object.defineProperty(BankAccountCollection.prototype, "currentBalance", {
+            get: function () {
+                return this.sumBy('currentBalance');
+            },
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * Get Collection of bank accounts with property tank type
+         */
+        BankAccountCollection.prototype.getPropertyBankAccounts = function () {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isPropertyTank(); }));
+        };
+        /**
+         * Get Collection of bank accounts with work tank type
+         */
+        BankAccountCollection.prototype.getWorkBankAccounts = function () {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isWorkTank(); }));
+        };
+        /**
+         * Get Collection of bank accounts by tank type
+         */
+        BankAccountCollection.prototype.getByTankType = function (tankType) {
+            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.tankType === tankType; }));
+        };
+        /**
+         * Get list of all bank account properties
+         */
+        BankAccountCollection.prototype.getBankAccountPropertiesList = function () {
+            return flatten__default["default"](this.items.map(function (bankAccount) {
+                return bankAccount.bankAccountProperties;
+            }));
+        };
+        /**
+         * Get lis of unique properties from all bank accounts properties
+         */
+        BankAccountCollection.prototype.getProperties = function () {
+            return uniqBy__default["default"](this.getBankAccountPropertiesList().map(function (bankAccountProperty) {
+                return bankAccountProperty.property;
+            }), 'id');
+        };
+        BankAccountCollection.prototype.getPropertyBalanceAmount = function (propertyId) {
+            return this.items.reduce(function (sum, bankAccount) {
+                return sum + bankAccount.getPropertyBalanceAmount(propertyId);
+            }, 0);
+        };
+        return BankAccountCollection;
+    }(Collection));
 
     /**
      * BankConnection means user account at specific bank (usually each user has only one at the same bank)
@@ -3432,16 +3598,26 @@
         }
         BankConnectionService.prototype.listenEvents = function () {
             this.listenToAddedBankAccounts();
-            this.listenBasiqJobCreated();
-            this.listenConnectionUpdated();
             this.listenNotifications();
         };
         BankConnectionService.prototype.add = function (bankConnection) {
             var _this = this;
             return this.http.post(this.environment.apiV2 + "/" + this.url, bankConnection)
                 .pipe(operators.map(function (bankConnectionBase) {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BANK_CONNECTION_ADDED, null));
-                return classTransformer.plainToClass(BankConnection, bankConnectionBase);
+                var connection = classTransformer.plainToClass(BankConnection, bankConnectionBase);
+                // We use this endpoint for create and reconnect bank connections because of basiq logic.
+                // So we try to replace bank connection in cache for reconnection case.
+                if (bankConnection.id) {
+                    var tempCache = cloneDeep__default["default"](_this.cache);
+                    replace(tempCache, connection);
+                    _this.cache = cloneDeep__default["default"](tempCache);
+                    _this.cacheSubject.next(tempCache);
+                }
+                else {
+                    _this.cache.push(connection);
+                    _this.cacheSubject.next(cloneDeep__default["default"](_this.cache));
+                }
+                return classTransformer.plainToClass(BankConnection, connection);
             }));
         };
         BankConnectionService.prototype.listenToAddedBankAccounts = function () {
@@ -3450,47 +3626,6 @@
                 _this.resetCache();
             });
         };
-        /**
-         * When user log in to bank, basiq create a job. We create a bank connection with based on this job
-         */
-        BankConnectionService.prototype.listenBasiqJobCreated = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.BASIQ_JOB_CREATED).subscribe(function (result) {
-                // push connection to cache temporary to show it to user directly with pending status and not wait until backend loaded
-                var tempCache = cloneDeep__default["default"](_this.cache);
-                result.connection.setPending();
-                tempCache.push(result.connection);
-                _this.cache = tempCache;
-                _this.cacheSubject.next(tempCache);
-                _this.add(classTransformer.plainToClass(BankConnection, { basiqJob: { externalId: result.jobId } })).subscribe(function (newConnection) {
-                    // replace temporary connection with real saved connection
-                    // no replace() because connection does not have id yet
-                    tempCache.splice(-1, 1, newConnection);
-                    _this.cache = cloneDeep__default["default"](tempCache);
-                    _this.cacheSubject.next(tempCache);
-                });
-            });
-        };
-        /**
-         * When basiq connection disconnected we create a basiq job and update this connection
-         */
-        BankConnectionService.prototype.listenConnectionUpdated = function () {
-            var _this = this;
-            this.eventDispatcherService.on(exports.AppEventTypeEnum.BASIQ_CONNECTION_UPDATED).subscribe(function (result) {
-                // replace connection to cache temporary to show pending status until backend loaded
-                var tempCache = cloneDeep__default["default"](_this.cache);
-                result.connection.setPending();
-                replace(tempCache, result.connection);
-                _this.cache = tempCache;
-                _this.cacheSubject.next(tempCache);
-                _this.add(classTransformer.plainToClass(BankConnection, { basiqJob: { externalId: result.jobId } })).subscribe(function (updatedConnection) {
-                    // replace temporary connection again with real updated connection
-                    replace(tempCache, updatedConnection);
-                    _this.cache = cloneDeep__default["default"](tempCache);
-                    _this.cacheSubject.next(tempCache);
-                });
-            });
-        };
         /**
          * Update cache when basiq login failed to get actual connections statuses
          */
@@ -3519,9 +3654,7 @@
      */
     var BasiqService = /** @class */ (function (_super) {
         __extends(BasiqService, _super);
-        function BasiqService(http, eventDispatcherService, environment, toastService, 
-        // init BankConnectionService to listen events
-        bankConnectionService) {
+        function BasiqService(http, eventDispatcherService, environment, toastService, bankConnectionService) {
             var _this = _super.call(this, http, eventDispatcherService, environment, toastService) || this;
             _this.http = http;
             _this.eventDispatcherService = eventDispatcherService;
@@ -3539,23 +3672,60 @@
             this.listenNotifications();
         };
         /**
-         * Create Basiq job for the new bank connection creation
+         * Create a new Bank connection based on Basiq job.
+         * Here we have nested requests because we need to get a job id before we create a bank connection.
+         * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components
+         * we interact with basiq service.
          */
-        BasiqService.prototype.createConnection = function (data, userId, connection) {
+        BasiqService.prototype.createConnection = function (loginData, userId) {
             var _this = this;
-            return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", data).pipe(operators.map(function (response) {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_JOB_CREATED, { jobId: response.id, connection: connection }));
-                return response.id;
+            // Send login data to basiq API to create a basiq job
+            return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", loginData)
+                .pipe(operators.mergeMap(function (response) {
+                // Create bank connection based on basiq job
+                return _this.bankConnectionService.add(classTransformer.plainToClass(BankConnection, { basiqJob: { externalId: response.id } }));
+            }), operators.catchError(function (error) {
+                // Show error when user provided wrong login data
+                if (error.status === 401) {
+                    _this.toastService.error('Invalid credentials');
+                }
+                return throwError.throwError(error);
             }));
         };
         /**
          * Update disconnected bank connection
+         * Here we have nested requests because we need to get a job id before we create a bank connection.
+         * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components
+         * we interact with basiq service.
          */
         BasiqService.prototype.updateConnection = function (data, userId, connection) {
             var _this = this;
-            return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", Object.assign(data, { id: connection.externalId })).pipe(operators.map(function (response) {
-                _this.eventDispatcherService.dispatch(new AppEvent(exports.AppEventTypeEnum.BASIQ_CONNECTION_UPDATED, { jobId: response.id, connection: connection }));
-                return response.id;
+            // Send login data to basiq API to create a basiq job
+            return this.http.post(BasiqService.basiqApiUrl + "/users/" + userId + "/connections", Object.assign(data, { id: connection.externalId }))
+                .pipe(
+            // Create bank connection based on basiq job
+            operators.mergeMap(function (response) {
+                return _this.bankConnectionService.add(classTransformer.plainToClass(BankConnection, Object.assign({ id: connection.id, basiqJob: { externalId: response.id } })));
+            }), operators.catchError(function (error) {
+                // Show error when user provided wrong login data
+                if (error.status === 401) {
+                    _this.toastService.error('Invalid credentials');
+                }
+                // Show error when user provided another login (not login he used before)
+                if (error.status === 400) {
+                    _this.toastService.error('Please enter the login you used before');
+                }
+                return throwError.throwError(error);
+            }));
+        };
+        BasiqService.prototype.getByConnection = function (connection) {
+            return this.get().pipe(operators.map(function (bankAccounts) {
+                return new BankAccountCollection(bankAccounts).filterBy('bankConnection.id', connection.id);
+            }));
+        };
+        BasiqService.prototype.getNotImportedByConnection = function (savedAccounts, connection) {
+            return this.getByConnection(connection).pipe(operators.map(function (bankAccounts) {
+                return bankAccounts.removeBy('accountId', savedAccounts.mapBy('accountId'));
             }));
         };
         /**
@@ -3748,218 +3918,55 @@
                                 multi: true
                             }
                         ]
-                    }]
-            }] });
-
-    var TtCoreModule = /** @class */ (function () {
-        function TtCoreModule() {
-        }
-        TtCoreModule.forRoot = function (environment) {
-            localStorage.setItem('api_uri', environment['api_uri']);
-            return {
-                ngModule: TtCoreModule,
-                providers: [
-                    {
-                        provide: 'environment',
-                        useValue: environment
-                    }
-                ]
-            };
-        };
-        return TtCoreModule;
-    }());
-    TtCoreModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
-    TtCoreModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [i1$1.CommonModule,
-            InterceptorsModule] });
-    TtCoreModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [[
-                i1$1.CommonModule,
-                InterceptorsModule
-            ]] });
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, decorators: [{
-                type: i0.NgModule,
-                args: [{
-                        declarations: [],
-                        imports: [
-                            i1$1.CommonModule,
-                            InterceptorsModule
-                        ]
-                    }]
-            }] });
-
-    var AccountSetupItemCollection = /** @class */ (function (_super) {
-        __extends(AccountSetupItemCollection, _super);
-        function AccountSetupItemCollection(items) {
-            var _this = _super.call(this, compact__default["default"](items)) || this;
-            _this.sortBy('isCompleted', false);
-            return _this;
-        }
-        AccountSetupItemCollection.prototype.isCompleted = function () {
-            return this.filterBy('isCompleted', true).length === this.length;
-        };
-        return AccountSetupItemCollection;
-    }(Collection));
-
-    var BankCollection = /** @class */ (function (_super) {
-        __extends(BankCollection, _super);
-        function BankCollection(banks) {
-            var _this = _super.call(this, banks) || this;
-            _this.sortByPopularity();
-            return _this;
-        }
-        BankCollection.prototype.sortByPopularity = function () {
-            this.items.sort(function (bank1, bank2) {
-                // Banks already sorted on backend by name, so we just need to up top-10 banks
-                return (BankCollection.tobBanksIds.includes(bank1.id) && !BankCollection.tobBanksIds.includes(bank2.id)) ? -1 : 1;
-            });
-        };
-        return BankCollection;
-    }(Collection));
-    BankCollection.tobBanksIds = [124, 13, 134, 172, 126, 142, 135, 137, 138, 128];
-
-    var TYPE_LOAN = [
-        exports.BankAccountTypeEnum.MORTGAGE,
-        exports.BankAccountTypeEnum.CREDIT_CARD,
-        exports.BankAccountTypeEnum.LOAN
-    ];
-
-    /**
-     * Collection of bank accounts.
-     */
-    var BankAccountCollection = /** @class */ (function (_super) {
-        __extends(BankAccountCollection, _super);
-        function BankAccountCollection() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        /**
-         * get list of bank accounts with passed types
-         */
-        BankAccountCollection.prototype.getByType = function (types, isExclude) {
-            if (isExclude === void 0) { isExclude = false; }
-            // get types always as array (if only one passed)
-            var typesArray = concat__default["default"](types);
-            return this.items.filter(function (bankAccount) {
-                if (isExclude) {
-                    return !typesArray.includes(bankAccount.type);
-                }
-                return typesArray.includes(bankAccount.type);
-            });
-        };
-        /**
-         * get amount of initial loans
-         */
-        BankAccountCollection.prototype.getInitialLoanAmount = function () {
-            return this.getByType(TYPE_LOAN)
-                .reduce(function (sum, bankAccount) {
-                return sum += bankAccount.balances.length ? bankAccount.getOpeningBalance() : 0;
-            }, 0);
-        };
-        /**
-         * get amount of current loans
-         */
-        BankAccountCollection.prototype.getCurrentLoanAmount = function () {
-            return this.getByType(TYPE_LOAN)
-                .reduce(function (sum, bankAccount) {
-                return sum += bankAccount.currentBalance;
-            }, 0);
-        };
-        /**
-         * get collection filtered by property id
-         */
-        BankAccountCollection.prototype.getByPropertyId = function (id) {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) {
-                return bankAccount.bankAccountProperties.find(function (bankAccountProperty) {
-                    return bankAccountProperty.property.id === id;
-                });
-            }));
-        };
-        /**
-         * get collection filtered by properties ids
-         */
-        BankAccountCollection.prototype.getByPropertiesIds = function (ids) {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) {
-                return bankAccount.bankAccountProperties.find(function (bankAccountProperty) {
-                    return ids.includes(bankAccountProperty.property.id);
-                });
-            }));
-        };
-        /**
-         * get collection of active bank accounts
-         */
-        BankAccountCollection.prototype.getActiveBankAccounts = function () {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) {
-                return bankAccount.isActive();
-            }));
-        };
-        /**
-         * get reduction of loan (reduction of principle) percentage
-         */
-        BankAccountCollection.prototype.getPrincipleReductionPercent = function () {
-            var initialLoans = this.getInitialLoanAmount();
-            var currentLoans = this.getCurrentLoanAmount();
-            if (!initialLoans) {
-                return 0;
-            }
-            return (initialLoans - currentLoans) / initialLoans * 100;
-        };
-        /**
-         * Get collection of loan bank accounts
-         */
-        BankAccountCollection.prototype.getLoanAccounts = function () {
-            return new BankAccountCollection(this.getByType(TYPE_LOAN));
-        };
-        BankAccountCollection.prototype.getSavingsAccounts = function () {
-            return new BankAccountCollection(this.getByType(TYPE_LOAN, true));
-        };
-        BankAccountCollection.prototype.getOpeningBalance = function () {
-            return this.items.reduce(function (sum, bankAccount) { return sum + bankAccount.getOpeningBalance(); }, 0);
-        };
-        Object.defineProperty(BankAccountCollection.prototype, "currentBalance", {
-            get: function () {
-                return this.sumBy('currentBalance');
-            },
-            enumerable: false,
-            configurable: true
-        });
-        /**
-         * Get Collection of bank accounts with property tank type
-         */
-        BankAccountCollection.prototype.getPropertyBankAccounts = function () {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isPropertyTank(); }));
-        };
-        /**
-         * Get Collection of bank accounts with work tank type
-         */
-        BankAccountCollection.prototype.getWorkBankAccounts = function () {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.isWorkTank(); }));
-        };
-        /**
-         * Get Collection of bank accounts by tank type
-         */
-        BankAccountCollection.prototype.getByTankType = function (tankType) {
-            return new BankAccountCollection(this.items.filter(function (bankAccount) { return bankAccount.tankType === tankType; }));
-        };
-        /**
-         * Get list of all bank account properties
-         */
-        BankAccountCollection.prototype.getBankAccountPropertiesList = function () {
-            return flatten__default["default"](this.items.map(function (bankAccount) {
-                return bankAccount.bankAccountProperties;
-            }));
-        };
-        /**
-         * Get lis of unique properties from all bank accounts properties
-         */
-        BankAccountCollection.prototype.getProperties = function () {
-            return uniqBy__default["default"](this.getBankAccountPropertiesList().map(function (bankAccountProperty) {
-                return bankAccountProperty.property;
-            }), 'id');
+                    }]
+            }] });
+
+    var TtCoreModule = /** @class */ (function () {
+        function TtCoreModule() {
+        }
+        TtCoreModule.forRoot = function (environment) {
+            localStorage.setItem('api_uri', environment['api_uri']);
+            return {
+                ngModule: TtCoreModule,
+                providers: [
+                    {
+                        provide: 'environment',
+                        useValue: environment
+                    }
+                ]
+            };
         };
-        BankAccountCollection.prototype.getPropertyBalanceAmount = function (propertyId) {
-            return this.items.reduce(function (sum, bankAccount) {
-                return sum + bankAccount.getPropertyBalanceAmount(propertyId);
-            }, 0);
+        return TtCoreModule;
+    }());
+    TtCoreModule.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, deps: [], target: i0__namespace.ɵɵFactoryTarget.NgModule });
+    TtCoreModule.ɵmod = i0__namespace.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [i1$1.CommonModule,
+            InterceptorsModule] });
+    TtCoreModule.ɵinj = i0__namespace.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, imports: [[
+                i1$1.CommonModule,
+                InterceptorsModule
+            ]] });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TtCoreModule, decorators: [{
+                type: i0.NgModule,
+                args: [{
+                        declarations: [],
+                        imports: [
+                            i1$1.CommonModule,
+                            InterceptorsModule
+                        ]
+                    }]
+            }] });
+
+    var AccountSetupItemCollection = /** @class */ (function (_super) {
+        __extends(AccountSetupItemCollection, _super);
+        function AccountSetupItemCollection(items) {
+            var _this = _super.call(this, compact__default["default"](items)) || this;
+            _this.sortBy('isCompleted', false);
+            return _this;
+        }
+        AccountSetupItemCollection.prototype.isCompleted = function () {
+            return this.filterBy('isCompleted', true).length === this.length;
         };
-        return BankAccountCollection;
+        return AccountSetupItemCollection;
     }(Collection));
 
     exports.TransactionOperationEnum = void 0;
@@ -8301,6 +8308,42 @@
         return DepreciationReceipt;
     }(DepreciationReceipt$1));
 
+    /**
+     * List of objects grouped by passed property
+     */
+    var Dictionary = /** @class */ (function () {
+        function Dictionary(items, path) {
+            if (path === void 0) { path = 'id'; }
+            this.items = {};
+            if (!items.length) {
+                return;
+            }
+            // Do nothing if provided path was not found in the 1st item
+            if (!hasIn__default["default"](items[0], path.split('.')[0])) {
+                return;
+            }
+            this.groupItems(items, path);
+        }
+        Dictionary.prototype.add = function (key, value) {
+            this.items[key] = value;
+        };
+        Dictionary.prototype.get = function (key) {
+            return this.items[key] ? this.items[key] : null;
+        };
+        Dictionary.prototype.groupItems = function (items, path) {
+            var _this = this;
+            items.forEach(function (item) {
+                var key = get__default["default"](item, path);
+                // if object does not have property for grouping it will be grouped as 'other'
+                if (key === undefined) {
+                    key = 'other';
+                }
+                _this.items[key] = item;
+            });
+        };
+        return Dictionary;
+    }());
+
     var Document$1 = /** @class */ (function (_super) {
         __extends(Document, _super);
         function Document() {
@@ -8405,6 +8448,17 @@
         classTransformer.Type(function () { return User; })
     ], EmployeeInvite.prototype, "employee", void 0);
 
+    /**
+     * any event happened in the app, which needs to be handled somehow (distributed to other part of the app)
+     */
+    var AppEvent = /** @class */ (function () {
+        function AppEvent(type, payload) {
+            this.type = type;
+            this.payload = payload;
+        }
+        return AppEvent;
+    }());
+
     exports.ExportFormatEnum = void 0;
     (function (ExportFormatEnum) {
         ExportFormatEnum["PDF"] = "PDF";
@@ -10444,6 +10498,11 @@
                 return bankAccounts.filter(function (bankAccount) { return bankAccount.isOwner(+localStorage.getItem('userId')); });
             }));
         };
+        BankAccountService.prototype.getByConnection = function (connection) {
+            return this.get().pipe(operators.map(function (bankAccounts) {
+                return new BankAccountCollection(bankAccounts).filterBy('bankConnection.id', connection.id);
+            }));
+        };
         /**
          * Listen to EventDispatcherService events
          */
@@ -11158,6 +11217,12 @@
             _this.isHydra = true;
             return _this;
         }
+        BankService.prototype.get = function () {
+            return _super.prototype.get.call(this).pipe(operators.map(function (banks) {
+                // exclude basiq banks without login fields (basiq may return broken banks without loginFields)
+                return banks.filter(function (bank) { return !bank.externalId || (bank.externalId && bank.loginFields); });
+            }));
+        };
         return BankService;
     }(RestService));
     BankService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: BankService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
@@ -14187,6 +14252,9 @@
         UserService.prototype.resetPassword = function (newPassword, resetToken) {
             return this.http.put(this.environment.apiV2 + "/users/password/reset", { newPassword: newPassword, resetToken: resetToken });
         };
+        UserService.prototype.resendConfirmationEmail = function (email) {
+            return this.http.post(this.environment.apiV2 + "/users/confirmation/resend", { email: email });
+        };
         /**
          * Confirm registered user
          */
@@ -14517,6 +14585,102 @@
                     }]
             }] });
 
+    var ERROR_EMAIL_PERMISSION = 'Access to email denied. Please provide access to email in facebook.';
+    var FacebookService = /** @class */ (function () {
+        /**
+         * @TODO when google login will be done, it needs to be moved to an abstract class
+         */
+        function FacebookService(http, toastService, jwtService, router, environment) {
+            this.http = http;
+            this.toastService = toastService;
+            this.jwtService = jwtService;
+            this.router = router;
+            this.environment = environment;
+            this.isLoggedInSubject = new rxjs.BehaviorSubject(!this.jwtService.isTokenExpired());
+            this.isFacebookEnabled = !!environment['facebookAppId'];
+        }
+        FacebookService.prototype.login = function (redirectUrl) {
+            if (redirectUrl === void 0) { redirectUrl = '/client'; }
+            return __awaiter(this, void 0, void 0, function () {
+                var accessToken;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.getAccessToken()];
+                        case 1:
+                            accessToken = _a.sent();
+                            this.http.post(this.environment.apiV2 + "/users/authentication/facebook", { accessToken: accessToken })
+                                .subscribe(function (response) {
+                                _this.setAuth(response);
+                                _this.router.navigate([redirectUrl]);
+                            }, function (error) {
+                                _this.toastService.error(error.error.violations[0].message);
+                                _this.logout();
+                            });
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        /**
+         * save user's auth tokens
+         * @TODO move to abstract class
+         */
+        FacebookService.prototype.setAuth = function (response) {
+            this.jwtService.saveTokens(response);
+            this.isLoggedInSubject.next(true);
+        };
+        /**
+         * get facebook auth access token
+         */
+        FacebookService.prototype.getAccessToken = function () {
+            var _this = this;
+            return new Promise(function (resolve) {
+                FB.login(function (response) {
+                    // authResponse will be empty if you close the Facebook login window or enter incorrect user data
+                    if (!response.authResponse) {
+                        return;
+                    }
+                    if (!response.authResponse.grantedScopes.includes('email')) {
+                        _this.toastService.error(ERROR_EMAIL_PERMISSION);
+                        return;
+                    }
+                    resolve(response.authResponse.accessToken);
+                }, FacebookService.authOptions);
+            });
+        };
+        /**
+         * logout user from facebook.
+         * Need to logout when user is trying to login with facebook with manually registered email
+         */
+        FacebookService.prototype.logout = function () {
+            return new Promise(function (resolve, reject) {
+                FB.logout(function (response) {
+                    resolve(response);
+                });
+            });
+        };
+        return FacebookService;
+    }());
+    FacebookService.authOptions = {
+        scope: 'email, public_profile',
+        auth_type: 'rerequest',
+        return_scopes: true
+    };
+    FacebookService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FacebookService, deps: [{ token: i1__namespace.HttpClient }, { token: ToastService }, { token: JwtService }, { token: i1__namespace$2.Router }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    FacebookService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FacebookService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: FacebookService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], ctorParameters: function () {
+            return [{ type: i1__namespace.HttpClient }, { type: ToastService }, { type: JwtService }, { type: i1__namespace$2.Router }, { type: undefined, decorators: [{
+                            type: i0.Inject,
+                            args: ['environment']
+                        }] }];
+        } });
+
     // deep clone for entity
     function cloneDeep(array) {
         return JSON.parse(JSON.stringify(array));
@@ -14594,9 +14758,9 @@
     var AbstractForm = /** @class */ (function (_super) {
         __extends(AbstractForm, _super);
         function AbstractForm(controls, model, validatorOrOpts, asyncValidator) {
-            if (model === void 0) { model = {}; }
             var _this = _super.call(this, controls, validatorOrOpts, asyncValidator) || this;
-            _this.model = model;
+            _this.onSubmit = new i0.EventEmitter();
+            _this.model = model || _this.createModelInstance();
             _this.modelClass = _this.model.constructor;
             return _this;
         }
@@ -14612,11 +14776,20 @@
             if (!this.valid) {
                 return null;
             }
-            return classTransformer.plainToClass(this.modelClass, Object.assign({}, this.model, this.value, data));
+            var model = this.createModelInstance(Object.assign({}, this.model, this.value, data));
+            this.onSubmit.emit(model);
+            return model;
+        };
+        AbstractForm.prototype.createModelInstance = function (data) {
+            if (data === void 0) { data = {}; }
+            return classTransformer.plainToClass(this.modelClass, data);
         };
         return AbstractForm;
     }(forms.FormGroup));
 
+    /**
+     * Form with bank account loan details
+     */
     var BankAccountLoanForm = /** @class */ (function (_super) {
         __extends(BankAccountLoanForm, _super);
         function BankAccountLoanForm(loan) {
@@ -14636,117 +14809,154 @@
         return BankAccountLoanForm;
     }(AbstractForm));
 
-    var BankAccountPropertyForm = /** @class */ (function (_super) {
-        __extends(BankAccountPropertyForm, _super);
-        function BankAccountPropertyForm(isLoan, bankAccountProperty) {
-            if (bankAccountProperty === void 0) { bankAccountProperty = classTransformer.plainToClass(BankAccountProperty, {}); }
-            return _super.call(this, {
-                property: new forms.FormControl(bankAccountProperty.property, forms.Validators.required),
-                percent: new forms.FormControl({ value: bankAccountProperty.percent, disabled: !isLoan }, forms.Validators.required)
-            }, bankAccountProperty) || this;
-        }
-        return BankAccountPropertyForm;
-    }(AbstractForm));
-
+    /**
+     * Form array with bank account properties
+     */
     var BankAccountPropertiesForm = /** @class */ (function (_super) {
         __extends(BankAccountPropertiesForm, _super);
-        function BankAccountPropertiesForm(isLoan, bankAccountProperties) {
-            if (bankAccountProperties === void 0) { bankAccountProperties = []; }
-            var _this = _super.call(this, bankAccountProperties.length
-                ? bankAccountProperties.map(function (bankAccountProperty) { return new BankAccountPropertyForm(isLoan, bankAccountProperty); })
-                : [new BankAccountPropertyForm(isLoan)]) || this;
-            _this.isLoan = isLoan;
-            _this.bankAccountProperties = bankAccountProperties;
-            return _this;
+        function BankAccountPropertiesForm(bankAccountProperties) {
+            if (bankAccountProperties === void 0) { bankAccountProperties = [classTransformer.plainToClass(BankAccountProperty, {})]; }
+            return _super.call(this, bankAccountProperties.map(function (bankAccountProperty) {
+                return new forms.FormGroup({
+                    property: new forms.FormControl(bankAccountProperty.property, forms.Validators.required),
+                    percent: new forms.FormControl(bankAccountProperty.percent, forms.Validators.required)
+                });
+            })) || this;
         }
         BankAccountPropertiesForm.prototype.add = function () {
-            this.push(new BankAccountPropertyForm(this.isLoan));
+            this.push(new forms.FormGroup({
+                property: new forms.FormControl(null, forms.Validators.required),
+                percent: new forms.FormControl({
+                    value: 100,
+                    disabled: !this.at(0).contains('percent')
+                }, forms.Validators.required)
+            }));
+        };
+        BankAccountPropertiesForm.prototype.enablePercent = function () {
+            this.controls.forEach(function (propertyFormGroup) {
+                propertyFormGroup.get('percent').enable();
+            });
+        };
+        BankAccountPropertiesForm.prototype.disablePercent = function () {
+            this.controls.forEach(function (propertyFormGroup) {
+                propertyFormGroup.get('percent').disable();
+            });
         };
         return BankAccountPropertiesForm;
     }(forms.FormArray));
 
     /**
-     * Form for additional data for bank accounts. Allow user to set tank type, loan and properties for new not-saved bank accounts.
-     * Works with manual and basiq bank accounts.
+     * Form is using for import basiq bank accounts.
+     * Basiq accounts has all data except tank type, properties and loan partially
      */
-    var BankAccountForm = /** @class */ (function (_super) {
-        __extends(BankAccountForm, _super);
-        function BankAccountForm(bankAccount) {
-            if (bankAccount === void 0) { bankAccount = classTransformer.plainToClass(BankAccount, {}); }
+    var BankAccountImportForm = /** @class */ (function (_super) {
+        __extends(BankAccountImportForm, _super);
+        function BankAccountImportForm(bankAccount) {
             var _this = _super.call(this, {
                 tankType: new forms.FormControl(bankAccount.tankType, forms.Validators.required),
             }, bankAccount) || this;
-            _this.bankAccount = bankAccount;
             if (bankAccount.isLoan()) {
                 _this.addControl('loan', new BankAccountLoanForm(bankAccount.loan));
             }
+            // basiq account import form should be disabled (unchecked) by default
+            _this.disable();
             _this.listenEvents();
             return _this;
         }
-        BankAccountForm.prototype.listenEvents = function () {
+        BankAccountImportForm.prototype.listenEvents = function () {
             this.listenTankTypeChanges();
-            this.listenValueChanges();
-        };
-        Object.defineProperty(BankAccountForm.prototype, "properties", {
-            get: function () {
-                return this.get('bankAccountProperties');
-            },
-            enumerable: false,
-            configurable: true
-        });
-        BankAccountForm.prototype.isLoan = function () {
-            return BankAccount.loanTypes.includes(this.bankAccount.type);
-        };
-        BankAccountForm.prototype.isPropertyTank = function () {
-            return this.get('tankType').value === exports.TankTypeEnum.PROPERTY;
-        };
-        BankAccountForm.prototype.confirm = function () {
-            this.markAllAsTouched();
-            if (this.invalid) {
-                return;
-            }
-            this.isConfirmed = true;
-        };
-        BankAccountForm.prototype.addPropertiesArray = function () {
-            var control = new BankAccountPropertiesForm(this.isLoan(), this.bankAccount.bankAccountProperties);
-            // Default form behaviour is: if we add enabled form control to disabled form group then this form group enable.
-            // Disable form control before add to avoid form group enabling.
-            if (this.disabled) {
-                control.disable();
-            }
-            this.addControl('bankAccountProperties', control);
         };
         /**
-         * Add/Remove properties form array depending on selected tank type
+         * Add/Remove bank account properties form depends on selected tank type
          */
-        BankAccountForm.prototype.listenTankTypeChanges = function () {
-            var _this = this;
-            this.get('tankType').valueChanges.subscribe(function () {
-                _this.isPropertyTank() ? _this.addPropertiesArray() : _this.removeControl('bankAccountProperties');
-            });
-        };
-        BankAccountForm.prototype.listenValueChanges = function () {
+        BankAccountImportForm.prototype.listenTankTypeChanges = function () {
             var _this = this;
-            this.valueChanges.subscribe(function () {
-                _this.isConfirmed = false;
+            this.get('tankType').valueChanges.subscribe(function (tankType) {
+                if (tankType === exports.TankTypeEnum.PROPERTY) {
+                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm());
+                    // property percent allowed only for loan bank accounts
+                    if (!_this.contains('loan')) {
+                        _this.get('bankAccountProperties').disablePercent();
+                    }
+                }
+                else {
+                    _this.removeControl('bankAccountProperties');
+                }
             });
         };
-        return BankAccountForm;
+        return BankAccountImportForm;
     }(AbstractForm));
 
     /**
-     * Form is using for manual bank account creation (not Basiq), prepares bank account data for the next saving.
+     * Form is using for single manual bank account creation (not Basiq)
      */
     var BankAccountAddManualForm = /** @class */ (function (_super) {
         __extends(BankAccountAddManualForm, _super);
         function BankAccountAddManualForm(connection) {
-            return _super.call(this, {
+            var _this = _super.call(this, {
                 type: new forms.FormControl(null, forms.Validators.required),
                 accountName: new forms.FormControl(null, forms.Validators.required),
                 currentBalance: new forms.FormControl(null, forms.Validators.required),
                 accountNumber: new forms.FormControl(null, [forms.Validators.required, forms.Validators.pattern(BankAccountAddManualForm.accountNumberPattern)]),
-            }, classTransformer.plainToClass(BankAccount, { bankConnection: connection })) || this;
+                tankType: new forms.FormControl(null, forms.Validators.required),
+            }) || this;
+            _this.connection = connection;
+            _this.listenEvents();
+            return _this;
         }
+        BankAccountAddManualForm.prototype.listenEvents = function () {
+            this.listenTypeChanges();
+            this.listenTankTypeChanges();
+        };
+        /**
+         * Add/Remove loan form depends on selected bank account type
+         */
+        BankAccountAddManualForm.prototype.listenTypeChanges = function () {
+            var _this = this;
+            this.get('type').valueChanges.subscribe(function (type) {
+                if (BankAccount.loanTypes.includes(type)) {
+                    _this.addControl('loan', new BankAccountLoanForm());
+                    // property percent allowed only for loan bank accounts
+                    if (_this.contains('bankAccountProperties')) {
+                        _this.get('bankAccountProperties').enablePercent();
+                    }
+                }
+                else {
+                    _this.removeControl('loan');
+                    // property percent allowed only for loan bank accounts
+                    if (_this.contains('bankAccountProperties')) {
+                        _this.get('bankAccountProperties').disablePercent();
+                    }
+                }
+            });
+        };
+        /**
+         * Add/Remove bank account properties form depends on selected tank type
+         */
+        BankAccountAddManualForm.prototype.listenTankTypeChanges = function () {
+            var _this = this;
+            this.get('tankType').valueChanges.subscribe(function (tankType) {
+                if (tankType === exports.TankTypeEnum.PROPERTY) {
+                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm());
+                    // property percent allowed only for loan bank accounts
+                    if (_this.contains('loan')) {
+                        _this.get('bankAccountProperties').enablePercent();
+                    }
+                    else {
+                        _this.get('bankAccountProperties').disablePercent();
+                    }
+                }
+                else {
+                    _this.removeControl('bankAccountProperties');
+                }
+            });
+        };
+        /**
+         * Attach bank connection to manual bank account
+         */
+        BankAccountAddManualForm.prototype.submit = function () {
+            return _super.prototype.submit.call(this, { bankConnection: this.connection });
+        };
         return BankAccountAddManualForm;
     }(AbstractForm));
     BankAccountAddManualForm.accountNumberPattern = '^[0-9]{6}[ ]{1}[0-9]{1,}$';
@@ -14773,18 +14983,74 @@
         };
     }
 
-    var BankAccountMigrateForm = /** @class */ (function (_super) {
-        __extends(BankAccountMigrateForm, _super);
-        function BankAccountMigrateForm() {
-            return _super.call(this, {
-                migrateFrom: new forms.FormControl(BankAccountMigrateForm.minDate, [forms.Validators.required, dateRangeValidator(BankAccountMigrateForm.minDate, BankAccountMigrateForm.maxDate)]),
-                migrateTo: new forms.FormControl(BankAccountMigrateForm.maxDate, [forms.Validators.required, dateRangeValidator(BankAccountMigrateForm.minDate, BankAccountMigrateForm.maxDate)])
+    /**
+     * Validator check if at least one control in formArray is enabled
+     */
+    function atLeastOneEnabledValidator(arrayName) {
+        return function (formGroup) {
+            return !!formGroup.get(arrayName).controls.find(function (control) { return control.enabled; })
+                ? null
+                : { arrayControlsDisabled: true };
+        };
+    }
+
+    /**
+     * Form for import multiple basiq bank accounts
+     */
+    var BankAccountsImportForm = /** @class */ (function (_super) {
+        __extends(BankAccountsImportForm, _super);
+        function BankAccountsImportForm(bankAccounts) {
+            var _this = _super.call(this, {
+                migrateFrom: new forms.FormControl(BankAccountsImportForm.minDate, [forms.Validators.required, dateRangeValidator(BankAccountsImportForm.minDate, BankAccountsImportForm.maxDate)]),
+                migrateTo: new forms.FormControl(BankAccountsImportForm.maxDate, [forms.Validators.required, dateRangeValidator(BankAccountsImportForm.minDate, BankAccountsImportForm.maxDate)]),
+                bankAccounts: new forms.FormArray(bankAccounts.map(function (bankAccount) { return new BankAccountImportForm(bankAccount); }))
+            }, [], {
+                validators: [atLeastOneEnabledValidator('bankAccounts')]
             }) || this;
+            _this.bankAccounts = bankAccounts;
+            return _this;
         }
-        return BankAccountMigrateForm;
+        BankAccountsImportForm.prototype.submit = function () {
+            var e_1, _a;
+            this.submitted = true;
+            if (this.invalid) {
+                return null;
+            }
+            var bankAccounts = [];
+            try {
+                // form is valid when all selected bank accounts forms are valid
+                for (var _b = __values(this.get('bankAccounts').controls), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var bankAccountImportForm = _c.value;
+                    // skip disabled forms
+                    if (bankAccountImportForm.disabled) {
+                        continue;
+                    }
+                    var bankAccount = bankAccountImportForm.submit({
+                        migrateFrom: this.value.migrateFrom,
+                        migrateTo: this.value.migrateTo
+                    });
+                    if (!bankAccount) {
+                        return null;
+                    }
+                    bankAccounts.push(bankAccount);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            if (!bankAccounts.length) {
+                return null;
+            }
+            return bankAccounts;
+        };
+        return BankAccountsImportForm;
     }(AbstractForm));
-    BankAccountMigrateForm.minDate = new FinancialYear().prevFinYear.startDate;
-    BankAccountMigrateForm.maxDate = new Date();
+    BankAccountsImportForm.minDate = new FinancialYear().prevFinYear.startDate;
+    BankAccountsImportForm.maxDate = new Date();
 
     /**
      * Form with basiq bank login fields.
@@ -14817,15 +15083,11 @@
 
     /**
      * Validation function for autocomplete fields. Checks that the user should select a value from a list rather than type in input field
+     * @TODO Alex: create class AppValidators with static methods and move there all custom validators (line Angular Validators)
      */
-    function requireAutocomplete() {
+    function autocompleteValidator() {
         return function (control) {
-            if (typeof control.value === 'string' && !!control.value) {
-                return { notFromList: true };
-            }
-            else {
-                return null;
-            }
+            return (!control.value || (typeof control.value === 'object')) ? null : { notFromList: true };
         };
     }
 
@@ -14867,21 +15129,6 @@
         };
     }
 
-    /**
-     * Validation function, that checks that the user should select a value from a list rather than type in input field
-     */
-    function requireSelectValidator() {
-        return function (control) {
-            var selection = control.value;
-            if (typeof selection === 'string' && !!selection) {
-                return { notFromList: true };
-            }
-            else {
-                return null;
-            }
-        };
-    }
-
     var ClientIncomeTypesForm = /** @class */ (function (_super) {
         __extends(ClientIncomeTypesForm, _super);
         function ClientIncomeTypesForm(clientIncomeTypes) {
@@ -14909,13 +15156,14 @@
         return LoginForm;
     }(AbstractForm));
 
+    // @TODO Alex: Create a model and handle request fields via class-transformer
     var PasswordForm = /** @class */ (function (_super) {
         __extends(PasswordForm, _super);
         function PasswordForm() {
             return _super.call(this, {
                 password: new forms.FormControl(null, [forms.Validators.required, passwordValidator()]),
                 confirm: new forms.FormControl(null, forms.Validators.required),
-            }, {}, passwordMatchValidator('password', 'confirm')) || this;
+            }, { password: null, confirm: null }, passwordMatchValidator('password', 'confirm')) || this;
         }
         return PasswordForm;
     }(AbstractForm));
@@ -14929,7 +15177,6 @@
                 lastName: new forms.FormControl('', [forms.Validators.required]),
                 email: new forms.FormControl('', [forms.Validators.required, forms.Validators.email]),
                 password: new PasswordForm(),
-                acceptTerms: new forms.FormControl(false, [forms.Validators.requiredTrue]),
                 referenceCode: new forms.FormControl(referenceCode)
             }) || this;
         }
@@ -14965,6 +15212,7 @@
         return RegisterFirmForm;
     }(AbstractForm));
 
+    // @TODO Alex: Create a model and handle request fields via class-transformer
     var ResetPasswordForm = /** @class */ (function (_super) {
         __extends(ResetPasswordForm, _super);
         function ResetPasswordForm() {
@@ -15230,7 +15478,7 @@
         __extends(MyTaxIncomeStatementsForm, _super);
         function MyTaxIncomeStatementsForm(incomeStatements, user) {
             var _this = _super.call(this, {
-                occupation: new forms.FormControl(user.clientDetails.occupation, [forms.Validators.required, requireSelectValidator()]),
+                occupation: new forms.FormControl(user.clientDetails.occupation, [forms.Validators.required, autocompleteValidator()]),
                 allowanceTotalAmount: new forms.FormControl({
                     value: incomeStatements.allowanceTotalAmount,
                     disabled: true
@@ -15507,14 +15755,12 @@
     exports.BankAccountCalculationService = BankAccountCalculationService;
     exports.BankAccountChartData = BankAccountChartData;
     exports.BankAccountCollection = BankAccountCollection;
-    exports.BankAccountForm = BankAccountForm;
+    exports.BankAccountImportForm = BankAccountImportForm;
     exports.BankAccountLoanForm = BankAccountLoanForm;
-    exports.BankAccountMigrateForm = BankAccountMigrateForm;
     exports.BankAccountPropertiesForm = BankAccountPropertiesForm;
     exports.BankAccountProperty = BankAccountProperty;
-    exports.BankAccountPropertyForm = BankAccountPropertyForm;
     exports.BankAccountService = BankAccountService;
-    exports.BankCollection = BankCollection;
+    exports.BankAccountsImportForm = BankAccountsImportForm;
     exports.BankConnection = BankConnection;
     exports.BankConnectionService = BankConnectionService;
     exports.BankLoginData = BankLoginData;
@@ -15583,6 +15829,7 @@
     exports.DepreciationReportItem = DepreciationReportItem;
     exports.DepreciationReportItemCollection = DepreciationReportItemCollection;
     exports.DepreciationService = DepreciationService;
+    exports.Dictionary = Dictionary;
     exports.Document = Document;
     exports.DocumentFolder = DocumentFolder;
     exports.DocumentFolderService = DocumentFolderService;
@@ -15598,6 +15845,7 @@
     exports.ExportDataTable = ExportDataTable;
     exports.ExportFormatterService = ExportFormatterService;
     exports.ExportableCollection = ExportableCollection;
+    exports.FacebookService = FacebookService;
     exports.FinancialYear = FinancialYear;
     exports.Firm = Firm;
     exports.FirmService = FirmService;
@@ -15769,6 +16017,7 @@
     exports.XlsxService = XlsxService;
     exports.atLeastOneCheckedValidator = atLeastOneCheckedValidator;
     exports.atoLinks = atoLinks;
+    exports.autocompleteValidator = autocompleteValidator;
     exports.cloneDeep = cloneDeep;
     exports.compare = compare;
     exports.compareMatOptions = compareMatOptions;
@@ -15779,8 +16028,6 @@
     exports.passwordMatchValidator = passwordMatchValidator;
     exports.passwordValidator = passwordValidator;
     exports.replace = replace;
-    exports.requireAutocomplete = requireAutocomplete;
-    exports.requireSelectValidator = requireSelectValidator;
     exports.roundTo = roundTo;
     exports.sort = sort;
     exports.sortDeep = sortDeep;