mirror of https://github.com/BTCPrivate/copay.git
fix confirm popup
This commit is contained in:
parent
cf5290d3e5
commit
eec846f422
|
@ -51,7 +51,7 @@
|
||||||
<i ng-show="!description" class="icon ion-ios-plus-empty size-21"></i>
|
<i ng-show="!description" class="icon ion-ios-plus-empty size-21"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<button class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" ng-disabled="!fee" translate>Click to pay</button>
|
<button class="button button-block button-positive" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
<accept class="accept-slide" ng-if="isCordova && fee"></accept>
|
<accept class="accept-slide" ng-if="isCordova"></accept>
|
||||||
</ion-view>
|
</ion-view>
|
||||||
|
|
|
@ -272,8 +272,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
var touchIdEnabled = config.touchIdFor && !config.touchIdFor[wallet.id];
|
var touchIdEnabled = config.touchIdFor && !config.touchIdFor[wallet.id];
|
||||||
var isCordova = $scope.isCordova;
|
var isCordova = $scope.isCordova;
|
||||||
var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20;
|
var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20;
|
||||||
var message = gettextCatalog.getString('Sending {{fee}} from your {{name}} wallet', {
|
var message = gettextCatalog.getString('Sending {{amountStr}} from your {{name}} wallet', {
|
||||||
fee: $scope.fee,
|
amountStr: $scope.amountStr,
|
||||||
name: wallet.name
|
name: wallet.name
|
||||||
});
|
});
|
||||||
var okText = gettextCatalog.getString('Confirm');
|
var okText = gettextCatalog.getString('Confirm');
|
||||||
|
@ -307,7 +307,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
$state.go('tabs.send');
|
$state.go('tabs.send');
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data){
|
$scope.$on("$ionicView.enter", function(event, data) {
|
||||||
initConfirm();
|
initConfirm();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue