Client 1810 delete spam

src/modules/app/services/DefaultSettings.js

@@ -31,6 +31,7 @@
                     lastOpenVersion: '',
                     whatsNewList: [],
                     closedNotification: [],
+                    dontShowSpam: true,
                     withScam: false,
                     scamListUrl: WavesApp.network.scamListUrl,
                     logoutAfterMin: 5,

src/modules/app/services/User.js

@@ -2,6 +2,8 @@
 (function () {
     'use strict';
 
+    const { equals } = require('ramda');
+
     /* global
         Mousetrap
      */
@@ -11,6 +13,7 @@
         'extraFee',
         'networkError',
         'changeScript',
+        'setScamSignal',
         'scam'
     ];
 
@@ -104,6 +107,10 @@
              * @type {Signal<void>}
              */
             changeScript = new tsUtils.Signal();
+            /**
+             * @type {Signal<void>}
+             */
+            setScamSignal = new tsUtils.Signal();
             /**
              * @type {Record<string, boolean>}
              */
@@ -174,7 +181,16 @@
                     setTimeout(() => {
                         this._scriptInfoPoll = new Poll(() => this.updateScriptAccountData(), () => null, 10000);
                     }, 30000);
+
                 });
+
+            }
+
+            setScam(hash) {
+                if (!equals(hash, this.scam)) {
+                    this.scam = hash;
+                    this.setScamSignal.dispatch();
+                }
             }
 
             /**
@@ -341,7 +357,8 @@
                         hasBackup,
                         lng: i18next.language,
                         theme: themes.getDefaultTheme(),
-                        candle: 'blue'
+                        candle: 'blue',
+                        dontShowSpam: true
                     }
                 }).then(() => {
                     if (restore) {

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

@@ -3,7 +3,6 @@
     'use strict';
 
     const entities = require('@waves/data-entities');
-    const { equals } = require('ramda');
 
     /**
      * @param {BaseNodeComponent} BaseNodeComponent
@@ -21,9 +20,10 @@
             constructor() {
                 super();
                 user.onLogin().then(() => {
-
-                    if (!user.getSetting('withScam')) {
+                    if (user.getSetting('scamListUrl')) {
                         this.stopScam();
+                    } else {
+                        this.giveMyScamBack();
                     }
                 });
             }
@@ -133,9 +133,9 @@
             }
 
             stopScam() {
-                if (this._pollScam) {
-                    return null;
-                }
+                // if (this._pollScam) {
+                //     return null;
+                // }
                 /**
                  * @type {Poll}
                  * @private
@@ -158,17 +158,16 @@
                             }
                         });
                         return hash;
-                    });
+                    })
+                    .catch(() => Object.create(null));
             }
 
             /**
              * @param hash
              * @private
              */
             _setScamAssetList(hash) {
-                if (!equals(hash, user.scam)) {
-                    user.scam = hash;
-                }
+                user.setScam(hash);
             }
 
             /**

src/modules/ui/directives/actions/actions.less

@@ -57,6 +57,10 @@ w-actions {
         height: 4px;
         border-radius: 100%;
         background-color: @color-basic-500;
+
+        .spam & {
+          background-color: @color-basic-200;
+        }
       }
     }
 

src/modules/ui/directives/transaction/Transaction.js

@@ -8,16 +8,26 @@
      * @param {INotification} notification
      * @param {Waves} waves
      * @param {User} user
+     * @param {$rootScope.Scope} $scope
      * @return {Transaction}
      */
     const controller = function (Base, $filter, modalManager, notification,
-                                 waves, user) {
+                                 waves, user, $scope) {
 
         const { SIGN_TYPE } = require('@waves/signature-adapter');
         class Transaction extends Base {
 
             $postLink() {
                 this.typeName = this.transaction.typeName;
+                this.setScam();
+
+                this.receive(user.setScamSignal, () => {
+                    this.setScam();
+                    $scope.$apply();
+                });
+            }
+
+            setScam() {
                 this.isScam = !!user.scam[this.transaction.assetId];
                 if (this.transaction.type === 7) {
                     const isScamAmount = !!user.scam[this.transaction.amount.asset];
@@ -115,7 +125,8 @@
         'modalManager',
         'notification',
         'waves',
-        'user'
+        'user',
+        '$scope'
     ];
 
     angular.module('app.ui')

src/modules/ui/directives/transaction/TransactionInfoRow.js

@@ -18,6 +18,7 @@
                     isScam: this.isScam
                 };
 
+                // TODO: delete setTimeout
                 setTimeout(() => {
                     this.props.isScam = this.isScam;
                 }, 0);

src/modules/ui/directives/transaction/types/mass-transfer/MassTransfer.js

@@ -26,6 +26,11 @@
                     this.isScam = this.props.isScam;
                 }, 0);
 
