From 777c2efc32859461b48ff18269f8d271aada8869 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 7 Oct 2016 20:03:51 -0400 Subject: [PATCH 01/11] implement slide to pay --- Gruntfile.js | 2 + bower.json | 3 +- package.json | 1 + src/js/app.js | 1 + src/js/controllers/confirm.js | 31 ++- src/js/controllers/onboarding/tour.js | 9 +- src/js/directives/directives.js | 19 -- src/js/directives/slideToAccept.js | 249 ++++++++++++++++++ src/js/directives/slideToAcceptSuccess.js | 31 +++ src/js/routes.js | 1 + src/js/services/onGoingProcess.js | 6 +- src/js/services/walletService.js | 26 +- src/sass/views/includes/slideToAccept.scss | 126 +++++++++ .../views/includes/slideToAcceptSuccess.scss | 96 +++++++ src/sass/views/views.scss | 2 + www/img/icon-arrow-right.svg | 17 ++ www/img/icon-bitcoin-white.svg | 14 + www/img/spinner.png | Bin 0 -> 407 bytes www/views/confirm.html | 13 +- www/views/includes/acceptSlide.html | 9 - www/views/includes/slideToAccept.html | 38 +++ www/views/includes/slideToAcceptSuccess.html | 15 ++ 22 files changed, 659 insertions(+), 50 deletions(-) create mode 100644 src/js/directives/slideToAccept.js create mode 100644 src/js/directives/slideToAcceptSuccess.js create mode 100644 src/sass/views/includes/slideToAccept.scss create mode 100644 src/sass/views/includes/slideToAcceptSuccess.scss create mode 100644 www/img/icon-arrow-right.svg create mode 100644 www/img/icon-bitcoin-white.svg create mode 100644 www/img/spinner.png delete mode 100644 www/views/includes/acceptSlide.html create mode 100644 www/views/includes/slideToAccept.html create mode 100644 www/views/includes/slideToAcceptSuccess.html diff --git a/Gruntfile.js b/Gruntfile.js index 52c0f1338..b094c4edb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -128,6 +128,7 @@ module.exports = function(grunt) { 'bower_components/angular-clipboard/angular-clipboard.js', 'bower_components/angular-md5/angular-md5.js', 'bower_components/angular-mocks/angular-mocks.js', + 'bower_components/ngtouch/src/ngTouch.js', 'angular-pbkdf2/angular-pbkdf2.js', 'angular-bitcore-wallet-client/angular-bitcore-wallet-client.js' ], @@ -148,6 +149,7 @@ module.exports = function(grunt) { 'src/js/init.js', 'src/js/trezor-url.js', 'bower_components/trezor-connect/login.js', + 'node_modules/bezier-easing/dist/bezier-easing.min.js', 'node_modules/cordova-plugin-qrscanner/dist/cordova-plugin-qrscanner-lib.min.js' ], dest: 'www/js/copay.js' diff --git a/bower.json b/bower.json index ed6b9bd64..912826903 100644 --- a/bower.json +++ b/bower.json @@ -19,7 +19,8 @@ "ng-csv": "~0.3.6", "ionic-toast": "^0.4.1", "angular-clipboard": "^1.4.2", - "angular-md5": "^0.1.10" + "angular-md5": "^0.1.10", + "ngtouch": "^1.0.1" }, "resolutions": { "angular": "1.5.3" diff --git a/package.json b/package.json index 40253d2d0..e474ad514 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "adm-zip": "^0.4.7", "angular": "1.4.6", "angular-mocks": "1.4.10", + "bezier-easing": "^2.0.3", "bhttp": "^1.2.1", "bitcore-wallet-client": "4.2.1", "bower": "^1.7.9", diff --git a/src/js/app.js b/src/js/app.js index 001bf9826..91466a757 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -7,6 +7,7 @@ var modules = [ 'ionic', 'ionic-toast', 'angular-clipboard', + 'ngTouch', 'ngLodash', 'ngCsv', 'angular-md5', diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 868a45856..05fc6a322 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService) { +angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory) { var cachedTxp = {}; var isChromeApp = platformInfo.isChromeApp; @@ -273,9 +273,10 @@ angular.module('copayApp.controllers').controller('confirmController', function( if (err) return setSendError(err); }); } - ongoingProcess.set('creatingTx', true); + + ongoingProcess.set('creatingTx', true, onSendStatusChange); createTx(wallet, false, function(err, txp) { - ongoingProcess.set('creatingTx', false); + ongoingProcess.set('creatingTx', false, onSendStatusChange); if (err) return; var config = configService.getSync(); @@ -308,9 +309,29 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); }; + function onSendStatusChange(processName, showName, isOn) { + if(processName === 'broadcastingTx' && !isOn) { + $scope.sendStatus = 'success'; + $scope.$digest(); + } else if(showName) { + $scope.sendStatus = showName; + } + } + + $scope.onConfirm = function() { + $scope.approve(true); + }; + + $scope.onSuccessConfirm = function() { + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $state.go('tabs.send'); + }; + function publishAndSign(wallet, txp) { walletService.publishAndSign(wallet, txp, function(err, txp) { if (err) return setSendError(err); - }); - }; + }, onSendStatusChange); + } }); diff --git a/src/js/controllers/onboarding/tour.js b/src/js/controllers/onboarding/tour.js index aa2cdd92e..71d516145 100644 --- a/src/js/controllers/onboarding/tour.js +++ b/src/js/controllers/onboarding/tour.js @@ -44,10 +44,11 @@ angular.module('copayApp.controllers').controller('tourController', }; ongoingProcess.set('creatingWallet', false); var wallet = walletClient; - $state.go('onboarding.collectEmail', { - fromOnboarding: true, - walletId: wallet.credentials.walletId - }); + // $state.go('onboarding.collectEmail', { + // fromOnboarding: true, + // walletId: wallet.credentials.walletId + // }); + $state.go('tabs.home'); }); }; diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index e20643e9f..ecf849b10 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -162,23 +162,4 @@ angular.module('copayApp.directives') }); } } - }) - .directive('accept', function() { - return { - restrict: 'E', - templateUrl: 'views/includes/acceptSlide.html', - scope: {}, - link: function(scope, element, attrs) { - scope.$on("$ionicSlides.sliderInitialized", function(event, data) { - scope.slider = data.slider; - }); - - scope.$on("$ionicSlides.slideChangeEnd", function(event, data) { - if (data.slider.activeIndex == 0) { - scope.slider.slideNext(); - scope.$emit('accepted'); - } - }); - } - } }); diff --git a/src/js/directives/slideToAccept.js b/src/js/directives/slideToAccept.js new file mode 100644 index 000000000..f47a60d70 --- /dev/null +++ b/src/js/directives/slideToAccept.js @@ -0,0 +1,249 @@ +'use strict'; + +angular.module('copayApp.directives') + .directive('slideToAccept', function($timeout, $window, $q) { + return { + restrict: 'E', + templateUrl: 'views/includes/slideToAccept.html', + transclude: true, + scope: { + sendStatus: '=slideSendStatus', + onConfirm: '&slideOnConfirm' + }, + link: function(scope, element, attrs) { + + var KNOB_WIDTH = 71; + var MAX_SLIDE_START_PERCENTAGE = 50; + var FULLY_SLID_PERCENTAGE = 72; + var PERCENTAGE_BUMP = 5; + var JIGGLE_EASING = linear; + var JIGGLE_DURATION = 100; + var RECEDE_DURATION = 250; + var INITIAL_TAP_EASE_DURATION = 75; + + var elm = element[0]; + var isSliding = false; + var curSliderPct = getKnobWidthPercentage(); + var curBitcoinPct = 0; + var curTextPct = 0; + var currentEaseStartTime; + var bezier = $window.BezierEasing(0.175, 0.885, 0.320, 1.275); + + scope.isSlidFully = false; + scope.displaySendStatus = ''; + + scope.$watch('sendStatus', function() { + if(scope.sendStatus === 'success') { + scope.displaySendStatus = ''; + reset(); + } else { + scope.displaySendStatus = scope.sendStatus; + } + }); + + function easePosition(fromPct, pct, duration, easeFx, animateFx) { + var deferred = $q.defer(); + currentEaseStartTime = Date.now(); + var startTime = currentEaseStartTime; + var initialPct = fromPct; + var distance = pct - fromPct; + function ease() { + if(startTime !== currentEaseStartTime) { + return; + } + $window.requestAnimationFrame(function() { + var now = Date.now(); + var elapsed = now - startTime; + var normalizedElapsedTime = elapsed/duration; + var newVal = easeFx(normalizedElapsedTime); + var newPct = newVal*distance + initialPct; + animateFx(newPct); + scope.$digest(); + if(elapsed < duration) { + ease(); + } else { + deferred.resolve(); + } + }); + } + ease(); + return deferred.promise; + } + + function linear(t) { + return t; + } + + function easeInOutBack(t) { + return bezier(t); + } + + function reset() { + $timeout(function() { + scope.isSlidFully = false; + isSliding = false; + setNewSliderStyle(getKnobWidthPercentage()); + setNewBitcoinStyle(0); + setNewTextStyle(0); + }, 500); + } + + function setNewSliderStyle(pct) { + var knobWidthPct = getKnobWidthPercentage(); + var translatePct = pct - knobWidthPct; + if(isSliding) { + translatePct += 0.35*pct; + } + scope.sliderStyle = getTransformStyle(translatePct); + curSliderPct = pct; + } + + function setNewBitcoinStyle(pct) { + var translatePct = -2.25*pct; + scope.bitcoinStyle = getTransformStyle(translatePct); + curBitcoinPct = pct; + } + + function setNewTextStyle(pct) { + var translatePct = -0.1*pct; + scope.textStyle = getTransformStyle(translatePct); + curTextPct = pct; + } + + function getTransformStyle(translatePct) { + return {'transform': 'translateX(' + translatePct + '%)'}; + } + + function getKnobWidthPercentage() { + var knobWidthPct = (KNOB_WIDTH/elm.clientWidth)*100; + return knobWidthPct; + } + + function setSliderPosition(pct) { + setNewSliderStyle(pct); + setNewBitcoinStyle(pct); + setNewTextStyle(pct); + } + + function easeSliderPosition(pct) { + var duration = INITIAL_TAP_EASE_DURATION; + easePosition(curSliderPct, pct, duration, JIGGLE_EASING, function(pct) { + setNewSliderStyle(pct); + }); + easePosition(curBitcoinPct, pct, duration, JIGGLE_EASING, function(pct) { + setNewBitcoinStyle(pct); + }); + easePosition(curTextPct, pct, duration, JIGGLE_EASING, function(pct) { + setNewTextStyle(pct); + }); + } + + function jiggleSlider() { + var pct = getKnobWidthPercentage() + PERCENTAGE_BUMP; + var duration = JIGGLE_DURATION; + var p1 = easePosition(curSliderPct, pct, duration, JIGGLE_EASING, function(pct) { + setNewSliderStyle(pct); + }); + var p2 = easePosition(curBitcoinPct, pct, duration, JIGGLE_EASING, function(pct) { + setNewBitcoinStyle(pct); + }); + + $q.all([p1, p2]).then(function() { + recede(); + }); + } + + function recede() { + var duration = RECEDE_DURATION; + easePosition(curSliderPct, getKnobWidthPercentage(), duration, easeInOutBack, function(pct) { + setNewSliderStyle(pct); + }); + easePosition(curBitcoinPct, 0, duration, easeInOutBack, function(pct) { + setNewBitcoinStyle(pct); + }); + easePosition(curTextPct, 0, duration, easeInOutBack, function(pct) { + setNewTextStyle(pct); + }); + } + + function alertSlidFully() { + scope.isSlidFully = true; + scope.onConfirm(); + } + + function getTouchXPosition($event) { + var x; + if($event.touches || $event.changedTouches) { + if($event.touches.length) { + x = $event.touches[0].clientX; + } else { + x = $event.changedTouches[0].clientX; + } + } else { + x = $event.clientX; + } + return x; + } + + function getSlidPercentage($event) { + var x = getTouchXPosition($event); + var width = elm.clientWidth; + var pct = (x/width)*100; + if(x >= width) { + pct = 100; + } + return pct; + } + + scope.onTouchstart = function($event) { + if(scope.isSlidFully) { + return; + } + if(!isSliding) { + var pct = getSlidPercentage($event); + if (pct > MAX_SLIDE_START_PERCENTAGE) { + jiggleSlider(); + return; + } else { + isSliding = true; + var knobWidthPct = getKnobWidthPercentage(); + if(pct < knobWidthPct) { + pct = knobWidthPct; + } + pct += PERCENTAGE_BUMP; + easeSliderPosition(pct); + } + } + }; + + scope.onTouchmove = function($event) { + if(!isSliding || scope.isSlidFully) { + return; + } + var pct = getSlidPercentage($event); + var knobWidthPct = getKnobWidthPercentage(); + if(pct < knobWidthPct) { + pct = knobWidthPct; + } + pct += PERCENTAGE_BUMP; + currentEaseStartTime = null; + setSliderPosition(pct); + }; + + scope.onTouchend = function($event) { + if(scope.isSlidFully) { + return; + } + var pct = getSlidPercentage($event); + if(isSliding && pct > FULLY_SLID_PERCENTAGE) { + pct = 100; + setSliderPosition(pct); + alertSlidFully(); + } else { + recede(); + } + isSliding = false; + }; + } + }; + }); diff --git a/src/js/directives/slideToAcceptSuccess.js b/src/js/directives/slideToAcceptSuccess.js new file mode 100644 index 000000000..4a7312703 --- /dev/null +++ b/src/js/directives/slideToAcceptSuccess.js @@ -0,0 +1,31 @@ +'use strict'; + +angular.module('copayApp.directives') + .directive('slideToAcceptSuccess', function($timeout) { + return { + restrict: 'E', + templateUrl: 'views/includes/slideToAcceptSuccess.html', + transclude: true, + scope: { + isShown: '=slideSuccessShow', + onConfirm: '&slideSuccessOnConfirm' + }, + link: function(scope, element, attrs) { + var elm = element[0]; + elm.style.display = 'none'; + scope.$watch('isShown', function() { + if(scope.isShown) { + elm.style.display = 'flex'; + $timeout(function() { + scope.fillScreen = true; + }, 10); + } + }); + scope.onConfirmButtonClick = function() { + scope.onConfirm(); + scope.fillScreen = false; + elm.style.display = 'none'; + }; + } + }; + }); diff --git a/src/js/routes.js b/src/js/routes.js index a69f00072..183e5eab3 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -32,6 +32,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr // NAV BACK-BUTTON TEXT/ICON $ionicConfigProvider.backButton.icon('icon ion-ios-arrow-thin-left').text(''); $ionicConfigProvider.backButton.previousTitleText(false); + $ionicConfigProvider.views.swipeBackEnabled(false); $logProvider.debugEnabled(true); $provide.decorator('$log', ['$delegate', 'platformInfo', diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js index 642051951..d1bcf2fe0 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -48,7 +48,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti return ongoingProcess[processName]; }; - root.set = function(processName, isOn) { + root.set = function(processName, isOn, customHandler) { $log.debug('ongoingProcess', processName, isOn); root[processName] = isOn; ongoingProcess[processName] = isOn; @@ -64,7 +64,9 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti var showName = $filter('translate')(processNames[name] || name); - if (root.onGoingProcessName) { + if(customHandler) { + customHandler(processName, showName, isOn); + } else if (root.onGoingProcessName) { if (isCordova) { window.plugins.spinnerDialog.show(null, showName, true); } else { diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 84bfea06a..a3218b90c 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -915,7 +915,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim }); }; - root.publishAndSign = function(wallet, txp, cb) { + root.publishAndSign = function(wallet, txp, cb, customStatusHandler) { var publishFn = root.publishTx; @@ -929,12 +929,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim root.prepare(wallet, function(err, password) { if (err) return cb('Prepare error: ' + err); - ongoingProcess.set('sendingTx', true); + ongoingProcess.set('sendingTx', true, customStatusHandler); + publishFn(wallet, txp, function(err, publishedTxp) { - ongoingProcess.set('sendingTx', false); + ongoingProcess.set('sendingTx', false, customStatusHandler); if (err) return cb('Send Error: ' + err); - ongoingProcess.set('signingTx', true); + ongoingProcess.set('signingTx', true, customStatusHandler); root.signTx(wallet, publishedTxp, password, function(err, signedTxp) { ongoingProcess.set('signingTx', false); root.invalidateCache(wallet); @@ -952,22 +953,29 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim } if (signedTxp.status == 'accepted') { - ongoingProcess.set('broadcastingTx', true); + ongoingProcess.set('broadcastingTx', true, customStatusHandler); root.broadcastTx(wallet, signedTxp, function(err, broadcastedTxp) { - ongoingProcess.set('broadcastingTx', false); + ongoingProcess.set('broadcastingTx', false, customStatusHandler); if (err) return cb('sign error' + err); $rootScope.$emit('Local/TxAction', wallet.id); var type = root.getViewStatus(wallet, broadcastedTxp); - root.openStatusModal(type, broadcastedTxp, function() {}); - return cb(null, broadcastedTxp) + if(!customStatusHandler) { + root.openStatusModal(type, broadcastedTxp, function() {}); + } + + return cb(null, broadcastedTxp); }); } else { $rootScope.$emit('Local/TxAction', wallet.id); var type = root.getViewStatus(wallet, signedTxp); - root.openStatusModal(type, signedTxp, function() {}); + + if(!customStatusHandler) { + root.openStatusModal(type, signedTxp, function() {}); + } + return cb(null, signedTxp); } }); diff --git a/src/sass/views/includes/slideToAccept.scss b/src/sass/views/includes/slideToAccept.scss new file mode 100644 index 000000000..4257097b8 --- /dev/null +++ b/src/sass/views/includes/slideToAccept.scss @@ -0,0 +1,126 @@ +slide-to-accept { + $slide-bg-color: #647CE8; + $slider-bg-color: #5063B9; + $slide-text-color: #FFFFFF; + position: fixed; + bottom: 0; + height: 92px; + width: 100%; + background: $slide-bg-color; + + @mixin center-vertically { + display: flex; + align-items: center; + height: 100%; + position: absolute; + } + + .slide { + &__listener { + height: 100%; + width: 100%; + overflow: hidden; + position: relative; + } + &__slider { + @include center-vertically; + height: 100%; + width: 100%; + background: $slider-bg-color; + transform: translateX(0); + margin-left: -100%; + z-index: 2; + + &::before { + @include center-vertically; + content: ''; + width: 10000px; + left: -10000px + 1; + background: $slider-bg-color; + } + + &::after { + @include center-vertically; + content: ''; + width: 15px; + right: -10px; + background: $slider-bg-color; + } + + &__tip { + @include center-vertically; + width: 124px; + height: 116px; + background: $slider-bg-color; + right: -71px; + border-radius: 50%; + top: 50%; + transform: translateY(-47%); + } + + } + &__bitcoin { + @include center-vertically; + left: 20px; + z-index: 3; + + > img { + transform: rotateZ(-5deg); + } + } + &__button-text { + @include center-vertically; + + justify-content: center; + top: 0; + left: 0; + width: 100%; + color: $slide-text-color; + font-size: 18px; + font-weight: 600; + letter-spacing: .03rem; + z-index: 1; + } + + &__status-text { + @include center-vertically; + justify-content: center; + color: $slide-text-color; + z-index: 4; + width: 100%; + font-size: 17px; + letter-spacing: 0.02rem; + text-transform: capitalize; + transform: translateY(2rem); + opacity: 0; + transition: transform 250ms ease, opacity 250ms ease; + + &.enter { + transform: translateY(0); + opacity: 1; + } + + > img { + margin-right: 10px; + animation-name: spin; + animation-duration: 500ms; + animation-iteration-count: infinite; + animation-timing-function: linear; + } + } + + &__arrow { + @include center-vertically; + right: 20px; + } + } + + @keyframes spin { + from { + transform:rotate(0deg); + } + to { + transform:rotate(360deg); + } + } +} diff --git a/src/sass/views/includes/slideToAcceptSuccess.scss b/src/sass/views/includes/slideToAcceptSuccess.scss new file mode 100644 index 000000000..fe9b75969 --- /dev/null +++ b/src/sass/views/includes/slideToAcceptSuccess.scss @@ -0,0 +1,96 @@ +slide-to-accept-success { + $slider-bg-color: #5063B9; + $success-bg-color: #11D1A6; + height: 100%; + width: 100%; + position: fixed; + top: 0; + left: 0; + z-index: 99999; + text-align: center; + display: flex; + align-items: center; + justify-content: center; + + .slide-success { + $duration: 400ms; + &__background { + $start-radius: 5; + $scale-factor: 20; + height: 10vmax; + width: 10vmax; + background: $slider-bg-color; + bottom: 0; + position: absolute; + left: calc(50% - 5vmax); + border-radius: 50%; + transition: transform $duration*1.5 ease, background $duration*1.5 ease; + + &.fill-screen { + transform: scale3d($scale-factor, $scale-factor, 1) translateY(-40%); + background: $success-bg-color; + } + } + + &__content { + position: relative; + z-index: 1; + margin-top: -20vh; + + > img { + margin-bottom: 1.8rem; + transform: translateY(5rem); + opacity: 0; + transition: transform $duration ease, opacity $duration ease; + transition-delay: 200ms; + + &.reveal { + transform: translateY(0); + opacity: 1; + } + } + + &__header { + color: #FFFFFF; + font-size: 26px; + transform: translateY(5rem); + opacity: 0; + transition: transform $duration ease, opacity $duration ease; + transition-delay: 250ms; + + &.reveal { + transform: translateY(0); + opacity: 1; + } + } + } + + &__footer { + position: absolute; + left: 0; + bottom: 0; + padding: 0 1.75rem; + width: 100%; + transform: translateY(5rem); + opacity: 0; + transition: transform $duration ease, opacity $duration ease; + transition-delay: 250ms; + + &.reveal { + transform: translateY(0); + opacity: 1; + } + + &__btn { + display: block; + color: #FFFFFF; + font-size: 18px; + font-weight: 600; + letter-spacing: 2.86px; + padding: 1rem 0 1.1rem; + border-top: 1px solid rgba(255, 255, 255, .45); + cursor: pointer; + } + } + } +} diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index ee6645bbb..d7d4cb891 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -19,6 +19,8 @@ @import "includes/walletActivity"; @import "includes/wallets"; @import "includes/modals/modals"; +@import "includes/slideToAccept"; +@import "includes/slideToAcceptSuccess"; @import "includes/tx-details"; @import "includes/txp-details"; @import "includes/tx-status"; diff --git a/www/img/icon-arrow-right.svg b/www/img/icon-arrow-right.svg new file mode 100644 index 000000000..3381555ca --- /dev/null +++ b/www/img/icon-arrow-right.svg @@ -0,0 +1,17 @@ + + + + arrows-24px-outline-1_tail-right + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/www/img/icon-bitcoin-white.svg b/www/img/icon-bitcoin-white.svg new file mode 100644 index 000000000..ef8cee901 --- /dev/null +++ b/www/img/icon-bitcoin-white.svg @@ -0,0 +1,14 @@ + + + + Imported Layers + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/www/img/spinner.png b/www/img/spinner.png new file mode 100644 index 0000000000000000000000000000000000000000..591bc204fe654da0123bb9162064ef741cab810a GIT binary patch literal 407 zcmV;I0cie-P)Px$QAtEWR45gNlD|trQ547D)zp5NC;8^G&VFfxH`EvJGZyA z^beHK5Dh^~HH4T%1c9N3y*}UDHJnf&?NF@UO&m#4WsMg^2RRHJE`1ID>moeG~Sf2r2p$+{2 znt|SF8_@^;=gBFMA(m(zmSOyXcj6c5A{ybXeFKm+fh!?5^xyyh002ovPDHLkV1n&d BwBi5& literal 0 HcmV?d00001 diff --git a/www/views/confirm.html b/www/views/confirm.html index aa039f4b4..541a43d1b 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -61,5 +61,16 @@ - + + Slide to pay + + + Payment Sent + diff --git a/www/views/includes/acceptSlide.html b/www/views/includes/acceptSlide.html deleted file mode 100644 index 95e57ce8d..000000000 --- a/www/views/includes/acceptSlide.html +++ /dev/null @@ -1,9 +0,0 @@ - - - -
- - Slide to accept -
- - diff --git a/www/views/includes/slideToAccept.html b/www/views/includes/slideToAccept.html new file mode 100644 index 000000000..924bc2469 --- /dev/null +++ b/www/views/includes/slideToAccept.html @@ -0,0 +1,38 @@ +
+
+
+
+
+ +
+
+ +
+
+ + {{displaySendStatus}} +
+
+ +
+
diff --git a/www/views/includes/slideToAcceptSuccess.html b/www/views/includes/slideToAcceptSuccess.html new file mode 100644 index 000000000..ca2e4ed8a --- /dev/null +++ b/www/views/includes/slideToAcceptSuccess.html @@ -0,0 +1,15 @@ +
+
+ +
+ +
+ Payment Sent +
+
+ +
+ OK +
From 4118cc4aee3db9431ec305b5b96c05a012265605 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Fri, 7 Oct 2016 20:12:37 -0400 Subject: [PATCH 02/11] ensure old click to pay way works for now --- src/js/controllers/confirm.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 05fc6a322..da772543f 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -259,7 +259,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( }); }; - $scope.approve = function() { + $scope.approve = function(onSendStatusChange) { var wallet = $scope.wallet; if (!wallet) { return setSendError(gettextCatalog.getString('No wallet selected')); @@ -295,21 +295,21 @@ angular.module('copayApp.controllers').controller('confirmController', function( if (isCordova && bigAmount) { popupService.showConfirm(null, message, okText, cancelText, function(ok) { if (!ok) return; - publishAndSign(wallet, txp); + publishAndSign(wallet, txp, onSendStatusChange); }); } else { popupService.showConfirm(null, message, okText, cancelText, function(ok) { if (!ok) return; - publishAndSign(wallet, txp); + publishAndSign(wallet, txp, onSendStatusChange); }); } } - else publishAndSign(wallet, txp); + else publishAndSign(wallet, txp, onSendStatusChange); }); }; - function onSendStatusChange(processName, showName, isOn) { + function statusChangeHandler(processName, showName, isOn) { if(processName === 'broadcastingTx' && !isOn) { $scope.sendStatus = 'success'; $scope.$digest(); @@ -319,7 +319,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( } $scope.onConfirm = function() { - $scope.approve(true); + $scope.approve(statusChangeHandler); }; $scope.onSuccessConfirm = function() { @@ -329,7 +329,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $state.go('tabs.send'); }; - function publishAndSign(wallet, txp) { + function publishAndSign(wallet, txp, onSendStatusChange) { walletService.publishAndSign(wallet, txp, function(err, txp) { if (err) return setSendError(err); }, onSendStatusChange); From b9ba2af9934fe5a6aed6092837194a30c95803b2 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 10:56:12 -0400 Subject: [PATCH 03/11] disable swipe back functionality at the controller level --- src/js/controllers/confirm.js | 4 +++- src/js/routes.js | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index da772543f..23440c11c 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -1,9 +1,11 @@ 'use strict'; -angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory) { +angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig) { var cachedTxp = {}; var isChromeApp = platformInfo.isChromeApp; + $ionicConfig.views.swipeBackEnabled(false); + $scope.$on("$ionicView.beforeEnter", function(event, data) { $scope.isWallet = data.stateParams.isWallet; $scope.isCard = data.stateParams.isCard; diff --git a/src/js/routes.js b/src/js/routes.js index 183e5eab3..a69f00072 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -32,7 +32,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr // NAV BACK-BUTTON TEXT/ICON $ionicConfigProvider.backButton.icon('icon ion-ios-arrow-thin-left').text(''); $ionicConfigProvider.backButton.previousTitleText(false); - $ionicConfigProvider.views.swipeBackEnabled(false); $logProvider.debugEnabled(true); $provide.decorator('$log', ['$delegate', 'platformInfo', From a1c73b7148f4644f0d0c3413cf08bb209b29df67 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 14:22:00 -0400 Subject: [PATCH 04/11] add hasClick to platformInfo and use it to determine whether to show the slide to pay component or not --- src/js/controllers/confirm.js | 1 + src/js/routes.js | 2 +- src/js/services/platformInfo.js | 16 ++++++++++++++++ www/views/confirm.html | 4 ++-- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 23440c11c..ba66bcb26 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -32,6 +32,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( throw ('bad params'); } $scope.isCordova = platformInfo.isCordova; + $scope.hasClick = platformInfo.hasClick; $scope.data = {}; var config = configService.getSync().wallet; diff --git a/src/js/routes.js b/src/js/routes.js index a69f00072..3a06302a4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -983,7 +983,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); - $state.go('tabs.home'); + //$state.go('tabs.home'); } }); }); diff --git a/src/js/services/platformInfo.js b/src/js/services/platformInfo.js index f634e8f0f..9ba4a6d9f 100644 --- a/src/js/services/platformInfo.js +++ b/src/js/services/platformInfo.js @@ -39,5 +39,21 @@ angular.module('copayApp.services').factory('platformInfo', function($window) { ret.isChromeApp = $window.chrome && chrome.runtime && chrome.runtime.id && !ret.isNW; ret.isDevel = !ret.isMobile && !ret.isChromeApp && !ret.isNW; + ret.hasClick = false; + + if($window.sessionStorage.getItem('hasClick')) { + ret.hasClick = true; + } + + $window.addEventListener('mousedown', function() { + ret.hasClick = true; + $window.sessionStorage.setItem('hasClick', 'true'); + }); + + $window.addEventListener('touchstart', function() { + ret.hasClick = false; + $window.sessionStorage.removeItem('hasClick'); + }); + return ret; }); diff --git a/www/views/confirm.html b/www/views/confirm.html index 541a43d1b..127b011f0 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -59,10 +59,10 @@ - + Slide to pay From 34566e13a7d7207963206e501663d5908fd894d9 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 14:33:55 -0400 Subject: [PATCH 05/11] allow user to cancel a transaction when using the slide to pay component --- src/js/controllers/confirm.js | 10 ++++++++-- src/js/directives/slideToAccept.js | 20 +++++++++++--------- src/sass/views/includes/slideToAccept.scss | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index ba66bcb26..9258e521d 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -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); }); } diff --git a/src/js/directives/slideToAccept.js b/src/js/directives/slideToAccept.js index f47a60d70..a396e2b0d 100644 --- a/src/js/directives/slideToAccept.js +++ b/src/js/directives/slideToAccept.js @@ -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) { diff --git a/src/sass/views/includes/slideToAccept.scss b/src/sass/views/includes/slideToAccept.scss index 4257097b8..55ef91f06 100644 --- a/src/sass/views/includes/slideToAccept.scss +++ b/src/sass/views/includes/slideToAccept.scss @@ -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; } From d5e72eede01341aedb531cd6895d5a28ceeed4d0 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 15:27:57 -0400 Subject: [PATCH 06/11] make click to pay flow match slide to pay flow --- src/js/controllers/confirm.js | 6 +++- src/js/directives/clickToAccept.js | 20 +++++++++++ src/sass/views/includes/clickToAccept.scss | 40 ++++++++++++++++++++++ src/sass/views/views.scss | 1 + www/views/confirm.html | 8 ++++- www/views/includes/clickToAccept.html | 9 +++++ 6 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 src/js/directives/clickToAccept.js create mode 100644 src/sass/views/includes/clickToAccept.scss create mode 100644 www/views/includes/clickToAccept.html diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 9258e521d..c85a6a55d 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -190,6 +190,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( }; var setSendError = function(msg) { + $scope.sendStatus = ''; popupService.showAlert(gettextCatalog.getString('Error at confirm:'), msg); }; @@ -197,7 +198,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.fee = txFormatService.formatAmountStr(txp.fee); $scope.txp = txp; $scope.$apply(); - }; + } var createTx = function(wallet, dryRun, cb) { var config = configService.getSync().wallet; @@ -327,6 +328,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( } } + $scope.statusChangeHandler = statusChangeHandler; + $scope.onConfirm = function() { $scope.approve(statusChangeHandler); }; @@ -335,6 +338,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( $ionicHistory.nextViewOptions({ disableAnimate: true }); + $scope.sendStatus = ''; $state.go('tabs.send'); }; diff --git a/src/js/directives/clickToAccept.js b/src/js/directives/clickToAccept.js new file mode 100644 index 000000000..36cfbaeb5 --- /dev/null +++ b/src/js/directives/clickToAccept.js @@ -0,0 +1,20 @@ +'use strict'; + +angular.module('copayApp.directives') + .directive('clickToAccept', function() { + return { + restrict: 'E', + templateUrl: 'views/includes/clickToAccept.html', + transclude: true, + scope: { + sendStatus: '=clickSendStatus', + }, + link: function(scope, element, attrs) { + scope.$watch('sendStatus', function() { + if(scope.sendStatus !== 'success') { + scope.displaySendStatus = scope.sendStatus; + } + }); + } + }; + }); diff --git a/src/sass/views/includes/clickToAccept.scss b/src/sass/views/includes/clickToAccept.scss new file mode 100644 index 000000000..7a60de930 --- /dev/null +++ b/src/sass/views/includes/clickToAccept.scss @@ -0,0 +1,40 @@ +click-to-accept { + + .click-to-accept { + &__status-text { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + z-index: 4; + text-transform: capitalize; + transform: translateY(2rem); + opacity: 0; + + &.enter { + transition: transform 250ms ease, opacity 250ms ease; + transform: translateY(0); + opacity: 1; + } + + > img { + margin-right: 10px; + animation-name: spin; + animation-duration: 500ms; + animation-iteration-count: infinite; + animation-timing-function: linear; + } + } + + } + + @keyframes spin { + from { + transform:rotate(0deg); + } + to { + transform:rotate(360deg); + } + } +} diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index d7d4cb891..565408372 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -19,6 +19,7 @@ @import "includes/walletActivity"; @import "includes/wallets"; @import "includes/modals/modals"; +@import "includes/clickToAccept"; @import "includes/slideToAccept"; @import "includes/slideToAcceptSuccess"; @import "includes/tx-details"; diff --git a/www/views/confirm.html b/www/views/confirm.html index 127b011f0..ac0527ba6 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -59,7 +59,13 @@ - + + + Click to pay + + + + + + + {{displaySendStatus}} + + From 324088b5dbfe059e4dd636ee343c4840aebfffbb Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 16:04:54 -0400 Subject: [PATCH 07/11] handle proposal creation --- src/js/controllers/confirm.js | 6 +++++- src/js/services/walletService.js | 2 +- www/views/confirm.html | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 862dbac7c..3665f1042 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -331,7 +331,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( }; function statusChangeHandler(processName, showName, isOn) { - if(processName === 'broadcastingTx' && !isOn) { + console.log('in statusChangeHandler', processName, showName, isOn); + console.log('$scope.wallet', $scope.wallet); + if( + (processName === 'broadcastingTx' || + ((processName === 'signingTx') && $scope.wallet.m > 1)) && !isOn) { $scope.sendStatus = 'success'; $scope.$digest(); } else if(showName) { diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index a3218b90c..0b0de6491 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -937,7 +937,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim ongoingProcess.set('signingTx', true, customStatusHandler); root.signTx(wallet, publishedTxp, password, function(err, signedTxp) { - ongoingProcess.set('signingTx', false); + ongoingProcess.set('signingTx', false, customStatusHandler); root.invalidateCache(wallet); diff --git a/www/views/confirm.html b/www/views/confirm.html index d8051350b..9f551ab5e 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -82,6 +82,7 @@ slide-success-show="sendStatus === 'success'" slide-success-on-confirm="onSuccessConfirm()" > - Payment Sent + Payment Sent + Proposal Created From 82ad31724bd187850ddefd88c5f098cc9fbc9903 Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 18:52:59 -0400 Subject: [PATCH 08/11] wire slide to accept component to proposal accept screen --- src/js/controllers/modals/txpDetails.js | 37 ++++++++++++++++++++--- src/js/directives/slideToAcceptSuccess.js | 9 ++++-- www/views/confirm.html | 1 + www/views/modals/txp-details.html | 24 ++++++++++++--- 4 files changed, 58 insertions(+), 13 deletions(-) diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 076d98748..63bafbd6c 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, fingerprintService, bwcError, gettextCatalog, lodash, walletService, popupService) { +angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, fingerprintService, bwcError, gettextCatalog, lodash, walletService, popupService, $state, $ionicHistory) { var self = $scope.self; var tx = $scope.tx; var copayers = $scope.copayers; @@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi $scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal(); $scope.color = $scope.wallet.color; $scope.data = {}; - + $scope.hasClick = platformInfo.hasClick; initActionList(); checkPaypro(); } @@ -66,17 +66,18 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi } var setSendError = function(msg) { + $scope.sendStatus = ''; var error = msg || gettextCatalog.getString('Could not send payment'); popupService.showAlert(gettextCatalog.getString('Error'), error); } - $scope.sign = function() { + $scope.sign = function(onSendStatusChange) { $scope.loading = true; walletService.publishAndSign($scope.wallet, $scope.tx, function(err, txp) { $scope.$emit('UpdateTx'); if (err) return setSendError(err); - $scope.close(); - }); + success(); + }, onSendStatusChange); }; function setError(err, prefix) { @@ -213,6 +214,32 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi }); }; + function statusChangeHandler(processName, showName, isOn) { + console.log('in statusChangeHandler', processName, showName, isOn); + console.log('$scope.wallet', $scope.wallet); + if(showName) { + $scope.sendStatus = showName; + } + } + + function success() { + $scope.sendStatus = 'success'; + $scope.$digest(); + } + + $scope.statusChangeHandler = statusChangeHandler; + + $scope.onConfirm = function() { + $scope.sign(statusChangeHandler); + }; + + $scope.onSuccessConfirm = function() { + $ionicHistory.nextViewOptions({ + disableAnimate: true + }); + $scope.close(); + }; + $scope.close = function() { $scope.loading = null; $scope.txpDetailsModal.hide(); diff --git a/src/js/directives/slideToAcceptSuccess.js b/src/js/directives/slideToAcceptSuccess.js index 4a7312703..b5e9b20bc 100644 --- a/src/js/directives/slideToAcceptSuccess.js +++ b/src/js/directives/slideToAcceptSuccess.js @@ -8,7 +8,8 @@ angular.module('copayApp.directives') transclude: true, scope: { isShown: '=slideSuccessShow', - onConfirm: '&slideSuccessOnConfirm' + onConfirm: '&slideSuccessOnConfirm', + hideOnConfirm: '=slideSuccessHideOnConfirm' }, link: function(scope, element, attrs) { var elm = element[0]; @@ -23,8 +24,10 @@ angular.module('copayApp.directives') }); scope.onConfirmButtonClick = function() { scope.onConfirm(); - scope.fillScreen = false; - elm.style.display = 'none'; + if(scope.hideOnConfirm) { + scope.fillScreen = false; + elm.style.display = 'none'; + } }; } }; diff --git a/www/views/confirm.html b/www/views/confirm.html index 9f551ab5e..cb2a3063b 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -81,6 +81,7 @@ Payment Sent Proposal Created diff --git a/www/views/modals/txp-details.html b/www/views/modals/txp-details.html index da8959262..de3091d91 100644 --- a/www/views/modals/txp-details.html +++ b/www/views/modals/txp-details.html @@ -149,11 +149,13 @@ - +
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created. @@ -164,5 +166,17 @@
- + + + Slide to accept + + + Payment Sent + From b2a02ac88a71804ebb94ca4b06b5c6dd57d72e0c Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Mon, 10 Oct 2016 18:56:02 -0400 Subject: [PATCH 09/11] uncomment tabs.home state change --- src/js/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/routes.js b/src/js/routes.js index 3a06302a4..a69f00072 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -983,7 +983,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr profileService.storeProfileIfDirty(); $log.debug('Profile loaded ... Starting UX.'); scannerService.gentleInitialize(); - //$state.go('tabs.home'); + $state.go('tabs.home'); } }); }); From e2b995102c2221122d1de65e6eead9ba0c8138c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 11 Oct 2016 10:19:05 -0300 Subject: [PATCH 10/11] delete unused code and fixes --- src/js/controllers/confirm.js | 15 +++++----- src/js/controllers/modals/txStatus.js | 40 +------------------------- src/sass/shame.scss | 4 +++ src/sass/views/includes/tx-status.scss | 25 ---------------- www/views/modals/tx-status.html | 40 +++++--------------------- 5 files changed, 20 insertions(+), 104 deletions(-) diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 3665f1042..b1661758e 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -57,7 +57,8 @@ angular.module('copayApp.controllers').controller('confirmController', function( } var filteredWallets = []; - var index = 0, enoughFunds = false; + var index = 0; + var enoughFunds = false; lodash.each(wallets, function(w) { walletService.getStatus(w, {}, function(err, status) { @@ -311,6 +312,9 @@ angular.module('copayApp.controllers').controller('confirmController', function( popupService.showConfirm(null, message, okText, cancelText, function(ok) { if (!ok) { $scope.sendStatus = ''; + $timeout(function() { + $scope.$apply(); + }); return; } publishAndSign(wallet, txp, onSendStatusChange); @@ -331,14 +335,11 @@ angular.module('copayApp.controllers').controller('confirmController', function( }; function statusChangeHandler(processName, showName, isOn) { - console.log('in statusChangeHandler', processName, showName, isOn); - console.log('$scope.wallet', $scope.wallet); - if( - (processName === 'broadcastingTx' || - ((processName === 'signingTx') && $scope.wallet.m > 1)) && !isOn) { + $log.debug('statusChangeHandler: ', processName, showName, isOn); + if ((processName === 'broadcastingTx' || ((processName === 'signingTx') && $scope.wallet.m > 1)) && !isOn) { $scope.sendStatus = 'success'; $scope.$digest(); - } else if(showName) { + } else if (showName) { $scope.sendStatus = showName; } } diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js index 6ac660181..e9e3aa537 100644 --- a/src/js/controllers/modals/txStatus.js +++ b/src/js/controllers/modals/txStatus.js @@ -1,49 +1,11 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $stateParams, $ionicHistory, $log, addressbookService) { +angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout) { if ($scope.cb) $timeout($scope.cb, 100); - var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName; - $scope.fromSendTab = previousView.match(/tabs.send/) ? true : false; - $scope.fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false; - $scope.fromPayPro = $stateParams.paypro ? true : false; - $scope.cancel = function() { $scope.txStatusModal.hide(); - if ($scope.fromSendTab) { - $ionicHistory.removeBackView(); - $state.go('tabs.send'); - $timeout(function() { - $state.transitionTo('tabs.home'); - }, 100); - } else if ($scope.fromBitPayCard) { - $ionicHistory.removeBackView(); - $timeout(function() { - $state.transitionTo('tabs.bitpayCard'); - }, 100); - } }; - $scope.save = function(addressbookEntry) { - $scope.txStatusModal.hide(); - $ionicHistory.nextViewOptions({ - disableAnimate: true, - disableBack: true - }); - $ionicHistory.removeBackView(); - $state.go('tabs.send.addressbook', { - fromSendTab: $scope.fromSendTab, - addressbookEntry: addressbookEntry - }); - } - - addressbookService.list(function(err, ab) { - if (err) $log.error(err); - if (ab[$scope.tx.toAddress]) { - $scope.entryExist = true; - $log.debug('Entry already exist'); - } - }) - }); diff --git a/src/sass/shame.scss b/src/sass/shame.scss index 6216e4cb4..4ef73e65a 100644 --- a/src/sass/shame.scss +++ b/src/sass/shame.scss @@ -385,6 +385,10 @@ input[type=number] { text-transform: lowercase; } +.text-center { + text-align: center; +} + .text-light { font-weight: 200; } diff --git a/src/sass/views/includes/tx-status.scss b/src/sass/views/includes/tx-status.scss index c1a62c779..0e0f52a94 100644 --- a/src/sass/views/includes/tx-status.scss +++ b/src/sass/views/includes/tx-status.scss @@ -1,29 +1,4 @@ #tx-status { - .address { - display: flex; - padding: 5px 15px; - background-color: #f5f5f5; - margin-top: 10px; - i { - color: grey; - padding-right: 10px; - border-right: 1px solid; - border-color: grey; - font-size: 20px; - } - contact { - margin-left: 15px; - margin-bottom: 3px; - margin-top: 5px; - } - } - .collect-address { - bottom: 0; - background: #fff; - color: #6c6c6c; - position: absolute; - width: 100%; - } .popup-txsent { font-size: 5rem; color: #4A90E2; diff --git a/www/views/modals/tx-status.html b/www/views/modals/tx-status.html index 1c930de0d..83c363d83 100644 --- a/www/views/modals/tx-status.html +++ b/www/views/modals/tx-status.html @@ -1,41 +1,15 @@
- -
- {{tx.amountStr}} -
-
- Sent - Funds sent -
-
- OKAY -
-
-
-
-

Would you like to add this address to your address book?

+ +
+ {{tx.amountStr}}
-
-
- - - - -
+
+ Sent
-
-
- -
-
- -
+
+ OKAY
From 77557f617f4e0288f79f1a3a3afec4c04bb34c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 11 Oct 2016 10:22:38 -0300 Subject: [PATCH 11/11] fixes --- src/js/controllers/modals/txpDetails.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 63bafbd6c..ca05f5027 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, fingerprintService, bwcError, gettextCatalog, lodash, walletService, popupService, $state, $ionicHistory) { +angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $ionicModal, $log, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, fingerprintService, bwcError, gettextCatalog, lodash, walletService, popupService, $state, $ionicHistory) { var self = $scope.self; var tx = $scope.tx; var copayers = $scope.copayers; @@ -215,9 +215,8 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi }; function statusChangeHandler(processName, showName, isOn) { - console.log('in statusChangeHandler', processName, showName, isOn); - console.log('$scope.wallet', $scope.wallet); - if(showName) { + $log.debug('statusChangeHandler: ', processName, showName, isOn); + if (showName) { $scope.sendStatus = showName; } }