anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Rename of callback function. Add network name.

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-11 10:59:05 -03:00
commit ea7de935d7
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/services/controllerUtils.js
View file

@ -359,12 +359,12 @@ angular.module('copayApp.services')
$rootScope.pendingTxCount = res.pendingForUs;
};
root.deleteWallet = function($scope, w, cb) {
root.deleteWallet = function($scope, w, skipBind) {
w = w || $rootScope.wallet;
var name = w.getName();
$rootScope.iden.deleteWallet(w.id, function() {
notification.info(name + ' deleted', $filter('translate')('Wallet deleted'));
if (cb) return cb();
if (skipBind) return skipBind();
$rootScope.wallet = null;
var lastFocused = $rootScope.iden.getLastFocusedWallet();
root.bindProfile($scope, $rootScope.iden, lastFocused);

9
views/manage.html
View file

@ -41,12 +41,13 @@
<tbody>
<tr
data-ng-repeat="item in wallets | orderBy:'name'"
ng-init="isReady = item.isReady(); activeWallet = $root.wallet.id"
ng-init="isReady = item.isReady();
activeWallet = $root.wallet.id; networkName = item.getNetworkName()"
ng-class="{'active':activeWallet == item.id, 'deleting':loading==item.id}">
<td>{{item.name || item.id }}</td>
<td width="70">{{item.requiredCopayers}} of {{item.totalCopayers}}</td>
<td width="220">{{isReady ? 'Complete' : 'Waiting for copayers...'}}</td>
<td width="220">
<td width="120">{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}</td>
<td width="200">{{isReady ? 'Complete' : 'Waiting for copayers...'}}</td>
<td width="200">
<span ng-if="!isReady">-</span>
<span ng-if="isReady">
{{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}}