Permalink
Browse files

fix(portfolio): reissue button was always enabled

  • Loading branch information...
1 parent 6080f2a commit 79acf4c46455eb5a1aa08eec266133bbb889aa16 @beregovoy68 beregovoy68 committed Nov 23, 2016
Showing with 5 additions and 3 deletions.
  1. +1 −1 src/index.html
  2. +4 −2 src/js/portfolio/asset.list.controller.js
View
@@ -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>
@@ -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;

0 comments on commit 79acf4c

Please sign in to comment.