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

Update balance of wallets

Browse source
This commit is contained in:
Matias Pando 2014-11-05 16:37:25 -03:00
commit 0c9b36032b
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/controllers/homeWallet.js
View file

@ -2,13 +2,9 @@
angular.module('copayApp.controllers').controller('HomeWalletController',
function($scope, $rootScope, $timeout, $modal, controllerUtils) {
controllerUtils.redirIfNotComplete();
$rootScope.title = 'Home';
if ($rootScope.addrInfos) {
$scope.address = $rootScope.addrInfos[0];
}
}
);

14
js/controllers/paymentIntent.js
View file

@ -11,9 +11,11 @@ angular.module('copayApp.controllers').controller('PaymentIntentController', fun
var w = $rootScope.iden.getWalletById(wid);
if (w && w.isReady()) {
$scope.wallets.push(w);
controllerUtils.clearBalanceCache(w);
controllerUtils.updateBalance(w, function() {
$rootScope.$digest();
});
}
});
@ -28,9 +30,9 @@ angular.module('copayApp.controllers').controller('PaymentIntentController', fun
}
});
modalInstance.result.then(function(selectedItem) {}, function() {
$rootScope.pendingPayment = null;
});
// modalInstance.result.then(function(selectedItem) {}, function() {
// $rootScope.pendingPayment = null;
// });
};
@ -38,16 +40,16 @@ angular.module('copayApp.controllers').controller('PaymentIntentController', fun
// It is not the same as the $modal service used above.
var ModalInstanceCtrl = function($scope, $modalInstance, items, controllerUtils) {
$scope.wallets = items;
$scope.ok = function(selectedItem) {
controllerUtils.setPaymentWallet(selectedItem);
$modalInstance.close();
};
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
$rootScope.pendingPayment = null;
controllerUtils.setFocusedWallet($scope.wallets[0]);
$modalInstance.close();
};
};

6
views/homeWallet.html
View file

@ -37,15 +37,15 @@
<div class="panel oh">
<h2 class="line-b" translate>Quick receive</h2>
<div class="text-center">
<qrcode size="220" data="bitcoin:{{address.addressStr}}"></qrcode>
<qrcode size="220" data="bitcoin:{{$root.addrInfos[0].addressStr}}"></qrcode>
<div class="m10t">
<h4 class="size-12">{{address.addressStr}} <span class="btn-copy" clip-copy="address.addressStr"></span></h4>
<h4 class="size-12">{{$root.addrInfos[0].addressStr}} <span class="btn-copy" clip-copy="$root.addrInfos[0].addressStr"></span></h4>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<div class="small-10 columns small-centered">
<button class="m15t button secondary hide-for-large-up" ng-show="isMobile" ng-click="mobileCopy(address.addressStr)">
<button class="m15t button secondary hide-for-large-up" ng-show="isMobile" ng-click="mobileCopy($root.addrInfos[0].addressStr)">
<i class="fi-link">&nbsp;</i> <span translate>Copy to clipboard</span>
</button>
</div>