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

Fix update txp modals after sign, reject or broadcast

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-16 12:14:23 -03:00
commit 3e5f7d0a7b
2 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,8 +19,8 @@
</li> </li>
<li class="line-b p10"> <li class="line-b p10">
<span class="text-gray">Amount:</span> <span class="text-gray">Amount:</span>
<span class="right">{{tx.amountStr}} <span class="right">{{amountStr}}
<span class="label gray radius">{{tx.alternativeAmountStr}}</span> <span class="label gray radius">{{alternativeAmountStr}}</span>
</span> </span>
</li> </li>
<li class="line-b p10"> <li class="line-b p10">
@ -122,21 +122,13 @@
</div> </div>
</div> </div>
<div ng-show="!hideTxInfo"> <div class="text-center" ng-show="tx.status != 'pending'">
<div class="row collapse m10t" <div class="text-success m10t"
ng-show="tx.status=='accepted' && !txBroadcasted && !txRejected"> ng-show="tx.status=='accepted'" translate>
<button class="primary expand" Transaction sent!
ng-click="broadcast(tx)"
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
<span translate>Broadcast Transaction</span>
</button>
</div>
<div class="text-success m10t oh"
ng-show="txBroadcasted">
<span translate>Transaction sent!</span>
</div> </div>
<div class="text-center text-warning" <div class="text-center text-warning"
ng-show="txRejected" translate> ng-show="tx.status=='rejected'" translate>
Transaction finally rejected Transaction finally rejected
</div> </div>
</div> </div>

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

@ -27,6 +27,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var ModalInstanceCtrl = function($scope, $modalInstance) { var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.error = null; $scope.error = null;
$scope.tx = tx; $scope.tx = tx;
$scope.amountStr = tx.amountStr;
$scope.alternativeAmountStr = tx.alternativeAmountStr;
$scope.copayers = copayers $scope.copayers = copayers
$scope.loading = null; $scope.loading = null;
$scope.color = fc.backgroundColor; $scope.color = fc.backgroundColor;
@ -191,7 +193,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}; };
$scope.cancel = function() { $scope.cancel = function() {
$modalInstance.dismiss('cancel'); $modalInstance.close();
}; };
}; };