From 62ec55bf6d48fb87d13a3e9f0a48b350b493b0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 16 Nov 2016 17:15:41 -0300 Subject: [PATCH 1/3] add new parameters --- src/js/controllers/feedback/rateApp.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/js/controllers/feedback/rateApp.js b/src/js/controllers/feedback/rateApp.js index b72b07433..b5de9bfa9 100644 --- a/src/js/controllers/feedback/rateApp.js +++ b/src/js/controllers/feedback/rateApp.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, lodash, externalLinkService, configService, gettextCatalog, platformInfo, feedbackService, ongoingProcess, popupService) { +angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, $window, lodash, externalLinkService, configService, gettextCatalog, platformInfo, feedbackService, ongoingProcess, popupService) { $scope.score = parseInt($stateParams.score); var isAndroid = platformInfo.isAndroid; var isIOS = platformInfo.isIOS; @@ -12,7 +12,10 @@ angular.module('copayApp.controllers').controller('rateAppController', function( var dataSrc = { "Email": lodash.values(config.emailFor)[0] || ' ', "Feedback": ' ', - "Score": $stateParams.score + "Score": $stateParams.score, + "AppVersion": $window.version, + "Platform": ionic.Platform.platform(), + "DeviceVersion": ionic.Platform.version() }; ongoingProcess.set('sendingFeedback', true); From e8584621072fb4c5e3b16a0bfe0ccd596c4a482c Mon Sep 17 00:00:00 2001 From: Marty Alcala Date: Wed, 16 Nov 2016 15:35:25 -0500 Subject: [PATCH 2/3] fix click to pay button to bottom of screen like the slide to pay component --- src/sass/buttons.scss | 3 +-- src/sass/views/includes/clickToAccept.scss | 14 ++++++++++++++ src/sass/views/includes/txp-details.scss | 2 +- www/views/confirm.html | 14 +++++++------- www/views/modals/txp-details.html | 14 +++++++------- 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/sass/buttons.scss b/src/sass/buttons.scss index 7f35657e2..dd750d28f 100644 --- a/src/sass/buttons.scss +++ b/src/sass/buttons.scss @@ -19,8 +19,7 @@ $button-secondary-border: transparent; $button-secondary-active-bg: darken($subtle-gray, 5%); $button-secondary-active-border: transparent; -%button-standard, -click-to-accept { +%button-standard { width: 85%; max-width: 300px; margin-left: auto; diff --git a/src/sass/views/includes/clickToAccept.scss b/src/sass/views/includes/clickToAccept.scss index 9eb8098e0..3d8b96ada 100644 --- a/src/sass/views/includes/clickToAccept.scss +++ b/src/sass/views/includes/clickToAccept.scss @@ -1,7 +1,18 @@ click-to-accept { + position: fixed; + bottom: 0; + height: 92px; + width: 100%; + .click-to-accept { + &__button.button.button-primary.button-standard { + height: 100%; + max-width: 9999px; + width: 100%; + } + &__button.disable { pointer-events: none; } @@ -18,6 +29,9 @@ click-to-accept { transform: translateY(2rem); opacity: 0; pointer-events: none; + display: flex; + align-items: center; + justify-content: center; &.enter { transition: transform 250ms ease, opacity 250ms ease; diff --git a/src/sass/views/includes/txp-details.scss b/src/sass/views/includes/txp-details.scss index 9ebb8ad67..137573dae 100644 --- a/src/sass/views/includes/txp-details.scss +++ b/src/sass/views/includes/txp-details.scss @@ -8,7 +8,7 @@ .list { background: #f5f5f5; } - .slide-to-pay { + .add-bottom-for-cta { bottom: 92px; } .head { diff --git a/www/views/confirm.html b/www/views/confirm.html index 94cd36fac..500a79671 100644 --- a/www/views/confirm.html +++ b/www/views/confirm.html @@ -7,7 +7,7 @@ - +
@@ -77,13 +77,13 @@
- - Click to pay - + + Click to pay + - +
@@ -150,12 +150,6 @@
- - Click to accept -
* 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. @@ -167,6 +161,12 @@
+ + Click to accept + Date: Wed, 16 Nov 2016 18:32:12 -0300 Subject: [PATCH 3/3] show top bar on share copay option --- src/js/controllers/feedback/complete.js | 11 +++++++++-- src/js/routes.js | 10 +++++----- src/sass/views/feedback/complete.scss | 3 +-- www/views/feedback/complete.html | 8 +++++++- www/views/tab-settings.html | 2 +- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/js/controllers/feedback/complete.js b/src/js/controllers/feedback/complete.js index 836142143..97978b0c4 100644 --- a/src/js/controllers/feedback/complete.js +++ b/src/js/controllers/feedback/complete.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('completeController', function($scope, $stateParams, $timeout, $log, $ionicHistory, $state, platformInfo, configService, storageService, lodash) { +angular.module('copayApp.controllers').controller('completeController', function($scope, $stateParams, $timeout, $log, $ionicHistory, $state, $ionicNavBarDelegate, $ionicConfig, platformInfo, configService, storageService, lodash) { $scope.isCordova = platformInfo.isCordova; var config = configService.getSync(); @@ -32,6 +32,12 @@ angular.module('copayApp.controllers').controller('completeController', function $scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null; $scope.skipped = (data.stateParams && data.stateParams.skipped) ? true : false; + $scope.fromSettings = (data.stateParams && data.stateParams.fromSettings) ? true : false; + + if (!$scope.fromSettings) { + $ionicNavBarDelegate.showBackButton(false); + $ionicConfig.views.swipeBackEnabled(false); + } else $ionicNavBarDelegate.showBackButton(true); storageService.getFeedbackInfo(function(error, info) { var feedbackInfo = lodash.isString(info) ? JSON.parse(info) : null; @@ -97,6 +103,7 @@ angular.module('copayApp.controllers').controller('completeController', function disableAnimate: false, historyRoot: true }); - $ionicHistory.goBack(-2); + if ($scope.score == 5) $ionicHistory.goBack(-3); + else $ionicHistory.goBack(-2); }; }); diff --git a/src/js/routes.js b/src/js/routes.js index 76a712906..bdd035fe8 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -743,7 +743,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr * */ - .state('tabs.feedback', { + .state('tabs.feedback', { url: '/feedback', views: { 'tab-settings@tabs': { @@ -752,8 +752,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) - .state('tabs.feedback.shareApp', { - url: '/shareApp/:score/:skipped', + .state('tabs.shareApp', { + url: '/shareApp/:score/:skipped/:fromSettings', views: { 'tab-settings@tabs': { controller: 'completeController', @@ -1113,8 +1113,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }); $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) { - if($window.StatusBar) { - if(toState.customConfig && toState.customConfig.hideStatusBar) { + if ($window.StatusBar) { + if (toState.customConfig && toState.customConfig.hideStatusBar) { $window.StatusBar.hide(); } else { $window.StatusBar.show(); diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss index 52de5bea7..8d108ae01 100644 --- a/src/sass/views/feedback/complete.scss +++ b/src/sass/views/feedback/complete.scss @@ -1,9 +1,8 @@ #complete { background-color: #ffffff; .close-button { - color: $dark-gray; + color: #fff; position: absolute; - top: 10px; right: 15px; font-size: 36px; } diff --git a/www/views/feedback/complete.html b/www/views/feedback/complete.html index 37e450e85..9899f45cb 100644 --- a/www/views/feedback/complete.html +++ b/www/views/feedback/complete.html @@ -1,6 +1,12 @@ + + + + + + + -
Invite friends to BitPay!
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 8a3147d50..fc6f85167 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -36,7 +36,7 @@ Send Feedback - +