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

Merge pull request #243 from cmgustavo/ref/confirm-02

Browse source 
Ref/confirm 02
This commit is contained in:
Matias Alejo Garcia 2017-06-22 18:37:35 +02:00 • committed by GitHub
commit 4fa6406185
2 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/controllers/confirm.js
View file

@ -13,7 +13,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var unitToSatoshi = walletConfig.settings.unitToSatoshi; var unitToSatoshi = walletConfig.settings.unitToSatoshi;
var unitDecimals = walletConfig.settings.unitDecimals; var unitDecimals = walletConfig.settings.unitDecimals;
var satToUnit = 1 / unitToSatoshi; var satToUnit = 1 / unitToSatoshi;
var touchIdEnabled = config.touchIdFor && config.touchIdFor[wallet.id];
var configFeeLevel = walletConfig.settings.feeLevel ? walletConfig.settings.feeLevel : 'normal'; var configFeeLevel = walletConfig.settings.feeLevel ? walletConfig.settings.feeLevel : 'normal';
@ -354,10 +353,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
popupService.showAlert(null, msg, function() {}); popupService.showAlert(null, msg, function() {});
}; };
$scope.$on('accepted', function(event) {
$scope.approve();
});
$scope.onWalletSelect = function(wallet) { $scope.onWalletSelect = function(wallet) {
setWallet(wallet, tx); setWallet(wallet, tx);
}; };
@ -536,10 +531,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.statusChangeHandler = statusChangeHandler; $scope.statusChangeHandler = statusChangeHandler;
$scope.onConfirm = function() {
$scope.approve(statusChangeHandler);
};
$scope.onSuccessConfirm = function() { $scope.onSuccessConfirm = function() {
$scope.sendStatus = ''; $scope.sendStatus = '';
$ionicHistory.nextViewOptions({ $ionicHistory.nextViewOptions({

2
www/views/confirm.html
View file

@ -107,7 +107,7 @@
</click-to-accept> </click-to-accept>
<slide-to-accept <slide-to-accept
ng-if="isCordova && wallet" ng-if="isCordova && wallet"
slide-on-confirm="onConfirm()" slide-on-confirm="approve(tx, wallet, statusChangeHandler)"
slide-send-status="sendStatus" slide-send-status="sendStatus"
is-disabled="!wallet"> is-disabled="!wallet">
{{buttonText}} {{buttonText}}