BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3079 from cmgustavo/feat/spend-unconfirm-01 

Display if has unconfirmed inputs
This commit is contained in:
Matias Alejo Garcia 2015-08-12 15:49:36 -03:00
parent e0fc92c964 42cd5ba3e0
commit 778fce1688
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -17,7 +17,7 @@
"ng-lodash": "~0.2.0",
"angular-moment": "~0.10.1",
"moment": "~2.10.3",
"angular-bitcore-wallet-client": "^0.1.1",
"angular-bitcore-wallet-client": "^0.1.2",
"angular-ui-router": "~0.2.13",
"qrcode-decoder-js": "*",
"fastclick": "*",

9
public/views/modals/txp-details.html
View File

@ -29,11 +29,7 @@
<li class="line-b p10">
<span class="text-gray" translate>Fee</span>:
<span class="right">{{feeStr}}</span>
</li>
<li class="line-b p10">
<span class="text-gray" translate>Uses unconfirmed funds</span>:
<span class="right">{{(tx.excludeUnconfirmedUtxos ? 'No' : 'Yes')|translate}}</span>
</li>
</li>
<li class="line-b p10">
<span class="text-gray" translate>Time</span>:
<span class="right">
@ -45,6 +41,9 @@
<span class="right">{{tx.creatorName}}</span>
</li>
</ul>
<div class="p10 text-center size-12" ng-show="!currentSpendUnconfirmed && tx.hasUnconfirmedInputs">
<span class="text-warning" translate>Warning: this transaction has unconfirmed inputs</span>
</div>
<div ng-if="tx.paypro">
<h4 class="title m0" translate>Payment details</h4>
<ul class="no-bullet size-14 m0">

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

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