+                // TODO: delete setTimeout
+                setTimeout(() => {
+                    this.isScam = this.props.isScam;
+                }, 0);
+
                 const TYPES = waves.node.transactions.TYPES;
 
                 switch (this.typeName) {

src/modules/ui/directives/transactionList/TransactionList.js

@@ -27,8 +27,16 @@
                  * @type {boolean}
                  */
                 this.pending = false;
+                /**
+                 * @type {boolean}
+                 */
+                this.dontShowSpam = user.getSetting('dontShowSpam');
+
+                this.syncSettings({
+                    dontShowSpam: 'dontShowSpam'
+                });
 
-                this.observe('_transactions', this._onChangeTransactions);
+                this.observe(['_transactions', 'dontShowSpam'], this._onChangeTransactions);
             }
 
             $postLink() {
@@ -39,7 +47,11 @@
              * @private
              */
             _onChangeTransactions() {
-                const transactions = (this._transactions || []);
+                let transactions = (this._transactions || []);
+                if (this.dontShowSpam) {
+                    transactions = transactions.filter(this._filterSpam);
+                }
+
                 const hash = Object.create(null);
                 const toDate = tsUtils.date('DD.MM.YYYY');
 
@@ -61,6 +73,16 @@
                 }));
             }
 
+            _filterSpam(transaction) {
+                const isScam = !!user.scam[transaction.assetId];
+                let isScamAmount, isScamPrice;
+                if (transaction.type === 7) {
+                    isScamAmount = !!user.scam[transaction.amount.asset];
+                    isScamPrice = !!user.scam[transaction.price.asset];
+                }
+                return !(isScam || isScamAmount || isScamPrice);
+            }
+
         }
 
         return new TransactionList();

src/modules/utils/modals/pinAsset/PinAssetCtrl.js

@@ -32,6 +32,10 @@ const R = require('ramda');
                  * @type {boolean}
                  */
                 this.withScam = null;
+                /**
+                 * @type {boolean}
+                 */
+                this.dontShowSpam = null;
                 /**
                  * @type {Array<Asset>}
                  */
@@ -52,7 +56,8 @@ const R = require('ramda');
                 this.syncSettings({
                     pinnedAssetIdList: 'pinnedAssetIdList',
                     spam: 'wallet.portfolio.spam',
-                    withScam: 'withScam'
+                    withScam: 'withScam',
+                    dontShowSpam: 'dontShowSpam'
                 });
 
                 this.observe('search', this._fillList);

src/modules/utils/modals/settings/SettingsCtrl.js

@@ -61,7 +61,7 @@
             matcher = '';
             api = '';
             scamListUrl = '';
-            withScam = false;
+            dontShowSpam = true;
             theme = user.getSetting('theme');
             candle = user.getSetting('candle');
             templatePromise = $templateRequest('modules/utils/modals/settings/loader.html');
@@ -100,10 +100,11 @@
                     api: 'network.api',
                     logoutAfterMin: 'logoutAfterMin',
                     scamListUrl: 'scamListUrl',
-                    withScam: 'withScam',
+                    dontShowSpam: 'dontShowSpam',
                     theme: 'theme',
                     candle: 'candle',
                     oracleWaves: 'oracleWaves'
+
                 });
 
                 this.assetsOracleTmp = this.oracleWaves;
@@ -158,13 +159,16 @@
                 //     user.changeCandle(this.candle);
                 // });
 
