fix(portfolio): reissue button was always enabled

beregovoy68 · Nov 23, 2016 · 79acf4c · 79acf4c
1 parent 6080f2a
commit 79acf4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/index.html b/src/index.html
@@ -442,7 +442,7 @@ <h2 class="sectionHeader">PORTFOLIO</h2>
                                     <td>{{tx.balance}}</td>
                                     <td>
                                         <button ng-click="assetList.assetTransfer(tx.id)">Transfer</button><span class="divider-2"></span>
-                                        <button ng-enable="tx.formatted.canReissue" ng-click="assetList.assetReissue(tx.id)">Reissue</button><span class="divider-2"></span>
+                                        <button ng-disabled="!tx.formatted.canReissue" ng-click="assetList.assetReissue(tx.id)">Reissue</button><span class="divider-2"></span>
                                         <button ng-click="assetList.assetDetails(tx.id)">Details</button>
                                     </td>
                                 </tr>

diff --git a/src/js/portfolio/asset.list.controller.js b/src/js/portfolio/asset.list.controller.js
@@ -48,11 +48,13 @@
             }
 
             var cached = applicationContext.cache.assets[asset.id];
-            cached.balance = Money.fromCoins(asset.balance, cached.currency);
+            if (angular.isNumber(asset.balance)) {
+                cached.balance = Money.fromCoins(asset.balance, cached.currency);
+                asset.balance = cached.balance.formatAmount();
+            }
 
             asset.name = cached.currency.displayName;
             asset.total = cached.totalTokens.formatAmount();
-            asset.balance = cached.balance.formatAmount();
             asset.timestamp = formattingService.formatTimestamp(cached.timestamp);
             asset.reissuable = cached.reissuable;
             asset.sender = cached.sender;