dev to master

gulpfile.ts

@@ -82,6 +82,11 @@ function createBuildTask(args?: { platform: TPlatform; env: TBuild; config: stri
                     ? ['(function () {\nvar module = undefined;\n', '})();']
                     : null
             ),
+            createConcatTask(
+                getFileName('not-wrapped-vendors.js', env as TBuild),
+                meta.vendorsNotWrapped,
+                join(outputPath, 'js')
+            ),
             createConcatTask(
                 getFileName('vendor-styles.css', env as TBuild),
                 meta.stylesheets,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "waves-client",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "description": "The official client application for the Waves platform",
   "private": true,
   "repository": {
@@ -137,7 +137,7 @@
     "ramda": "^0.25.0",
     "ts-api-validator": "2.1.2",
     "ts-utils": "^6.0.6",
-    "worker-wrapper": "^1.3.1"
+    "worker-wrapper": "^1.3.2"
   },
   "husky": {
     "hooks": {

scripts/htmlTask.ts

@@ -13,6 +13,7 @@ function getScriptsList(input: string) {
 
     return [
         filesMap['vendors'],
+        filesMap['not-wrapped-vendors'],
         filesMap['bundle'],
         filesMap['templates']
     ];

src/modules/app/services/User.js

@@ -426,6 +426,7 @@
                 if (stateName) {
                     this.logoutSignal.dispatch({});
                     this._resetFields();
+                    this.changeTheme(themes.getDefaultTheme());
                     $state.go(stateName, undefined, { custom: { logout: true } });
                 } else if (WavesApp.isDesktop()) {
                     transfer('reload');

src/modules/app/services/waves/WavesUtils.js

@@ -142,9 +142,18 @@
              * @param pair
              * @returns {Promise<string>}
              */
-            @decorators.cachable(60)
             getVolume(pair) {
-                return ds.api.pairs.info(matcher.currentMatcherAddress, [pair])
+                return this._getVolume(pair, matcher.currentMatcherAddress);
+            }
+
+            /**
+             * @param pair
+             * @param {string} currentMatcherAddress
+             * @returns {Promise<string>}
+             */
+            @decorators.cachable(60)
+            _getVolume(pair, currentMatcherAddress) {
+                return ds.api.pairs.info(currentMatcherAddress, [pair])
                     .then((data) => {
                         const [pair = {}] = data.filter(Boolean);
                         return pair && String(pair.volume) || '0';

src/modules/app/services/waves/matcher/Matcher.js

@@ -97,15 +97,11 @@
             }
 
             /**
+             * @param options
              * @return {Promise<Array<IOrder>>}
              */
-            @decorators.cachable(1)
             getOrders(options) {
-                if (user.address) {
-                    return ds.api.matcher.getOrders(options).then(ds.processOrdersWithStore);
-                } else {
-                    return Promise.resolve([]);
-                }
+                return this._getOrders(options, user.address);
             }
 
             /**
@@ -285,6 +281,21 @@
                     });
             }
 
+            /**
+             * @param {any} [options]
+             * @param {string} [address]
+             * @return {Promise<Array<IOrder>>}
+             * @private
+             */
+            @decorators.cachable(1)
+            _getOrders(options, address) {
+                if (address) {
+                    return ds.api.matcher.getOrders(options).then(ds.processOrdersWithStore);
+                } else {
+                    return Promise.resolve([]);
+                }
+            }
+
             /**
              * @param {string} asset1
              * @param {string} asset2

src/modules/app/services/waves/node/content/Transactions.js

@@ -65,28 +65,26 @@
 
             /**
              * Get transactions list by user
-             * @param {number} [limit]
-             * @param {string} [after]
+             * @param {number} limit
+             * @param {string} after
              * @return {Promise<ITransaction[]>}
              */
-            @decorators.cachable(1)
             list(limit = 1000, after) {
-                return ds.api.transactions.list(user.address, limit, after)
-                    .then(list => list.map(this._pipeTransaction()));
+                return this._list(limit, after, user.address);
             }
 
             /**
              * @return {Promise<ITransaction[]>}
              */
-            @decorators.cachable(120)
             getActiveLeasingTx() {
-                return ds.fetch(`${this.node}/leasing/active/${user.address}`)
-                    .then(R.uniqBy(R.prop('id')))
-                    .then(R.map(item => ({ ...item, status: 'active' })))
-                    .then(list => ds.api.transactions.parseTx(list, false))
-                    .then(list => list.map(this._pipeTransaction()));
+                return this._getActiveLeasingTx(user.address);
             }
 
+            /**
+             * @param {string} address
+             * @return {Promise<ITransaction[]>}
+             */
+
             /**
              * Get transactions list by user from utx
              * @return {Promise<ITransaction[]>}
@@ -137,6 +135,29 @@
                 return this._pipeTransaction(false)(tx);
             }
 
+            @decorators.cachable(120)
+            _getActiveLeasingTx(address) {
+                return ds.fetch(`${this.node}/leasing/active/${address}`)
+                    .then(R.uniqBy(R.prop('id')))
+                    .then(R.map(item => ({ ...item, status: 'active' })))
+                    .then(list => ds.api.transactions.parseTx(list, false))
+                    .then(list => list.map(this._pipeTransaction()));
+            }
+
+            /**
+             * @private
+             * Get transactions list by user
+             * @param {number} [limit]
+             * @param {string} [after]
+             * @param {string} [address]
+             * @return {Promise<ITransaction[]>}
+             */
+            @decorators.cachable(1)
+            _list(limit, after, address) {
+                return ds.api.transactions.list(address, limit, after)
+                    .then(list => list.map(this._pipeTransaction()));
+            }
+
             /**
              * @return {function(*=)}
              * @private

src/modules/ui/directives/footer/Footer.js

@@ -1,6 +1,8 @@
 (function () {
     'use strict';
 
+    const analytics = require('@waves/event-sender');
+
     const controller = function (Base, $scope, $element, utils, storage) {
 
         class FooterCtrl extends Base {
@@ -48,6 +50,12 @@
 
                 storage.load(this._toasterMobilesStorageKey).then(wasHidden => {
                     this.isToasterMobilesVisible = !wasHidden;
+                    if (!wasHidden) {
+                        analytics.send({
+                            name: 'Download Mobile Display',
+                            target: 'all'
+                        });
+                    }
                     utils.safeApply($scope);
                 });
             }
@@ -56,8 +64,11 @@
              * @public
              */
             hideToaster() {
+                analytics.send({
+                    name: 'Download Mobile Close',
+                    target: 'all'
+                });
                 $element.find('.toaster-mobiles').addClass('hidden-toaster');
-
                 storage.save(this._toasterMobilesStorageKey, true);
             }
 

src/modules/ui/directives/footer/footer.html

@@ -2,11 +2,13 @@
     <section>
         <div class="section-wrapper">
             <div class="footer-left">
-                <a class="logo logo-footer margin-2" href="https://wavesplatform.com" target="_blank" rel="noopener noreferrer"></a>
+                <a class="logo logo-footer margin-2" href="https://wavesplatform.com" target="_blank"
+                   rel="noopener noreferrer"></a>
                 <div class="margin-2" w-i18n="welcome.broughtBy"></div>
                 <div class="margin-1" w-i18n="welcome.copyright"></div>
                 <div class="margin-2">
-                    <a class="footer__link" w-i18n="welcome.mailto" target="_blank" rel="noopener noreferrer" href="https://support.wavesplatform.com"></a>
+                    <a class="footer__link" w-i18n="welcome.mailto" target="_blank" rel="noopener noreferrer"
+                       href="https://support.wavesplatform.com"></a>
                 </div>
                 <w-change-language></w-change-language>
             </div>
@@ -19,7 +21,7 @@
                             class="footer__link" target="_blank" rel="noopener noreferrer"
                             href="https://wavesplatform.com/products-wallet"></a></div>
                     <div><a w-analytics event="'Footer Keeper Click'"
-                                w-i18n="welcome.wavesKeeper"
+                            w-i18n="welcome.wavesKeeper"
                             event-target="'ui'"
                             class="footer__link" target="_blank" rel="noopener noreferrer"
                             href="https://wavesplatform.com/products-keeper"></a></div>
@@ -73,28 +75,37 @@
                     <div class="footer-title basic-700" w-i18n="welcome.legal"></div>
                     <div><a w-analytics event="'Footer Privacy Policy Click'"
                             event-target="'ui'"
-                            class="footer__link" w-i18n="welcome.privacyPolicy" target="_blank" rel="noopener noreferrer" href="https://wavesplatform.com/files/docs/Privacy%20Policy_SW.pdf"></a></div>
+                            class="footer__link" w-i18n="welcome.privacyPolicy" target="_blank"
+                            rel="noopener noreferrer"
+                            href="https://wavesplatform.com/files/docs/Privacy%20Policy_SW.pdf"></a></div>
                     <div><a w-analytics event="'Footer Terms of use Click'"
-                             event-target="'ui'"class="footer__link" w-i18n="welcome.termsOfUse" target="_blank" rel="noopener noreferrer" href="https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf"></a></div>
+                            event-target="'ui'" class="footer__link" w-i18n="welcome.termsOfUse" target="_blank"
+                            rel="noopener noreferrer"
+                            href="https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf"></a></div>
                 </div>
 
                 <div>
                     <div class="footer-title basic-700" w-i18n="welcome.social"></div>
                     <div><a w-analytics event="'Footer Blog Click'"
-                            class="footer__link" w-i18n="welcome.blog" target="_blank" rel="noopener noreferrer" href="https://blog.wavesplatform.com/"></a></div>
+                            class="footer__link" w-i18n="welcome.blog" target="_blank" rel="noopener noreferrer"
+                            href="https://blog.wavesplatform.com/"></a></div>
                     <div><a w-analytics event="'Footer Twitter Click'"
-                            class="footer__link" w-i18n="welcome.twitter" target="_blank" rel="noopener noreferrer" href="https://twitter.com/Waves_DEX"></a></div>
+                            class="footer__link" w-i18n="welcome.twitter" target="_blank" rel="noopener noreferrer"
+                            href="https://twitter.com/Waves_DEX"></a></div>
                     <div><a w-analytics event="'Footer Telegram Click'" event-params='{Language: $ctrl.lang}'
-                            class="footer__link" w-i18n="welcome.telegram" target="_blank" rel="noopener noreferrer" href="{{::$ctrl.telegramLink}}"></a></div>
+                            class="footer__link" w-i18n="welcome.telegram" target="_blank" rel="noopener noreferrer"
+                            href="{{::$ctrl.telegramLink}}"></a></div>
                     <div><a w-analytics event="'Footer Forum Click'"
-                            class="footer__link" w-i18n="welcome.forum" target="_blank" rel="noopener noreferrer" href="https://forum.wavesplatform.com"></a></div>
+                            class="footer__link" w-i18n="welcome.forum" target="_blank" rel="noopener noreferrer"
+                            href="https://forum.wavesplatform.com"></a></div>
                 </div>
             </div>
         </div>
     </section>
     <w-web-only>
         <div class="toaster-mobiles" ng-if="::$ctrl.isToasterMobilesVisible">
-            <a href="{{::$ctrl.mobileAppLink}}" class="toaster-mobiles__link">
+            <a w-analytics event="::'Download Mobile Client Click'" event-target="::'all'"
+               href="{{::$ctrl.mobileAppLink}}" class="toaster-mobiles__link">
                 <div class="toaster-mobiles__mobile-app-logo"></div>
                 <div class="toaster-mobiles__text-wrapper">
                     <div class="toaster-mobiles__title" w-i18n="welcome.downloadMobileApp"></div>

src/modules/ui/directives/footer/footer.less

@@ -123,12 +123,6 @@
   }
 }
 
-body.welcome {
-  .toaster-mobiles {
-    display: none;
-  }
-}
-
 @media screen and (max-width: 1174px) {
   .footer {
     .section-wrapper {

src/modules/utils/modals/ModalManager.js

@@ -10,9 +10,11 @@
      * @param {$injector} $injector
      * @param {State} state
      * @param {Storage} storage
+     * @param {User} user
      * @return {ModalManager}
      */
-    const factory = function ($mdDialog, utils, decorators, $templateRequest, $rootScope, $injector, state, storage) {
+    const factory = function ($mdDialog, utils, decorators, $templateRequest, $rootScope, $injector, state, storage,
+                              user) {
 
         const tsUtils = require('ts-utils');
         const ds = require('data-service');
@@ -50,13 +52,8 @@
                  */
                 this._counter = 0;
 
-                state.signals.changeRouterStateStart.on(() => {
-                    const counter = this._counter;
-
-                    for (let i = 0; i < counter; i++) {
-                        $mdDialog.cancel();
-                    }
-                });
+                state.signals.changeRouterStateStart.on(this.closeModals, this);
+                user.logoutSignal.on(this.closeModals, this);
             }
 
             showScriptModal() {
@@ -544,6 +541,14 @@
                 return this._getModal(tsUtils.merge({}, DEFAULT_OPTIONS, options));
             }
 
+            closeModals() {
+                const counter = this._counter;
+
+                for (let i = 0; i < counter; i++) {
+                    $mdDialog.cancel();
+                }
+            }
+
             /**
              * @return {User}
              * @private
@@ -782,7 +787,8 @@
         '$rootScope',
         '$injector',
         'state',
-        'storage'];
+        'storage',
+        'user'];
 
     angular.module('app.utils')
         .factory('modalManager', factory);

src/modules/utils/modals/importAccounts/ImportAccountsCtrl.js

@@ -14,7 +14,7 @@
     const controller = function (Base, $scope, utils, user, storage, $state, $mdDialog) {
 
         const { find, propEq, uniqBy, filter, pipe, prop } = require('ramda');
-        const { utils: generatorUtils } = require('@waves/signature-generator');
+        const { isValidAddress } = require('@waves/signature-adapter');
 
         const OLD_ORIGIN = 'https://client.wavesplatform.com';
 
@@ -73,7 +73,8 @@
                     .catch(() => [])
                     .then(list => {
                         this.pending = false;
-                        const filteredList = list.filter(user => generatorUtils.crypto.isValidAddress(user.address));
+                        const networkByte = WavesApp.network.code.charCodeAt(0);
+                        const filteredList = list.filter(user => isValidAddress(user.address, networkByte));
                         this._addAccountList(filteredList);
                     });
             }