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

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

Ref/confirm 02
This commit is contained in:
Matias Alejo Garcia 2017-06-22 18:37:35 +02:00 committed by GitHub
parent d7867597de ba138059ce
commit 4fa6406185
2 changed files with 1 additions and 10 deletions
Show Stats 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 unitDecimals = walletConfig.settings.unitDecimals;
var satToUnit = 1 / unitToSatoshi;
var touchIdEnabled = config.touchIdFor && config.touchIdFor[wallet.id];
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() {});
};
$scope.$on('accepted', function(event) {
$scope.approve();
});
$scope.onWalletSelect = function(wallet) {
setWallet(wallet, tx);
};
@ -536,10 +531,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.statusChangeHandler = statusChangeHandler;
$scope.onConfirm = function() {
$scope.approve(statusChangeHandler);
};
$scope.onSuccessConfirm = function() {
$scope.sendStatus = '';
$ionicHistory.nextViewOptions({

2
www/views/confirm.html
View File

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