taxtank-core 0.32.0 → 0.32.1

package/fesm2022/taxtank-core.mjs

@@ -27,10 +27,10 @@ import { Validators, UntypedFormGroup, UntypedFormControl, UntypedFormArray, For
 import compact from 'lodash/compact';
 import concat from 'lodash/concat';
 import cloneDeep$1 from 'lodash/cloneDeep';
-import clone from 'lodash/clone';
-import * as mixpanel from 'mixpanel-browser';
 import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource.min.js';
 import { JwtHelperService } from '@auth0/angular-jwt';
+import * as mixpanel from 'mixpanel-browser';
+import clone from 'lodash/clone';
 import * as i4 from '@angular/router';
 import { NavigationEnd } from '@angular/router';
 import _ from 'lodash';
@@ -545,7 +545,7 @@ class Ticket extends AbstractModel {
 let Chat$1 = class Chat extends AbstractModel {
 };
 
-let ClientInvite$1 = class ClientInvite extends AbstractModel {
+let ClientInvite$1 = class ClientInvite extends ObservableModel {
 };
 
 let ClientMovement$1 = class ClientMovement extends AbstractModel {
@@ -8382,10 +8382,10 @@ class ServiceSubscriptionCollection extends Collection {
         return dictionary;
     }
     findByProduct(product) {
-        return this.find((subscription) => !!subscription.items.find((item) => item.price.product.id === product.id));
+        return this.find((subscription) => subscription.roles.includes(product.role));
     }
     filterByProduct(product) {
-        return this.filter((subscription) => !!subscription.items.find((item) => item.price.product.id === product.id));
+        return this.filter((subscription) => subscription.roles.includes(product.role));
     }
     hasPropertyTank() {
         return !!this.getItems().propertiesItem;
@@ -8496,8 +8496,8 @@ class VehicleLogbookCollection extends Collection {
      * Get collection of non-personal logbooks (work-related, sole-related).
      * @TODO Vik: Best period: move this and related logic to backend
      */
-    getClaimableLogbooks() {
-        return this.filterBy('isPersonal', false);
+    getClaimableLogbooks(isSole = false) {
+        return this.filter((logbook) => !logbook.isPersonal && (isSole ? logbook.isSoleTank() : logbook.isWorkTank()));
     }
     /**
      * Calculate total kilometers traveled
@@ -8518,6 +8518,11 @@ class VehicleLogbookCollection extends Collection {
             .reduce((sum, logbook) => sum + logbook.kilometers, 0);
         return round(workKilometers / this.kilometers * 100, 2);
     }
+    getWorkUsageByTank(isSole) {
+        const workKilometers = this.getClaimableLogbooks(isSole).items
+            .reduce((sum, logbook) => sum + logbook.kilometers, 0);
+        return round(workKilometers / this.kilometers * 100, 2);
+    }
     /**
      * Get list of logbooks related to passed vehicle claim
      */
@@ -8531,8 +8536,8 @@ class VehicleLogbookCollection extends Collection {
     /**
      * get collection of logbooks with the biggest work usage for {@link BestVehicleLogbookCollection.periodDuration}
      */
-    getBest() {
-        return BestVehicleLogbookCollection.fromLogbooks(this);
+    getBest(isSole = false) {
+        return BestVehicleLogbookCollection.fromLogbooks(this, isSole);
     }
 }
 
@@ -8550,8 +8555,9 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
      * constructor is private because we want to prevent collection initialization via 'new' operator.
      * We should create instances only with fromLogbooks method
      */
-    constructor(logbooks) {
+    constructor(logbooks, isSole = false) {
         super([]);
+        this.isSole = isSole;
         if (!this.isBestPeriodExist(logbooks)) {
             return;
         }
@@ -8564,11 +8570,14 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
         if (logbooks.length < 2) {
             return false;
         }
+        if (!(logbooks instanceof VehicleLogbookCollection)) {
+            logbooks = new VehicleLogbookCollection(logbooks);
+        }
         return BestVehicleLogbookCollection.periodDuration < (logbooks.last.date.getTime() - logbooks.first.date.getTime());
     }
     getWorkUsageByClaim(claim) {
-        const claimKilometers = this.getByVehicleClaim(claim).getClaimableLogbooks().kilometers;
-        return round(this.workUsage * (claimKilometers / this.kilometers), 2);
+        const claimKilometers = this.getByVehicleClaim(claim).getClaimableLogbooks(this.isSole).kilometers;
+        return round(this.getWorkUsageByTank(this.isSole) * (claimKilometers / this.kilometers), 2);
     }
     /**
      * Set Date Range with the biggest work usage percent
@@ -8584,10 +8593,10 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
      */
     calculateBestPeriod(logbooks) {
         // get a list of date ranges that could potentially be the best
-        const periods = this.getPeriods(logbooks.getClaimableLogbooks());
+        const periods = this.getPeriods(logbooks);
         periods.forEach((period) => {
             const logbooksInPeriod = logbooks.filterByRange('date', period.start.toDate(), period.end.toDate());
-            if (!this.period || (this.workUsage < logbooksInPeriod.workUsage)) {
+            if (!this.period || (this.getWorkUsageByTank(this.isSole) < logbooksInPeriod.getWorkUsageByTank(this.isSole))) {
                 this.period = period;
                 this.items = logbooksInPeriod.toArray();
             }
@@ -8595,16 +8604,17 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
     }
     // get list of date ranges for each of passed logbook
     getPeriods(logbooks) {
+        const claimable = logbooks.getClaimableLogbooks(this.isSole);
         // get a list of date ranges that could potentially be the best
-        const periods = logbooks
+        const periods = claimable
             // skip logbooks whose range ends after the last logbook
             .filter((logbook) => this.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)
             .map((logbook) => this.getPeriodByLogbook(logbook));
         // skip if the last logbook already included to the last existing date range
-        if (last(periods).end.toDate() < logbooks.last.date) {
-            // add extra date range for the last claimable logbook
-            periods.push(this.getPeriodByLogbook(logbooks.last, true));
-        }
+        // if (last(periods).end.toDate() < logbooks.last.date) {
+        // add extra date range for the last claimable logbook
+        periods.push(this.getPeriodByLogbook(claimable.last, true));
+        // }
         return periods;
     }
     /**
@@ -8618,8 +8628,8 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
         }
         return new DateRange([logbook.date, new Date(logbook.date.getTime() + BestVehicleLogbookCollection.periodDuration)]);
     }
-    static fromLogbooks(logbooks) {
-        const collection = new BestVehicleLogbookCollection(logbooks);
+    static fromLogbooks(logbooks, isSole = false) {
+        const collection = new BestVehicleLogbookCollection(logbooks, isSole);
         return collection.isBestPeriodExist(logbooks) ? collection : null;
     }
 }
@@ -10394,89 +10404,37 @@ __decorate([
     Type(() => TaxReturnItem)
 ], TaxReturn.prototype, "taxReturnItems", void 0);
 
-// replace array element with the new one (only arrays of objects)
-function replace(array, item, matchField = 'id') {
-    const index = array.findIndex((i) => i[matchField] === item[matchField]);
-    array.splice(index, 1, item);
-}
-
-// sort array of objects by field
-function sort(array, field = 'id', isDesc = true) {
-    array.sort((a, b) => {
-        if (a[field] > b[field]) {
-            return !isDesc ? 1 : -1;
-        }
-        if (a[field] < b[field]) {
-            return !isDesc ? -1 : 1;
-        }
-        return 0;
-    });
-}
-
-// sort array of objects by field
-function sortDeep(array, fieldsQueue = ['id'], isDesc = true) {
-    array.sort((a, b) => {
-        const aValue = getValue(a, fieldsQueue);
-        const bValue = getValue(b, fieldsQueue);
-        if (aValue > bValue) {
-            return !isDesc ? 1 : -1;
-        }
-        if (aValue < bValue) {
-            return !isDesc ? -1 : 1;
-        }
-        return 0;
-    });
-}
-function getValue(obj, fields) {
-    let value = obj;
-    fields.forEach((field) => {
-        value = value[field];
-    });
-    return value;
-}
-
 /**
- * Convert single object or array into array
+ * @TODO Alex (TT-1777): replace old logic with the new when all services ready
+ * @TODO Alex (TT-1777): rename old logic and keep it for custom events
  */
-function toArray(data) {
-    return Array.isArray(data) ? data : [data];
-}
-
-class DataService {
-    /**
-     * @TODO use excludeExtraneousValues when all models refactored (exposed all needed properties)
-     * Create new instance of class
-     * @param model Single object or array from which will be created model instance(s)
-     */
-    createModelInstance(model) {
-        // excludePrefixes - class-transformer option is using to ignore hydra fields
-        return plainToClass(this.modelClass, model, { excludePrefixes: ['@'] });
-    }
-    createCollectionInstance(collectionClass, items) {
-        return new collectionClass(items);
+class EventDispatcherService {
+    constructor() {
+        this.eventSubject = new Subject();
+        this.eventSubject2 = new Subject();
     }
     /**
-     * never return cache directly to prevent update
+     * subscription to specific event type
      */
-    getCache() {
-        return clone(this.cache);
+    on(eventType) {
+        return this.eventSubject.pipe(filter((event) => [].concat(eventType).includes(event.type)), map((event) => event.payload));
     }
-    /**
-     * never return cache directly to prevent update
-     */
-    getCacheFirst() {
-        return clone(this.cache?.first);
+    on2(...names) {
+        return this.eventSubject2.pipe(filter((event) => [].concat(names).includes(event.name)), map((event) => event.items));
     }
     /**
-     * @TODO vik any[] because of problems with base models extending abstractModel
+     * deliver new event
      */
-    setCache(data) {
-        this.cache = this.createCollectionInstance(this.collectionClass, data.map((item) => this.createModelInstance(item)));
+    dispatch(event) {
+        this.eventSubject.next(event);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: DataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: DataService, providedIn: 'root' }); }
+    dispatch2(event) {
+        this.eventSubject2.next(event);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EventDispatcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EventDispatcherService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: DataService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EventDispatcherService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -10533,43 +10491,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     args: ['environment']
                 }] }]; } });
 
-/**
- * @TODO Alex (TT-1777): replace old logic with the new when all services ready
- * @TODO Alex (TT-1777): rename old logic and keep it for custom events
- */
-class EventDispatcherService {
-    constructor() {
-        this.eventSubject = new Subject();
-        this.eventSubject2 = new Subject();
-    }
-    /**
-     * subscription to specific event type
-     */
-    on(eventType) {
-        return this.eventSubject.pipe(filter((event) => [].concat(eventType).includes(event.type)), map((event) => event.payload));
-    }
-    on2(...names) {
-        return this.eventSubject2.pipe(filter((event) => [].concat(names).includes(event.name)), map((event) => event.items));
-    }
-    /**
-     * deliver new event
-     */
-    dispatch(event) {
-        this.eventSubject.next(event);
-    }
-    dispatch2(event) {
-        this.eventSubject2.next(event);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EventDispatcherService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EventDispatcherService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EventDispatcherService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 const NAME_TOKEN = 'token';
 const NAME_REFRESH_TOKEN = 'refreshToken';
 class JwtService extends JwtHelperService {
@@ -10654,66 +10575,234 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     args: ['environment']
                 }] }]; } });
 
+// replace array element with the new one (only arrays of objects)
+function replace(array, item, matchField = 'id') {
+    const index = array.findIndex((i) => i[matchField] === item[matchField]);
+    array.splice(index, 1, item);
+}
+
+// sort array of objects by field
+function sort(array, field = 'id', isDesc = true) {
+    array.sort((a, b) => {
+        if (a[field] > b[field]) {
+            return !isDesc ? 1 : -1;
+        }
+        if (a[field] < b[field]) {
+            return !isDesc ? -1 : 1;
+        }
+        return 0;
+    });
+}
+
+// sort array of objects by field
+function sortDeep(array, fieldsQueue = ['id'], isDesc = true) {
+    array.sort((a, b) => {
+        const aValue = getValue(a, fieldsQueue);
+        const bValue = getValue(b, fieldsQueue);
+        if (aValue > bValue) {
+            return !isDesc ? 1 : -1;
+        }
+        if (aValue < bValue) {
+            return !isDesc ? -1 : 1;
+        }
+        return 0;
+    });
+}
+function getValue(obj, fields) {
+    let value = obj;
+    fields.forEach((field) => {
+        value = value[field];
+    });
+    return value;
+}
+
 /**
- * Abstract base service that implements common services functionality
- * and describe abstract methods/properties that have to be implemented in child services
- * Model - entity service is working with
- * BaseModel - base entity model that extends by Model
- * CollectionModel - entity collection class
+ * Convert single object or array into array
  */
-let RestService$1 = class RestService extends DataService {
-    constructor(http, eventDispatcherService, environment) {
-        super();
-        this.http = http;
-        this.eventDispatcherService = eventDispatcherService;
-        this.environment = environment;
-        /**
-         * Subject for service cache
-         */
-        this.cacheSubject = new ReplaySubject(1);
-        /**
-         * List of methods unavailable for current API
-         * @TODO Alex: add and handle enabled methods too
-         * @TODO Alex: disable batch by default
-         */
-        this.disabledMethods = [];
-        this.mpService = inject(MixpanelService);
-        this.roles = [];
-        // @TODO Alex remove, bad idea to call empty method overrided in child (because it will be called with parent context)
-        this.listenEvents();
+function toArray(data) {
+    return Array.isArray(data) ? data : [data];
+}
+
+class DataService {
+    /**
+     * @TODO use excludeExtraneousValues when all models refactored (exposed all needed properties)
+     * Create new instance of class
+     * @param model Single object or array from which will be created model instance(s)
+     */
+    createModelInstance(model) {
+        // excludePrefixes - class-transformer option is using to ignore hydra fields
+        return plainToClass(this.modelClass, model, { excludePrefixes: ['@'] });
     }
-    get apiUrl() {
-        return `${this.environment.apiV2}/${this.endpointUri}`;
+    createCollectionInstance(collectionClass, items) {
+        return new collectionClass(items);
     }
-    setCache(data, next = false) {
-        super.setCache(data);
-        if (next) {
-            this.cacheSubject.next(this.cache);
-        }
+    /**
+     * never return cache directly to prevent update
+     */
+    getCache() {
+        return clone(this.cache);
     }
     /**
-     * Refresh cache with actual backend data
+     * never return cache directly to prevent update
      */
-    refreshCache() {
-        this.cache = undefined;
-        this.get();
+    getCacheFirst() {
+        return clone(this.cache?.first);
     }
     /**
-     * Get data from backend and fill the cache
+     * @TODO vik any[] because of problems with base models extending abstractModel
      */
-    fetch(path = this.apiUrl) {
-        this.handleAccessError('get');
-        if (!this.hasRoles()) {
-            this.setCache([], true);
-            return this.cacheSubject.asObservable();
-        }
-        // Set cache as empty collection to avoid multiple requests before cache filled
-        this.setCache([]);
-        return this.http.get(path)
-            .pipe(map((response) => this.isApiPlatform ? response['hydra:member'] : toArray(response)), map((response) => {
-            this.setCache(response, true);
-            return this.cache;
-        }));
+    setCache(data) {
+        this.cache = this.createCollectionInstance(this.collectionClass, data.map((item) => this.createModelInstance(item)));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: DataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: DataService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: DataService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * Common toast message class
+ */
+class Toast {
+    constructor() {
+        this.duration = 3000;
+        this.autoClose = true;
+    }
+}
+
+var ToastTypeEnum;
+(function (ToastTypeEnum) {
+    ToastTypeEnum[ToastTypeEnum["INFO"] = 0] = "INFO";
+    ToastTypeEnum[ToastTypeEnum["SUCCESS"] = 1] = "SUCCESS";
+    ToastTypeEnum[ToastTypeEnum["WARNING"] = 2] = "WARNING";
+    ToastTypeEnum[ToastTypeEnum["ERROR"] = 3] = "ERROR";
+})(ToastTypeEnum || (ToastTypeEnum = {}));
+
+/**
+ * popup notifications service (toast, snackbar).
+ */
+class ToastService {
+    constructor() {
+        this.toast$ = new ReplaySubject(1);
+    }
+    get() {
+        return this.toast$.asObservable();
+    }
+    add(toast) {
+        // set date to prevent closing of equal toasts (extra case)
+        toast.date = new Date(),
+            this.toast$.next(toast);
+    }
+    success(message) {
+        this.add(plainToClass(Toast, {
+            type: ToastTypeEnum.SUCCESS,
+            title: 'Success!',
+            message,
+        }));
+    }
+    warning(message) {
+        this.add(plainToClass(Toast, {
+            type: ToastTypeEnum.WARNING,
+            title: 'Notification!',
+            message,
+        }));
+    }
+    error(message) {
+        this.add(plainToClass(Toast, {
+            type: ToastTypeEnum.ERROR,
+            title: 'Error!',
+            message,
+        }));
+    }
+    info(message) {
+        this.add(plainToClass(Toast, {
+            type: ToastTypeEnum.INFO,
+            title: 'Information',
+            message,
+        }));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ToastService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ToastService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ToastService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * Abstract base service that implements common services functionality
+ * and describe abstract methods/properties that have to be implemented in child services
+ * Model - entity service is working with
+ * BaseModel - base entity model that extends by Model
+ * CollectionModel - entity collection class
+ */
+let RestService$1 = class RestService extends DataService {
+    constructor(http, eventDispatcherService, environment) {
+        super();
+        this.http = http;
+        this.eventDispatcherService = eventDispatcherService;
+        this.environment = environment;
+        /**
+         * Subject for service cache
+         */
+        this.cacheSubject = new ReplaySubject(1);
+        /**
+         * List of methods unavailable for current API
+         * @TODO Alex: add and handle enabled methods too
+         * @TODO Alex: disable batch by default
+         */
+        this.disabledMethods = [];
+        this.mpService = inject(MixpanelService);
+        this.sseService = inject(SseService);
+        this.toastService = inject(ToastService);
+        this.roles = [];
+        /**
+         * disable cache update by requests, update only by SSE events
+         */
+        this.disableCache = false;
+        // @TODO Alex remove, bad idea to call empty method overrided in child (because it will be called with parent context)
+        this.listenEvents();
+        // @TODO Alex remove, bad idea to call empty method overrided in child (because it will be called with parent context)
+        this.listenSSE();
+    }
+    get apiUrl() {
+        return `${this.environment.apiV2}/${this.endpointUri}`;
+    }
+    setCache(data, next = false) {
+        super.setCache(data);
+        if (next) {
+            this.cacheSubject.next(this.cache);
+        }
+    }
+    /**
+     * Refresh cache with actual backend data
+     */
+    refreshCache() {
+        this.cache = undefined;
+        this.get();
+    }
+    /**
+     * Get data from backend and fill the cache
+     */
+    fetch(path = this.apiUrl) {
+        this.handleAccessError('get');
+        if (!this.hasRoles()) {
+            this.setCache([], true);
+            return this.cacheSubject.asObservable();
+        }
+        // Set cache as empty collection to avoid multiple requests before cache filled
+        this.setCache([]);
+        return this.http.get(path)
+            .pipe(map((response) => this.isApiPlatform ? response['hydra:member'] : toArray(response)), map((response) => {
+            this.setCache(response, true);
+            return this.cache;
+        }));
     }
     get(path = this.apiUrl) {
         if (!this.cache) {
@@ -10725,6 +10814,9 @@ let RestService$1 = class RestService extends DataService {
         this.handleAccessError('get');
         return this.get().pipe(map((collection) => collection.first));
     }
+    hasInCache(id) {
+        return !!this.getCache().findBy('id', id);
+    }
     getArray() {
         return this.get().pipe(map((collection) => collection.toArray()));
     }
@@ -10815,6 +10907,10 @@ let RestService$1 = class RestService extends DataService {
         }));
     }
     track(response, method, mpData, postfix = '') {
+        // check if result exist, sometimes response may be empty (for example ClientInvite accept/reject/etc)
+        if (!response[0]) {
+            return;
+        }
         // no other way to check interface
         if ('getMpData' in response[0]) {
             response.forEach((model) => {
@@ -10831,7 +10927,7 @@ let RestService$1 = class RestService extends DataService {
      */
     handleResponse(response, method, mpData) {
         this.track(response, method, mpData);
-        if (this.getCache()) {
+        if (this.getCache() && !this.disableCache) {
             this.updateCache(response, method);
         }
         // dispatch event for interested services
@@ -10908,6 +11004,10 @@ let RestService$1 = class RestService extends DataService {
      * Method that call all listeners. Empty by default. Should be redefined by child services if required
      */
     listenEvents() { }
+    /**
+     * Listen SSE events
+     */
+    listenSSE() { }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: RestService, providedIn: 'root' }); }
 };
@@ -11014,89 +11114,17 @@ var BankConnectionMessagesEnum;
     BankConnectionMessagesEnum["TEMPORARY_UNAVAILABLE"] = "The bank is temporarily unavailable, please check back later";
 })(BankConnectionMessagesEnum || (BankConnectionMessagesEnum = {}));
 
-/**
- * Common toast message class
- */
-class Toast {
-    constructor() {
-        this.duration = 3000;
-        this.autoClose = true;
-    }
-}
-
-var ToastTypeEnum;
-(function (ToastTypeEnum) {
-    ToastTypeEnum[ToastTypeEnum["INFO"] = 0] = "INFO";
-    ToastTypeEnum[ToastTypeEnum["SUCCESS"] = 1] = "SUCCESS";
-    ToastTypeEnum[ToastTypeEnum["WARNING"] = 2] = "WARNING";
-    ToastTypeEnum[ToastTypeEnum["ERROR"] = 3] = "ERROR";
-})(ToastTypeEnum || (ToastTypeEnum = {}));
-
-/**
- * popup notifications service (toast, snackbar).
- */
-class ToastService {
-    constructor() {
-        this.toast$ = new ReplaySubject(1);
-    }
-    get() {
-        return this.toast$.asObservable();
-    }
-    add(toast) {
-        // set date to prevent closing of equal toasts (extra case)
-        toast.date = new Date(),
-            this.toast$.next(toast);
-    }
-    success(message) {
-        this.add(plainToClass(Toast, {
-            type: ToastTypeEnum.SUCCESS,
-            title: 'Success!',
-            message,
-        }));
-    }
-    warning(message) {
-        this.add(plainToClass(Toast, {
-            type: ToastTypeEnum.WARNING,
-            title: 'Notification!',
-            message,
-        }));
-    }
-    error(message) {
-        this.add(plainToClass(Toast, {
-            type: ToastTypeEnum.ERROR,
-            title: 'Error!',
-            message,
-        }));
-    }
-    info(message) {
-        this.add(plainToClass(Toast, {
-            type: ToastTypeEnum.INFO,
-            title: 'Information',
-            message,
-        }));
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ToastService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ToastService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ToastService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 /**
  * BankConnection means user account at specific bank (usually each user has only one at the same bank)
  * service handles BankConnection management
  */
 class BankConnectionService extends RestService$1 {
-    constructor(http, eventDispatcherService, sseService, environment, toastService) {
+    constructor(http, eventDispatcherService, sseService, environment) {
         super(http, eventDispatcherService, environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.sseService = sseService;
         this.environment = environment;
-        this.toastService = toastService;
         this.isApiPlatform = true;
         this.modelClass = BankConnection;
         this.collectionClass = Collection;
@@ -11155,7 +11183,7 @@ class BankConnectionService extends RestService$1 {
             this.refreshCache();
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankConnectionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }, { token: ToastService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankConnectionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankConnectionService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: BankConnectionService, decorators: [{
@@ -11166,7 +11194,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: SseService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }, { type: ToastService }]; } });
+                }] }]; } });
 
 var UserEventTypeTypeEnum;
 (function (UserEventTypeTypeEnum) {
@@ -11569,12 +11597,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * Service for work with chats
  */
 class ChatService extends RestService$1 {
-    constructor(http, eventDispatcherService, environment, sseService) {
+    constructor(http, eventDispatcherService, environment) {
         super(http, eventDispatcherService, environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
-        this.sseService = sseService;
         this.modelClass = Chat;
         this.collectionClass = ChatCollection;
         this.endpointUri = 'chats';
@@ -11630,7 +11657,7 @@ class ChatService extends RestService$1 {
             this.handleResponse([updatedChat], 'put');
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ChatService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ChatService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ChatService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ChatService, decorators: [{
@@ -11641,18 +11668,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }, { type: SseService }]; } });
+                }] }]; } });
 
 /**
  * Service for work with messages
  */
 class MessageService extends RestService$1 {
-    constructor(http, eventDispatcherService, environment, sseService) {
+    constructor(http, eventDispatcherService, environment) {
         super(http, eventDispatcherService, environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
-        this.sseService = sseService;
         this.modelClass = Message;
         this.collectionClass = MessageCollection;
         this.endpointUri = 'messages';
@@ -11689,7 +11715,7 @@ class MessageService extends RestService$1 {
             }
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: MessageService, decorators: [{
@@ -11700,7 +11726,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }, { type: SseService }]; } });
+                }] }]; } });
 
 /**
  * Service for work with Message Documents
@@ -12157,32 +12183,229 @@ class FileService extends RestService$1 {
         formData.append('file', file);
         return this.http.post(this.apiUrl, formData).pipe(map((fileBase) => plainToClass(AppFile, fileBase)));
     }
-    download(file) {
-        return this.http.get(`${this.apiUrl}/${file.id}/download`, { responseType: 'blob' });
+    download(file) {
+        return this.http.get(`${this.apiUrl}/${file.id}/download`, { responseType: 'blob' });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FileService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FileService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FileService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class ClientIncomeTypesService extends RestService$1 {
+    constructor() {
+        super(...arguments);
+        this.modelClass = ClientIncomeTypes;
+        this.collectionClass = Collection;
+        this.endpointUri = 'client-income-types';
+        this.isApiPlatform = true;
+        this.disabledMethods = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class ClientInviteService extends RestService$1 {
+    constructor() {
+        super(...arguments);
+        this.endpointUri = 'clients/invites';
+        this.collectionClass = ClientInviteCollection;
+        this.modelClass = ClientInvite;
+    }
+    getFirmInvites() {
+        return super.get(`${this.apiUrl}/all`);
+    }
+    /**
+     * Get invite which employee is TaxTank Advisor
+     * @TODO move to collection? but we need to inject enviroment
+     */
+    getTTAdvisor() {
+        return this.get().pipe(map((invites) => invites.findBy('employee.email', this.environment.ttAdvisor)));
+    }
+    /**
+     * Import clients from CSV file
+     */
+    import(file) {
+        const formData = new FormData();
+        formData.append('file', file);
+        // cant use parent method because of different parameters
+        return this.http.post(`${this.apiUrl}/import`, formData).pipe(map((clientInvite) => clientInvite));
+    }
+    /**
+     * Accept client invitation from firm to user
+     */
+    accept(invite) {
+        // cant use parent method because of custom specific handler
+        return this.http.put(`${this.apiUrl}/${invite.id}/accept`, invite).pipe(map(() => {
+            // @TODO remove when TaxReviewService refactored with the new rest and use there listenCSE instead
+            // TaxReviewService is listening client invites acception. With the new rest we are using listenCSE method, but old rest does not have this method.
+            // We need to refactor TaxReviewService with new rest first, then we can listenCSE and remove manual events
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CLIENT_INVITE_ACCEPTED, null));
+            this.handleResponse([invite], 'delete');
+        }));
+    }
+    /**
+     * Reject client invitation from firm to user
+     */
+    reject(invite) {
+        return super.put(invite, null, `${this.apiUrl}/${invite.id}/reject`);
+    }
+    /**
+     * Resend invitation from firm to client
+     */
+    resend(invite) {
+        // cant use parent method because of custom specific handler
+        return this.http.post(`${this.apiUrl}/${invite.id}/resend`, null)
+            .pipe(map((inviteBase) => plainToClass(ClientInvite, inviteBase)), map((resentInvite) => {
+            this.handleResponse([resentInvite], 'put');
+            return resentInvite;
+        }));
+    }
+    /**
+     * Send invitation from client to firm
+     */
+    inviteFirmByUser(invite) {
+        return super.post(invite, null, `${this.environment.apiV2}/firms/invite`)
+            .pipe(catchError((error) => {
+            if (error.error.email) {
+                this.toastService.error(error.error.email[0]);
+            }
+            else {
+                this.toastService.error(error.error);
+            }
+            return throwError(error);
+        }));
+    }
+    /**
+     * Listem clientInvites db changes via mercure to update cache
+     * @TODO make it universal and move to parent
+     */
+    listenSSE() {
+        this.sseService.on('clientInvites')
+            .pipe(map((clientInvite) => plainToClass(ClientInvite, clientInvite)))
+            .subscribe((clientInvite) => {
+            // we got empty body when item deleted so we should get id from Api Platform data (@id)
+            const id = clientInvite.id ?? +last(clientInvite['@id'].split('/'));
+            switch (true) {
+                case !clientInvite.id:
+                    this.updateCache([merge(clientInvite, { id })], 'delete');
+                    break;
+                case this.hasInCache(id):
+                    this.updateCache([clientInvite], 'put');
+                    break;
+                case !this.hasInCache(id):
+                    this.updateCache([clientInvite], 'post');
+            }
+        });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FileService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FileService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: FileService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
         }] });
 
-class ClientIncomeTypesService extends RestService$1 {
+var ClientInviteMessages;
+(function (ClientInviteMessages) {
+    ClientInviteMessages["TT_ADVISOR_INVITED"] = "You have Invited TaxTank Support successfully";
+    ClientInviteMessages["TT_INVITE_ACCEPT"] = "You successfully accepted the invitation";
+    ClientInviteMessages["REVOKE_TT_ADVISOR_CONFIRM"] = "Are you sure you want to revoke access?";
+    ClientInviteMessages["TT_ADVISOR_REVOKED"] = "Access revoked";
+    ClientInviteMessages["SEND_INVITE_MESSAGES_TITLE"] = "TaxTank support is here to help";
+    ClientInviteMessages["SEND_INVITE_MESSAGES_DESCRIPTION"] = "Before inviting TaxTank support be sure to check out our help articles and message our support team.";
+    ClientInviteMessages["TT_ACCOUNTANT_INVITED"] = "Accountant invitation has been sent successfully";
+    ClientInviteMessages["TT_ACCOUNTANT_INVETED_TOOLTIP"] = "Need an accountant? TaxTank Accountants delivers virtual accounting service exclusive to TaxTank subscribers. Experience a fast, seamless, and cost-effective lodgement service that rewards your TaxTank efforts throughout the year. Our team of experienced accountants brings their expertise in tax and TaxTank to the virtual realm. It all starts with a 15-minute consultation that sets the stage for personalised service. With us, you\u2019ll receive the best of both worlds at tax time.";
+    ClientInviteMessages["CONFIRM_REJECT"] = "Are you sure you want to reject this invitation?";
+    ClientInviteMessages["REJECTED"] = "Invitation rejected";
+    ClientInviteMessages["ACCEPTED"] = "Client invitation accepted";
+})(ClientInviteMessages || (ClientInviteMessages = {}));
+
+class ClientMovementService extends RestService$1 {
     constructor() {
         super(...arguments);
-        this.modelClass = ClientIncomeTypes;
-        this.collectionClass = Collection;
-        this.endpointUri = 'client-income-types';
+        this.endpointUri = 'client-movements';
+        this.collectionClass = ClientMovementCollection;
+        this.modelClass = ClientMovement;
         this.isApiPlatform = true;
-        this.disabledMethods = ['postBatch', 'putBatch', 'delete', 'deleteBatch'];
+        this.disabledMethods = ['postBatch', 'delete', 'deleteBatch'];
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, providedIn: 'root' }); }
+    listenEvents() {
+        // @TODO handle with mercure
+        this.listenCSE(ClientInvite, ['post', 'put', 'delete'], this.refreshCache);
+    }
+    getActive() {
+        return this.get().pipe(map((clientMovements) => clientMovements.active));
+    }
+    getTTAdvisor() {
+        return this.getActive()
+            .pipe(map((movements) => movements.findBy('employee.email', this.environment.ttAdvisor) || null));
+    }
+    getActiveByFirmType(type) {
+        return this.getActive().pipe(map((clientMovements) => clientMovements.getByFirmType(type)));
+    }
+    /**
+     * Method is using for transfer client between employees.
+     * On backend we close passed movement and create a new one instead
+     */
+    put(movement) {
+        // extend base 'add' method and pass into it movement without id
+        return super.post(plainToClass(ClientMovement, Object.assign({}, movement, { id: null }))).pipe(map((updatedMovement) => {
+            // remove provided movement from cache
+            this.cache = this.cache.filter((item) => item.id !== movement.id);
+            this.updateCache([updatedMovement], 'post');
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CLIENT_TRANSFER_TO_OTHER_EMPLOYEE, [updatedMovement.client]));
+            return updatedMovement;
+        }));
+    }
+    /**
+     * There is no actually direct updating of client movement, but we are using this method for transfer clients between employees
+     */
+    putBatch(clientMovements) {
+        const batch = clientMovements.map((clientMovement) => this.put(clientMovement));
+        return forkJoin(batch);
+    }
+    /**
+     * Reject current firm
+     */
+    close(clientMovement) {
+        clientMovement.dateTo = new Date();
+        // cant use parent method because of custom specific handler
+        return this.http.put(`${this.environment.apiV2}/client-movements/${clientMovement.id}/close`, clientMovement)
+            .pipe(map(() => {
+            // @TODO remove when TaxReviewService refactored with the new rest and use there listenCSE instead
+            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CLIENT_MOVEMENT_CLOSED, null));
+            this.cache = this.cache.filter((movement) => movement.id !== clientMovement.id);
+            this.updateCache([clientMovement], 'delete');
+        }));
+    }
+    /**
+     * Listem clientMovements db changes via mercure to update cache
+     * @TODO make it universal and move to parent
+     */
+    listenSSE() {
+        this.sseService.on('clientMovements')
+            .pipe(map((clientMovement) => plainToClass(ClientMovement, clientMovement)))
+            .subscribe((clientMovement) => {
+            this.hasInCache(clientMovement.id) ? this.updateCache([clientMovement], 'put') : this.updateCache([clientMovement], 'post');
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientIncomeTypesService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -12414,207 +12637,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     args: ['environment']
                 }] }, { type: ToastService }]; } });
 