-                this.observe('withScam', () => {
-                    const withScam = this.withScam;
-                    if (withScam) {
-                        waves.node.assets.giveMyScamBack();
-                    } else {
-                        waves.node.assets.stopScam();
-                    }
+                this.observe('dontShowSpam', () => {
+                    const dontShowSpam = this.dontShowSpam;
+                    user.setSetting('dontShowSpam', dontShowSpam);
+                });
+
+                this.observe('scamListUrl', () => {
+                    ds.config.setConfig({
+                        scamListUrl: this.scamListUrl
+                    });
+                    waves.node.assets.stopScam();
                 });
 
                 this.observe(['node', 'matcher', 'api'], () => {
@@ -216,7 +220,7 @@
             setNetworkDefault() {
                 this.node = WavesApp.network.node;
                 this.matcher = WavesApp.network.matcher;
-                this.withScam = false;
+                this.dontShowSpam = true;
                 this.scamListUrl = WavesApp.network.scamListUrl;
                 this.oracleWaves = WavesApp.oracles.waves;
                 this.api = WavesApp.network.api;

src/modules/utils/modals/settings/settings.html

@@ -275,14 +275,15 @@
                         <w-input ng-model="$ctrl.scamListUrl"></w-input>
                         <w-help-icon class="info">
                             <div class="help-icon__row headline-3" w-i18n="modal.settings.network.spamListHelp"></div>
+                            <div class="help-icon__row" w-i18n="modal.settings.network.forDisableClear"></div>
                         </w-help-icon>
                     </div>
                 </div>
 
                 <div class="margin-3 margin-top-2">
                     <div class="row flex-row row-style unit-checkbox">
-                        <w-checkbox-submit id="spamFilterToggle" ng-model="$ctrl.withScam"></w-checkbox-submit>
-                        <label for="spamFilterToggle" w-i18n="modal.settings.network.spamFilterInputDescr"></label>
+                        <w-checkbox-submit id="spamFilterToggle" ng-model="$ctrl.dontShowSpam"></w-checkbox-submit>
+                        <label for="spamFilterToggle" w-i18n="modal.settings.network.dontShowSpamCheckboxDescr"></label>
                     </div>
                 </div>
 

src/modules/wallet/modules/portfolio/controllers/PortfolioCtrl.js

@@ -81,6 +81,10 @@
                  * @type {boolean}
                  */
                 this.pending = true;
+                /**
+                 * @type {boolean}
+                 */
+                this.dontShowSpam = user.getSetting('dontShowSpam');
 
                 waves.node.assets.getAsset(this.mirrorId)
                     .then((mirror) => {
@@ -132,7 +136,8 @@
                 this.syncSettings({
                     pinned: 'pinnedAssetIdList',
                     spam: 'wallet.portfolio.spam',
-                    filter: 'wallet.portfolio.filter'
+                    filter: 'wallet.portfolio.filter',
+                    dontShowSpam: 'dontShowSpam'
                 });
 
                 balanceWatcher.ready
@@ -144,7 +149,7 @@
 
                         this.receive(balanceWatcher.change, onChange);
                         this.receive(utils.observe(user, 'scam'), onChange);
-                        this.observe(['pinned', 'spam'], onChange);
+                        this.observe(['pinned', 'spam', 'dontShowSpam'], onChange);
 
                         this._updateBalances();
                     });
@@ -310,16 +315,24 @@
                     })
                     .reduce((acc, item) => {
                         const oracleData = ds.dataManager.getOraclesAssetData(item.asset.id);
+                        const spam = item.isOnScamList || item.isSpam;
 
-                        if (item.asset.sender === user.address) {
-                            acc.my.push(item);
-                        }
                         if (oracleData && oracleData.status > 0) {
                             acc.verified.push(item);
                         }
-                        if (item.isOnScamList || item.isSpam) {
-                            acc.spam.push(item);
+
+                        if (spam) {
+                            if (!this.dontShowSpam) {
+                                if (item.asset.sender === user.address) {
+                                    acc.my.push(item);
+                                }
+                                acc.spam.push(item);
+                                acc.active.push(item);
+                            }
                         } else {
+                            if (item.asset.sender === user.address) {
+                                acc.my.push(item);
+                            }
                             acc.active.push(item);
                         }