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

allow user to cancel a transaction when using the slide to pay component

Browse source
This commit is contained in:
Marty Alcala 2016-10-10 14:33:55 -04:00
commit 34566e13a7
3 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -297,13 +297,19 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if (!spendingPassEnabled && !touchIdEnabled) {
if (isCordova && bigAmount) {
popupService.showConfirm(null, message, okText, cancelText, function(ok) {
if (!ok) return;
if (!ok) {
$scope.sendStatus = '';
return;
}
publishAndSign(wallet, txp, onSendStatusChange);
});
}
else {
popupService.showConfirm(null, message, okText, cancelText, function(ok) {
if (!ok) return;
if (!ok) {
$scope.sendStatus = '';
return;
}
publishAndSign(wallet, txp, onSendStatusChange);
});
}

20
src/js/directives/slideToAccept.js
View file

@ -33,9 +33,13 @@ angular.module('copayApp.directives')
scope.displaySendStatus = '';
scope.$watch('sendStatus', function() {
if(scope.sendStatus === 'success') {
scope.displaySendStatus = '';
if(!scope.sendStatus) {
reset();
} else if(scope.sendStatus === 'success') {
scope.displaySendStatus = '';
$timeout(function() {
reset();
}, 500);
} else {
scope.displaySendStatus = scope.sendStatus;
}
@ -79,13 +83,11 @@ angular.module('copayApp.directives')
}
function reset() {
$timeout(function() {
scope.isSlidFully = false;
isSliding = false;
setNewSliderStyle(getKnobWidthPercentage());
setNewBitcoinStyle(0);
setNewTextStyle(0);
}, 500);
scope.isSlidFully = false;
isSliding = false;
setNewSliderStyle(getKnobWidthPercentage());
setNewBitcoinStyle(0);
setNewTextStyle(0);
}
function setNewSliderStyle(pct) {

2
src/sass/views/includes/slideToAccept.scss
View file

@ -93,9 +93,9 @@ slide-to-accept {
text-transform: capitalize;
transform: translateY(2rem);
opacity: 0;
transition: transform 250ms ease, opacity 250ms ease;
&.enter {
transition: transform 250ms ease, opacity 250ms ease;
transform: translateY(0);
opacity: 1;
}