-class ClientInviteService extends RestService {
-    constructor() {
-        super(...arguments);
-        this.url = 'clients/invites';
-        this.modelClass = ClientInvite;
-    }
-    listenEvents() {
-        this.listenNotifications();
-    }
-    getFirmInvites() {
-        return super.get(`${this.environment.apiV2}/${this.url}/all`);
-    }
-    getTTAdvisor() {
-        return this.get()
-            .pipe(map((invites) => new ClientInviteCollection(invites).findBy('employee.email', this.environment.ttAdvisor) || null));
-    }
-    /**
-     * Import employees for firm from CSV file
-     * @param file
-     */
-    import(file) {
-        const formData = new FormData();
-        formData.append('file', file);
-        return this.http.post(`${this.environment.apiV2}/${this.url}/import`, formData)
-            .pipe(map((clientInvite) => clientInvite));
-    }
-    /**
-     * Accept client invitation from firm to user
-     * @param invite
-     */
-    accept(invite) {
-        return this.http.post(`${this.environment.apiV2}/${this.url}/${invite.id}/accept`, null)
-            .pipe(map(() => {
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CLIENT_INVITE_ACCEPTED, invite));
-            // set cache without accepted invite
-            this.cache = this.cache.filter((clientInvite) => invite.id !== clientInvite.id);
-            this.updateCache();
-        }));
-    }
-    /**
-     * Reject client invitation from firm to user
-     * @param invite
-     */
-    reject(invite) {
-        return this.http.post(`${this.environment.apiV2}/${this.url}/${invite.id}/reject`, null)
-            .pipe(map((rejectedInvite) => {
-            const updatedInvite = plainToClass(ClientInvite, rejectedInvite);
-            // avoid cache changes
-            // @TODO make cache readonly
-            const tempCache = cloneDeep$1(this.cache);
-            replace(tempCache, plainToClass(ClientInvite, updatedInvite));
-            this.cache = tempCache;
-            this.updateCache();
-            return updatedInvite;
-        }));
-    }
-    /**
-     * Resend invitation from firm to client
-     * @param invite
-     */
-    resend(invite) {
-        return this.http.post(`${this.environment.apiV2}/${this.url}/${invite.id}/resend`, null)
-            .pipe(map((rejectedInvite) => {
-            const updatedInvite = plainToClass(ClientInvite, rejectedInvite);
-            // avoid cache changes
-            // @TODO make cache readonly
-            const tempCache = cloneDeep$1(this.cache);
-            replace(tempCache, plainToClass(ClientInvite, updatedInvite));
-            this.cache = tempCache;
-            this.updateCache();
-            return updatedInvite;
-        }));
-    }
-    /**
-     * Send invitation from client to firm
-     * @param invite
-     */
-    inviteFirmByUser(invite) {
-        return this.http.post(`${this.environment.apiV2}/firms/invite`, invite)
-            .pipe(map((inviteBase) => {
-            const newInvite = plainToClass(ClientInvite, inviteBase);
-            // avoid cache changes
-            // @TODO make cache readonly
-            const tempCache = cloneDeep$1(this.cache);
-            tempCache.push(newInvite);
-            this.cache = tempCache;
-            this.updateCache();
-            return newInvite;
-        }));
-    }
-    /**
-     * Reset cache on client/firm invite events
-     */
-    listenNotifications() {
-        this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
-            if (!notification.isRead && (notification.eventType === UserEventTypeTypeEnum.FIRM_INVITE_ACCEPTED || notification.eventType === UserEventTypeTypeEnum.CLIENT_INVITE)) {
-                this.refreshCache();
-            }
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientInviteService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-var ClientInviteMessages;
-(function (ClientInviteMessages) {
-    ClientInviteMessages["TT_ADVISOR_INVITED"] = "You have Invited TaxTank Support successfully";
-    ClientInviteMessages["REVOKE_TT_ADVISOR_CONFIRM"] = "Are you sure you want to revoke access?";
-    ClientInviteMessages["TT_ADVISOR_REVOKED"] = "Access revoked";
-    ClientInviteMessages["TT_INVITE_ACCEPT"] = "You successfully accepted the invitation";
-    ClientInviteMessages["SEND_INVITE_MESSAGES_TITLE"] = "TaxTank support is here to help";
-    ClientInviteMessages["SEND_INVITE_MESSAGES_DESCRIPTION"] = "Before inviting TaxTank support be sure to check out our help articles and message our support team.";
-    ClientInviteMessages["TT_ACCOUNTANT_INVITED"] = "Accountant invitation has been sent successfully";
-    ClientInviteMessages["TT_ACCOUNTANT_INVETED_TOOLTIP"] = "Need an accountant? TaxTank Accountants delivers virtual accounting service exclusive to TaxTank subscribers. Experience a fast, seamless, and cost-effective lodgement service that rewards your TaxTank efforts throughout the year. Our team of experienced accountants brings their expertise in tax and TaxTank to the virtual realm. It all starts with a 15-minute consultation that sets the stage for personalised service. With us, you\u2019ll receive the best of both worlds at tax time.";
-})(ClientInviteMessages || (ClientInviteMessages = {}));
-
-class ClientMovementService extends RestService {
-    constructor() {
-        super(...arguments);
-        this.modelClass = ClientMovement;
-        this.url = 'client-movements';
-        this.isHydra = true;
-    }
-    listenEvents() {
-        this.listenNotifications();
-        this.listenClientInvites();
-    }
-    /**
-     * @TODO BaseRestService should return collection
-     */
-    getAll() {
-        return this.get().pipe(map((clientMovements) => new ClientMovementCollection(clientMovements)));
-    }
-    getActive() {
-        return this.getAll().pipe(map((clientMovements) => clientMovements.active));
-    }
-    getTTAdvisor() {
-        return this.getActive()
-            .pipe(map((movements) => movements.findBy('employee.email', this.environment.ttAdvisor) || null));
-    }
-    getActiveByFirmType(type) {
-        return this.getActive().pipe(map((clientMovements) => clientMovements.getByFirmType(type)));
-    }
-    update(movement) {
-        // extend base 'add' method and pass into it movement without id
-        return super.add(plainToClass(ClientMovement, Object.assign({}, movement, { id: null }))).pipe(map((updatedMovement) => {
-            // remove provided movement from cache
-            this.cache = this.cache.filter((item) => item.id !== movement.id);
-            this.updateCache();
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CLIENT_TRANSFER_TO_OTHER_EMPLOYEE, [updatedMovement.client]));
-            return updatedMovement;
-        }));
-    }
-    updateBatch(clientMovements) {
-        const batch = clientMovements.map((clientMovement) => this.update(clientMovement));
-        return forkJoin(batch);
-    }
-    /**
-     * Reject current firm
-     */
-    close(clientMovement) {
-        clientMovement.dateTo = new Date();
-        return this.http.put(`${this.environment.apiV2}/client-movements/${clientMovement.id}/close`, clientMovement)
-            .pipe(map(() => {
-            this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.CLIENT_MOVEMENT_CLOSED, null));
-            this.cache = this.cache.filter((movement) => movement.id !== clientMovement.id);
-            this.updateCache();
-        }));
-    }
-    listenNotifications() {
-        this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
-            if (!notification.isRead && notification.eventType === UserEventTypeTypeEnum.FIRM_INVITE_ACCEPTED) {
-                this.refreshCache();
-            }
-        });
-    }
-    /**
-     * Listen to EventDispatcherService event related to clients invitations
-     */
-    listenClientInvites() {
-        this.eventDispatcherService.on(AppEventTypeEnum.CLIENT_INVITE_ACCEPTED)
-            .subscribe(() => {
-            this.refreshCache();
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ClientMovementService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 var EmployeeMessagesEnum;
 (function (EmployeeMessagesEnum) {
     EmployeeMessagesEnum["ROLE_GRANTED"] = "Manager role granted to ";
@@ -14086,12 +14108,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }] });
 
 class ServicePaymentMethodService extends RestService$1 {
-    constructor(http, eventDispatcherService, environment, sseService) {
+    constructor(http, eventDispatcherService, environment) {
         super(http, eventDispatcherService, environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
         this.environment = environment;
-        this.sseService = sseService;
         this.endpointUri = 'service-payment-methods';
         this.collectionClass = Collection;
         this.modelClass = ServicePaymentMethod;
@@ -14125,7 +14146,7 @@ class ServicePaymentMethodService extends RestService$1 {
             this.handleResponse([plainToClass(ServicePaymentMethod, newPaymentMethod)], 'post');
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePaymentMethodService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: SseService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePaymentMethodService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePaymentMethodService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePaymentMethodService, decorators: [{
@@ -14136,7 +14157,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
-                }] }, { type: SseService }]; } });
+                }] }]; } });
 
 /**
  * Service that handling banks logic
@@ -14174,12 +14195,10 @@ var SubscriptionMessagesEnum;
  * @TODO Alex refactor
  */
 class SubscriptionService extends RestService$1 {
-    constructor(http, eventDispatcherService, sseService, toastService, environment) {
+    constructor(http, eventDispatcherService, environment) {
         super(http, eventDispatcherService, environment);
         this.http = http;
         this.eventDispatcherService = eventDispatcherService;
-        this.sseService = sseService;
-        this.toastService = toastService;
         this.environment = environment;
         this.isApiPlatform = true;
         this.endpointUri = 'service-subscriptions';
@@ -14254,7 +14273,7 @@ class SubscriptionService extends RestService$1 {
             }, 2000);
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SubscriptionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: SseService }, { token: ToastService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SubscriptionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SubscriptionService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SubscriptionService, decorators: [{
@@ -14262,7 +14281,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: SseService }, { type: ToastService }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: EventDispatcherService }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['environment']
                 }] }]; } });
@@ -18191,7 +18210,7 @@ class AccountSetupService {
         batch.push(
         // Invite clients item is completed when firm has clients or firm has invited clients.
         this.setItemStatus(this.items.findBy('isInviteClients', true), combineLatest([this.clientMovementService.getActive(), this.clientInviteService.getFirmInvites()])
-            .pipe(map(([movements, invites]) => [...movements.toArray(), ...invites]))));
+            .pipe(map(([movements, invites]) => [...movements.toArray(), ...invites.toArray()]))));
         return combineLatest(batch).pipe(map((items) => new AccountSetupItemCollection(items)));
     }
     /**