Merge pull request #5050 from bitjson/master

fix(feedback): direct iOS users to the proper app store url

src/js/controllers/feedback/complete.js

@@ -32,7 +32,8 @@ angular.module('copayApp.controllers').controller('completeController', function
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     if(window.StatusBar){
-      StatusBar.show();
+      $log.debug('Hiding status bar...');
+      StatusBar.hide();
     }
 
     storageService.getFeedbackInfo(function(error, info) {
@@ -83,8 +84,9 @@ angular.module('copayApp.controllers').controller('completeController', function
     }, 100);
   });
 
-  $scope.$on("$ionicView.afterLeave", function(event, data) {
+  $scope.$on("$ionicView.afterLeave", function() {
     if(window.StatusBar){
+      $log.debug('Showing status bar...');
       StatusBar.show();
     }
   });

src/js/controllers/feedback/rateApp.js

@@ -29,6 +29,20 @@ angular.module('copayApp.controllers').controller('rateAppController', function(
     });
   };
 
+  $scope.$on("$ionicView.beforeEnter", function() {
+    if(window.StatusBar){
+      $log.debug('Hiding status bar...');
+      StatusBar.hide();
+    }
+  });
+
+  $scope.$on("$ionicView.afterLeave", function() {
+    if(window.StatusBar){
+      $log.debug('Showing status bar...');
+      StatusBar.show();
+    }
+  });
+
   $scope.sendFeedback = function() {
     $state.go('feedback.send', {
       score: $scope.score
@@ -40,11 +54,7 @@ angular.module('copayApp.controllers').controller('rateAppController', function(
     var url;
     if (isAndroid) url = defaults.rateApp.android;
     if (isIOS) url = defaults.rateApp.ios;
-    // if (isWP) url = defaults.rateApp.ios; TODO
-    var title = gettextCatalog.getString('Rate the app');
-    var message = gettextCatalog.getString('You must go to the official website of the app to rate it');
-    var okText = gettextCatalog.getString('Go');
-    var cancelText = gettextCatalog.getString('Cancel');
-    externalLinkService.open(url, true, title, message, okText, cancelText);
+    // if (isWP) url = defaults.rateApp.windows; // TODO
+    externalLinkService.open(url);
   };
 });

src/js/services/configService.js

@@ -20,7 +20,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
     },
 
     rateApp: {
-      ios: 'https://itunes.apple.com/app/bitpay-secure-bitcoin-wallet/id1149581638',
+      ios: 'http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=1149581638&pageNumber=0&sortOrdering=2&type=Purple+Software&mt=8',
       android: 'https://play.google.com/store/apps/details?id=com.bitpay.wallet',
       wp: ''
     },

src/js/services/popupService.js

@@ -51,12 +51,12 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni
 
   var _cordovaConfirm = function(title, message, okText, cancelText, cb) {
     var onConfirm = function(buttonIndex) {
-      if (buttonIndex == 1) return cb(true);
+      if (buttonIndex == 2) return cb(true);
       else return cb(false);
     }
     okText = okText || gettextCatalog.getString('OK');
     cancelText = cancelText || gettextCatalog.getString('Cancel');
-    navigator.notification.confirm(message, onConfirm, title, [okText, cancelText]);
+    navigator.notification.confirm(message, onConfirm, title, [cancelText, okText]);
   };
 
   var _cordovaPrompt = function(title, message, opts, cb) {

src/sass/views/feedback/rateApp.scss

@@ -4,6 +4,9 @@
     margin-top: 15px;
     color: #667;
   }
+  .skip-rating {
+    margin-right: 15px;
+  }
   .icon-svg > img {
     width: 80px;
     height: 80px;
@@ -13,7 +16,7 @@
     font-size: 20px;
     font-weight: bold;
     color: $dark-gray;
-    margin: 40px 50px 10px;
+    margin: 80px 50px 10px;
     text-align: center;
   }
   .subtitle {
@@ -25,9 +28,6 @@
     width: 100%;
     position: absolute;
     background-color: $subtle-gray;
-    .button {
-      margin-top: 40px;
-      margin-bottom: 30px;
-    }
+    padding: 50px 0;
   }
 }

www/views/feedback/rateApp.html

@@ -1,6 +1,6 @@
 <ion-view id="rate-app">
   <ion-content scroll="false">
-    <a class="right skip" ng-click="skip()">Skip</a>
+    <a class="right skip skip-rating" ng-click="skip()">Not now</a>
     <div class="title">
       <span translate>Thank you!</span>
       <div>
@@ -10,7 +10,7 @@
       </div>
     </div>
     <div class="subtitle text-center">
-        <span translate>5-star ratings help us get BitPay into more hands, and more users means more resoucers can be committed to the app!</span>
+        <span translate>5-star ratings help us get BitPay into more hands, and more users means more resources can be committed to the app!</span>
     </div>
     <div class="subtitle text-center">
       <span class="text-bold" translate>Would you be willing to rate BitPay in the app store?</span>

www/views/feedback/send.html

@@ -31,7 +31,7 @@
     <div class="comment">
       <span translate>{{comment}}</span>
     </div>
-    <textarea class="user-feedback" ng-model="feedback.value" placeholder="Your ideas, feedback, or comments"></textarea>
+    <textarea class="user-feedback" ng-model="feedback.value" placeholder="Your ideas, feedback, or comments" autofocus></textarea>
     <button ng-disabled="!feedback.value" type="submit" class="button button-full button-primary" ng-click="sendFeedback(feedback.value, false)" translate>
       Send
     </button>