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

fix okay button on status modal and others

Browse source
This commit is contained in:
Gabriel Bazán 2016-09-22 10:03:38 -03:00
commit a6b3b204bd
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/confirm.html
View file

@ -49,6 +49,6 @@
</div>
</div>
</ion-content>
<button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
<accept class="accept-slide" ng-if="isCordova"></accept>
<button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" ng-disabled="!fee" translate>Click to pay</button>
<accept class="accept-slide" ng-if="isCordova && fee"></accept>
</ion-view>

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

@ -162,5 +162,5 @@
</div>
</ion-content>
<button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
<accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired"></accept>
<accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && isCordova"></accept>
</ion-modal-view>

4
src/js/controllers/modals/txStatus.js
View file

@ -1,10 +1,12 @@
'use strict';
angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $log, addressbookService) {
angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $ionicHistory, $log, addressbookService) {
if ($scope.cb) $timeout($scope.cb, 100);
$scope.cancel = function() {
$ionicHistory.clearHistory();
$state.go('tabs.home');
$scope.txStatusModal.hide();
};