diff --git a/package-lock.json b/package-lock.json index 97a39c2d06..1b34a44644 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.3.1", + "version": "1.3.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -665,9 +665,9 @@ } }, "@waves/event-sender": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@waves/event-sender/-/event-sender-1.0.0.tgz", - "integrity": "sha512-qBncwDnwFAtcZHqjRZLkoZP5JcCJTofGL5+gzMf3AjuF9dh+1DtA6OYgg7IYzHOF3i89rWyRON8+RZqbAlewAQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@waves/event-sender/-/event-sender-1.1.0.tgz", + "integrity": "sha512-/ZHa5hNs6UP5F8h5FrxY3mjmYmmv9uodU0eBddwUvp0L4hsJD16dP+bY6xcc8lBMj7ghmm7Or63dG7VrhkcsnA==", "requires": { "@waves/waves-browser-bus": "^0.1.5" } diff --git a/package.json b/package.json index a4c6b86bf9..aceb60de45 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "@waves/assets-pairs-order": "4.0.0", "@waves/data-entities": "^1.10.1", "@waves/data-service-client-js": "^2.0.0", - "@waves/event-sender": "^1.0.0", + "@waves/event-sender": "^1.1.0", "@waves/ledger": "^3.3.3", "@waves/marshall": "^0.7.2", "@waves/oracle-data": "^0.0.6", diff --git a/src/modules/app/initialize/AppRun.js b/src/modules/app/initialize/AppRun.js index 6145ed8eac..1eeb11c524 100644 --- a/src/modules/app/initialize/AppRun.js +++ b/src/modules/app/initialize/AppRun.js @@ -323,23 +323,12 @@ let waiting = false; - let userType = 'unknown'; - - const data = { + analytics.init(WavesApp.analyticsIframe, { platform: WavesApp.type, networkByte: ds.config.get('code'), - userType - }; - - Object.defineProperty(data, 'userType', { - get: () => userType, - set: v => { - userType = v; - } + userType: 'unknown' }); - analytics.init(WavesApp.analyticsIframe, data); - analytics.activate(); const stop = $rootScope.$on('$stateChangeStart', (event, toState, params, fromState) => { @@ -399,8 +388,6 @@ .then(() => { stop(); - userType = user.userType; - this._stopListenChangeLanguage(); if (START_STATES.indexOf(toState.name) === -1) { $state.go(toState.name, params); diff --git a/src/modules/app/services/User.js b/src/modules/app/services/User.js index 5cc4d2a33a..e2575a1e3d 100644 --- a/src/modules/app/services/User.js +++ b/src/modules/app/services/User.js @@ -576,6 +576,7 @@ } }); + analytics.addDefaultParams({ userType: this.userType }); this.lastLogin = Date.now(); if (this._settings) {