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

Merge pull request #147 from gabrielbazan7/feat/reqSend

Browse source 
requeriments to send and replace slider for button on desktop
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-21 14:20:14 -03:00 • committed by GitHub
commit 501c5af7d1
8 changed files with 123 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
throw ('bad params');
}
$scope.isCordova = platformInfo.isCordova;
$scope.hideSlider = false;
$scope.data = {};
var config = configService.getSync().wallet;
@ -78,7 +77,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
};
$scope.$on('accepted', function(event) {
$scope.hideSlider = true;
$scope.approve();
});
@ -268,16 +266,46 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$state.go('tabs.home');
});
}
ongoingProcess.set('creatingTx', true);
createTx(wallet, false, function(err, txp) {
ongoingProcess.set('creatingTx', false);
if (err) return;
walletService.publishAndSign(wallet, txp, function(err, txp) {
if (err) return setSendError(err);
$ionicHistory.clearHistory();
$state.go('tabs.home');
var config = configService.getSync();
var spendingPassEnabled = walletService.isEncrypted(wallet);
var touchIdEnabled = config.touchIdFor && !config.touchIdFor[wallet.id];
var isCordova = $scope.isCordova;
var bigAmount = parseFloat(txFormatService.formatToUSD(txp.amount)) > 20;
var message = gettextCatalog.getString('Sending {{fee}} from your {{name}} wallet', {
fee: $scope.fee,
name: wallet.name
});
var okText = gettextCatalog.getString('Confirm');
var cancelText = gettextCatalog.getString('Cancel');
if (!spendingPassEnabled && !touchIdEnabled) {
if (isCordova && bigAmount) {
popupService.showConfirm(null, message, okText, cancelText, function(ok) {
if (!ok) return;
publishAndSign(wallet, txp);
});
}
else {
popupService.showConfirm(null, message, okText, cancelText, function(ok) {
if (!ok) return;
publishAndSign(wallet, txp);
});
}
}
else publishAndSign(wallet, txp);
});
};
function publishAndSign(wallet, txp) {
walletService.publishAndSign(wallet, txp, function(err, txp) {
if (err) return setSendError(err);
$ionicHistory.clearHistory();
$state.go('tabs.home');
});
};

3
src/js/controllers/modals/txpDetails.js
View file

@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
$scope.init = function() {
$scope.loading = null;
$scope.hideSlider = false;
$scope.isCordova = platformInfo.isCordova;
$scope.copayerId = $scope.wallet.credentials.copayerId;
$scope.isShared = $scope.wallet.credentials.n > 1;
$scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal();
@ -50,7 +50,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
};
$scope.$on('accepted', function(event) {
$scope.hideSlider = true;
$scope.sign();
});