From 2332c4ae3efe2b096f1a446d24c98490668a93b7 Mon Sep 17 00:00:00 2001
From: beregovoy68 <s.a.ishchenko@gmail.com>
Date: Mon, 5 Dec 2016 20:09:59 +0300
Subject: [PATCH] Filtered out assets with zero balance from the portfolio tab

---
 src/js/app.js                             |  3 +--
 src/js/portfolio/asset.list.controller.js | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/js/app.js b/src/js/app.js
index 138b0c26b0..192d8b36f7 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -109,12 +109,11 @@ function AngularApplicationRun(rest, applicationConstants, notificationService,
     rest.setDefaultHttpFields({
         timeout: 10000 // milliseconds
     });
-    //var url = applicationConstants.NODE_ADDRESS;
+    var url = applicationConstants.NODE_ADDRESS;
     //var url = 'http://52.28.66.217:6869';
     //var url = 'http://52.77.111.219:6869';
     //var url = 'http://127.0.0.1:6869';
     //var url = 'http://127.0.0.1:8089';
-    var url = 'http://95.85.56.190:6869';
     rest.setBaseUrl(url);
 
     // override mock methods cos in config phase services are not available yet
diff --git a/src/js/portfolio/asset.list.controller.js b/src/js/portfolio/asset.list.controller.js
index f968214898..37c2240744 100644
--- a/src/js/portfolio/asset.list.controller.js
+++ b/src/js/portfolio/asset.list.controller.js
@@ -83,20 +83,31 @@
                         name: ''
                     };
 
+                    // adding asset details to cache
                     applicationContext.cache.assets.put(assetBalance.issueTransaction);
                     applicationContext.cache.assets.update(id, assetBalance.balance,
                         assetBalance.reissuable, assetBalance.quantity);
-                    loadAssetDataFromCache(asset);
 
-                    assets.push(asset);
+                    // adding an asset with positive balance only
+                    if (assetBalance.balance !== 0) {
+                        loadAssetDataFromCache(asset);
+                        assets.push(asset);
+                    }
                 });
 
                 var delay = 1;
+                // handling the situation when some assets appeared on the account
                 if (assetList.assets.length === 0 && assets.length > 0) {
                     assetList.noData = false;
                     delay = 500; // waiting for 0.5 sec on first data loading attempt
                 }
 
+                // handling the situation when all assets were transferred from the account
+                if (assetList.assets.length > 0 && assets.length === 0) {
+                    assetList.noData = true;
+                    delay = 500;
+                }
+
                 // to prevent no data message and asset list from displaying simultaneously
                 // we need to update
                 $timeout(function() {