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

Display if has unconfirmed inputs

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-08-11 17:59:41 -03:00
commit 90bfe4aaa2
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/modals/txp-details.html
View file

@ -30,9 +30,9 @@
<span class="text-gray" translate>Fee</span>: <span class="text-gray" translate>Fee</span>:
<span class="right">{{feeStr}}</span> <span class="right">{{feeStr}}</span>
</li> </li>
<li class="line-b p10"> <li class="line-b p10" ng-show="!currentSpendUnconfirmed">
<span class="text-gray" translate>Uses unconfirmed funds</span>: <span class="text-gray" translate>Uses unconfirmed funds</span>:
<span class="right">{{(tx.excludeUnconfirmedUtxos ? 'No' : 'Yes')|translate}}</span> <span class="right">{{(tx.hasUnconfirmedInputs ? 'Yes' : 'No')|translate}}</span>
</li> </li>
<li class="line-b p10"> <li class="line-b p10">
<span class="text-gray" translate>Time</span>: <span class="text-gray" translate>Time</span>:

2
src/js/controllers/walletHome.js
View file

@ -184,6 +184,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.openTxpModal = function(tx, copayers) { this.openTxpModal = function(tx, copayers) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var refreshUntilItChanges = false; var refreshUntilItChanges = false;
var currentSpendUnconfirmed = $scope.currentSpendUnconfirmed;
var ModalInstanceCtrl = function($scope, $modalInstance) { var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.error = null; $scope.error = null;
$scope.tx = tx; $scope.tx = tx;
@ -196,6 +197,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.loading = null; $scope.loading = null;
$scope.color = fc.backgroundColor; $scope.color = fc.backgroundColor;
refreshUntilItChanges = false; refreshUntilItChanges = false;
$scope.currentSpendUnconfirmed = currentSpendUnconfirmed;
$scope.getShortNetworkName = function() { $scope.getShortNetworkName = function() {
return fc.credentials.networkName.substring(0, 4); return fc.credentials.networkName.substring(0, 4);