diff --git a/src/js/controllers/feedback/rateApp.js b/src/js/controllers/feedback/rateApp.js index 64792fc51..764b79faa 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, externalLinkService, configService, gettextCatalog, platformInfo) { +angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, lodash, externalLinkService, configService, gettextCatalog, platformInfo, feedbackService, ongoingProcess) { $scope.score = parseInt($stateParams.score); var isAndroid = platformInfo.isAndroid; var isIOS = platformInfo.isIOS; @@ -8,9 +8,24 @@ angular.module('copayApp.controllers').controller('rateAppController', function( var config = configService.getSync(); $scope.skip = function() { - $state.go('feedback.complete', { - score: $scope.score, - skipped: true + + var dataSrc = { + "Email": lodash.values(config.emailFor)[0] || ' ', + "Feedback": ' ', + "Score": $stateParams.score + }; + + ongoingProcess.set('sendingFeedback', true); + feedbackService.send(dataSrc, function(err) { + ongoingProcess.set('sendingFeedback', false); + if (err) { + popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not send feedback')); + return; + } + $state.go('feedback.complete', { + score: $stateParams.score, + skipped: true + }); }); }; diff --git a/src/js/controllers/feedback/rateCard.js b/src/js/controllers/feedback/rateCard.js index 53504b8de..4c858b3ed 100644 --- a/src/js/controllers/feedback/rateCard.js +++ b/src/js/controllers/feedback/rateCard.js @@ -3,6 +3,7 @@ angular.module('copayApp.controllers').controller('rateCardController', function($scope, $state, $timeout, gettextCatalog, platformInfo, storageService) { $scope.isCordova = platformInfo.isCordova; + $scope.score = 0; $scope.goFeedbackFlow = function() { if ($scope.isModal) { @@ -52,12 +53,14 @@ angular.module('copayApp.controllers').controller('rateCardController', function storageService.getFeedbackInfo(function(error, info) { var feedbackInfo = JSON.parse(info); feedbackInfo.sent = true; - storageService.setFeedbackInfo(JSON.stringify(feedbackInfo), function() {}); + storageService.setFeedbackInfo(JSON.stringify(feedbackInfo), function() { + $scope.showRateCard.value = false; + }); }); } $timeout(function() { $scope.$apply(); - }) + }, 100); } }); diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss index f7a7a5277..f5e0052b9 100644 --- a/src/sass/views/feedback/complete.scss +++ b/src/sass/views/feedback/complete.scss @@ -19,10 +19,22 @@ } .subtitle { padding: 10px 30px 20px 40px; - .image { - text-align: center; - padding: 30px; - } + } + .icon-svg > img { + height: 16rem; + width: 16rem; + margin: 10px; + } + .socialsharing-icon { + display: inline-block; + width: 50px; + height: 50px; + border-radius: 50%; + } + .addressbook-icon-svg { + display: inline-block; + width: 50px; + height: 50px; } .share-buttons { bottom: 0; diff --git a/src/sass/views/feedback/rateApp.scss b/src/sass/views/feedback/rateApp.scss index 779cffd67..9f44f5920 100644 --- a/src/sass/views/feedback/rateApp.scss +++ b/src/sass/views/feedback/rateApp.scss @@ -4,11 +4,16 @@ margin: 10px; color: #667; } + .icon-svg > img { + width: 80px; + height: 80px; + margin-top: 15px; + } .title { font-size: 20px; font-weight: bold; color: $dark-gray; - margin: 40px 10px; + margin: 40px 50px 10px; text-align: center; } .subtitle { diff --git a/src/sass/views/feedback/rateCard.scss b/src/sass/views/feedback/rateCard.scss index 9d01ea078..d141ca633 100644 --- a/src/sass/views/feedback/rateCard.scss +++ b/src/sass/views/feedback/rateCard.scss @@ -1,20 +1,12 @@ #rate-card { - .stars { - display: flex; - border-bottom: none; - .button { - background-color: #fff; - outline: none; - border: none; - height:10px; - width:10px; - } - .gold { - color: #ffd700; - } - .subtle-gray { - color: $subtle-gray; - } + .row { + border: none; + } + .row.row-margin{ + margin: 20px 0px 20px 0px; + } + .item-icon-right { + margin: 0; } .feedback-flow-button { padding: 20px; diff --git a/src/sass/views/feedback/send.scss b/src/sass/views/feedback/send.scss index 33b1720ca..2a0f9a210 100644 --- a/src/sass/views/feedback/send.scss +++ b/src/sass/views/feedback/send.scss @@ -1,5 +1,8 @@ #send-feedback { background-color: #ffffff; + .row { + border: none; + } .skip { margin: 20px 20px 10px; color: #667; @@ -11,18 +14,6 @@ font-weight: bold; color: $dark-gray; } - .star { - a { - font-size: 25px; - padding: 20px; - .gold { - color: #ffd700; - } - .subtle-gray { - color: $subtle-gray; - } - } - } .comment { padding: 20px; font-size: 1rem; diff --git a/www/views/feedback/complete.html b/www/views/feedback/complete.html index 36a47296c..07f6730a8 100644 --- a/www/views/feedback/complete.html +++ b/www/views/feedback/complete.html @@ -4,14 +4,32 @@
-
Invite friends to BitPay Wallet!
-
- - - +
+
Invite friends to BitPay Wallet!
+
+ + + +
+
+ Share the love by inviting your friends. +
-
- Share the love by inviting your friends. +
+
Thank you!
+
+ A member of the team will review your feedback as soon as possible. +
+
+ If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab. +
+
+
+ + + +
+
@@ -21,9 +39,11 @@
If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab. -
- - +
+
+
+ +
@@ -35,40 +55,40 @@
- - + + Facebook
- - + + Twitter
- - + + Google+
- - + + Email
- - + + Whatsapp
- - + + Message
diff --git a/www/views/feedback/rateApp.html b/www/views/feedback/rateApp.html index 524ba9781..476646919 100644 --- a/www/views/feedback/rateApp.html +++ b/www/views/feedback/rateApp.html @@ -4,15 +4,15 @@
Thank you!
- - + +
-
+
5-star ratings help us get BitPay Wallet into more hands, and more users means more resoucers can be committed to the app!
-
+
Would you be willing to rate BitPay Wallet in the app store?
diff --git a/www/views/feedback/rateCard.html b/www/views/feedback/rateCard.html index fd9f95f73..45a1b1270 100644 --- a/www/views/feedback/rateCard.html +++ b/www/views/feedback/rateCard.html @@ -3,12 +3,37 @@ How do you like BitPay Wallet?
-
- - - - - +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +