From 1675acb87a2507228ad25d8e40540218cbff0637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 14 Nov 2016 23:20:41 -0300
Subject: [PATCH 1/6] adding icon to feedback flow

---
 src/js/controllers/feedback/rateCard.js |  1 +
 src/sass/views/feedback/complete.scss   | 19 ++++++++++---
 src/sass/views/feedback/rateApp.scss    |  8 +++++-
 src/sass/views/feedback/rateCard.scss   | 24 ++++++----------
 src/sass/views/feedback/send.scss       | 15 ++--------
 www/views/feedback/complete.html        | 36 ++++++++++++------------
 www/views/feedback/rateApp.html         |  4 +--
 www/views/feedback/rateCard.html        | 37 +++++++++++++++++++++----
 www/views/feedback/send.html            | 37 +++++++++++++++++++++----
 9 files changed, 117 insertions(+), 64 deletions(-)

diff --git a/src/js/controllers/feedback/rateCard.js b/src/js/controllers/feedback/rateCard.js
index 53504b8de..46d788659 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) {
diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss
index f7a7a5277..40f64a9ad 100644
--- a/src/sass/views/feedback/complete.scss
+++ b/src/sass/views/feedback/complete.scss
@@ -19,10 +19,21 @@
   }
   .subtitle {
     padding: 10px 30px 20px 40px;
-    .image {
-      text-align: center;
-      padding: 30px;
-    }
+  }
+  .icon-svg > img {
+    height: 16rem;
+    width: 16rem;
+  }
+  .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..d90f5700d 100644
--- a/src/sass/views/feedback/rateApp.scss
+++ b/src/sass/views/feedback/rateApp.scss
@@ -4,11 +4,17 @@
     margin: 10px;
     color: #667;
   }
+  .icon-svg > img {
+    width: 80px;
+    height: 80px;
+    margin-right: 30px;
+    margin-top: 15px;
+  }
   .title {
     font-size: 20px;
     font-weight: bold;
     color: $dark-gray;
-    margin: 40px 10px;
+    margin: 40px 10px 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..c8eb2b230 100644
--- a/www/views/feedback/complete.html
+++ b/www/views/feedback/complete.html
@@ -5,8 +5,8 @@
     </div>
     <div ng-show="skipped && isCordova">
       <div class="title" translate>Invite friends to BitPay Wallet!</div>
-      <div>
-        <i class="icon zero-state-icon">
+      <div class="text-center">
+        <i class="icon addressbook-icon-svg">
           <img src="img/address-book-add.svg"/>
         </i>
       </div>
@@ -21,9 +21,11 @@
       </div>
       <div class="subtitle" ng-if="score <= 3 || !isCordova">
         <span translate>If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab.</span>
-        <div class="image">
-          <i class="icon zero-state-icon">
-            <img src="img/address-book-add.svg"/>
+      </div>
+      <div ng-if="score <= 3 || !isCordova">
+        <div class="text-center">
+          <i class="icon icon-svg">
+            <img src="img/illustration-send-feedback.png"/>
           </i>
         </div>
       </div>
@@ -35,40 +37,40 @@
       <div class="ng-hide" ng-show="socialsharing" ng-if="score >= 4">
         <div class="row">
           <div class="ng-hide" ng-show="facebook" ng-click="shareFacebook()">
-            <i class="icon zero-state-icon">
-              <img src="img/address-book-add.svg"/>
+            <i class="icon socialsharing-icon">
+              <img src="img/social-icons/ico-social-facebook.svg"/>
             </i>
             <span>Facebook</span>
           </div>
           <div class="ng-hide" ng-show="twitter" ng-click="shareTwitter()">
-            <i class="icon zero-state-icon">
-              <img src="img/address-book-add.svg"/>
+            <i class="icon socialsharing-icon">
+              <img src="img/social-icons/ico-social-twitter.svg"/>
             </i>
             <span>Twitter</span>
           </div>
           <div class="ng-hide" ng-show="googleplus" ng-click="shareGooglePlus()">
-            <i class="icon zero-state-icon">
-              <img src="img/address-book-add.svg"/>
+            <i class="icon socialsharing-icon">
+              <img src="img/social-icons/ico-social-googleplus.svg"/>
             </i>
             <span>Google+</span>
           </div>
         </div>
         <div class="row">
           <div class="ng-hide" ng-show="email" ng-click="shareEmail()">
-            <i class="icon zero-state-icon">
-              <img src="img/address-book-add.svg"/>
+            <i class="icon socialsharing-icon">
+              <img src="img/social-icons/ico-social-email.svg"/>
             </i>
             <span>Email</span>
           </div>
           <div class="ng-hide" ng-show="whatsapp" ng-click="shareWhatsapp()">
-            <i class="icon zero-state-icon">
-              <img src="img/address-book-add.svg"/>
+            <i class="icon socialsharing-icon">
+              <img src="img/social-icons/ico-social-whatsapp.svg"/>
             </i>
             <span>Whatsapp</span>
           </div>
           <div ng-click="shareMessage()">
-            <i class="icon zero-state-icon">
-              <img src="img/address-book-add.svg"/>
+            <i class="icon socialsharing-icon">
+              <img src="img/social-icons/ico-social-message.svg"/>
             </i>
             <span>Message</span>
           </div>
diff --git a/www/views/feedback/rateApp.html b/www/views/feedback/rateApp.html
index 524ba9781..9cdce4c20 100644
--- a/www/views/feedback/rateApp.html
+++ b/www/views/feedback/rateApp.html
@@ -4,8 +4,8 @@
     <div class="title">
       <span translate>Thank you!</span>
       <div>
-        <i class="icon zero-state-icon">
-          <img src="img/address-book-add.svg"/>
+        <i class="icon icon-svg">
+          <img src="img/ico-positive-feedback.svg" class="bg"/>
         </i>
       </div>
     </div>
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 @@
     <span translate>How do you like BitPay Wallet?</span>
     <a ng-click="hideCard()" ><i class="icon ion-ios-close-empty close-home-tip"></i></a>
   </div>
-  <div class="stars item item-sub">
-    <button class="button icon ion-android-star" ng-click="setScore(1)" ng-class="{'gold': 1 <= score, 'subtle-gray': 1 > score}"></button>
-    <button class="button icon ion-android-star" ng-click="setScore(2)" ng-class="{'gold': 2 <= score, 'subtle-gray': 2 > score}"></button>
-    <button class="button icon ion-android-star" ng-click="setScore(3)" ng-class="{'gold': 3 <= score, 'subtle-gray': 3 > score}"></button>
-    <button class="button icon ion-android-star" ng-click="setScore(4)" ng-class="{'gold': 4 <= score, 'subtle-gray': 4 > score}"></button>
-    <button class="button icon ion-android-star" ng-click="setScore(5)" ng-class="{'gold': 5 ==  score, 'subtle-gray': 5 > score}"></button>
+  <div class="row item item-sub" ng-class="{'row-margin': isModal}">
+    <div class="col col-20">
+      <i class="icon icon-svg" ng-click="setScore(1)">
+        <img ng-if="1 <= score" src="img/ico-star-filled.svg"/>
+        <img ng-if="1 > score" src="img/ico-star.svg"/>
+      </i>
+    </div>
+    <div class="col col-20">
+      <i class="icon icon-svg" ng-click="setScore(2)">
+        <img ng-if="2 <= score" src="img/ico-star-filled.svg"/>
+        <img ng-if="2 > score" src="img/ico-star.svg"/>
+      </i>
+    </div>
+    <div class="col col-20">
+      <i class="icon icon-svg" ng-click="setScore(3)">
+        <img ng-if="3 <= score" src="img/ico-star-filled.svg"/>
+        <img ng-if="3 > score" src="img/ico-star.svg"/>
+      </i>
+    </div>
+    <div class="col col-20">
+      <i class="icon icon-svg" ng-click="setScore(4)">
+        <img ng-if="4 <= score" src="img/ico-star-filled.svg"/>
+        <img ng-if="4 > score" src="img/ico-star.svg"/>
+      </i>
+    </div>
+    <div class="col col-20">
+      <i class="icon icon-svg" ng-click="setScore(5)">
+        <img ng-if="5 ==  score" src="img/ico-star-filled.svg"/>
+        <img ng-if="5 > score" src="img/ico-star.svg"/>
+      </i>
+    </div>
   </div>
   <div class="feedback-flow-button" ng-if="button_title">
     <button type="submit" class="button button-standard button-primary" ng-click="goFeedbackFlow()">
diff --git a/www/views/feedback/send.html b/www/views/feedback/send.html
index f22e175e8..c0c323aa0 100644
--- a/www/views/feedback/send.html
+++ b/www/views/feedback/send.html
@@ -4,12 +4,37 @@
     <div class="title">
       <span>{{reaction}}</span>
     </div>
-    <div class="star">
-      <a><i ng-class="{'gold': 1 <= score, 'subtle-gray': 1 > score}" class="icon ion-android-star"></i></a>
-      <a><i ng-class="{'gold': 2 <= score, 'subtle-gray': 2 > score}" class="icon ion-android-star"></i></a>
-      <a><i ng-class="{'gold': 3 <= score, 'subtle-gray': 3 > score}" class="icon ion-android-star"></i></a>
-      <a><i ng-class="{'gold': 4 <= score, 'subtle-gray': 4 > score}" class="icon ion-android-star"></i></a>
-      <a><i ng-class="{'gold': 5 == score, 'subtle-gray': 5 > score}" class="icon ion-android-star"></i></a>
+    <div class="row item item-sub">
+      <div class="col col-10">
+        <i class="icon icon-svg" ng-click="setScore(1)">
+          <img ng-if="1 <= score" src="img/ico-star-filled.svg"/>
+          <img ng-if="1 > score" src="img/ico-star.svg"/>
+        </i>
+      </div>
+      <div class="col col-10">
+        <i class="icon icon-svg" ng-click="setScore(2)">
+          <img ng-if="2 <= score" src="img/ico-star-filled.svg"/>
+          <img ng-if="2 > score" src="img/ico-star.svg"/>
+        </i>
+      </div>
+      <div class="col col-10">
+        <i class="icon icon-svg" ng-click="setScore(3)">
+          <img ng-if="3 <= score" src="img/ico-star-filled.svg"/>
+          <img ng-if="3 > score" src="img/ico-star.svg"/>
+        </i>
+      </div>
+      <div class="col col-10">
+        <i class="icon icon-svg" ng-click="setScore(4)">
+          <img ng-if="4 <= score" src="img/ico-star-filled.svg"/>
+          <img ng-if="4 > score" src="img/ico-star.svg"/>
+        </i>
+      </div>
+      <div class="col col-10">
+        <i class="icon icon-svg" ng-click="setScore(5)">
+          <img ng-if="5 ==  score" src="img/ico-star-filled.svg"/>
+          <img ng-if="5 > score" src="img/ico-star.svg"/>
+        </i>
+      </div>
     </div>
     <div class="comment">
       <span translate>{{comment}}</span>

From 2db87a840f086aabc14aedd5415027c85f280c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 15 Nov 2016 00:05:20 -0300
Subject: [PATCH 2/6] align text

---
 src/sass/views/feedback/complete.scss | 1 +
 www/views/feedback/rateApp.html       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/sass/views/feedback/complete.scss b/src/sass/views/feedback/complete.scss
index 40f64a9ad..f5e0052b9 100644
--- a/src/sass/views/feedback/complete.scss
+++ b/src/sass/views/feedback/complete.scss
@@ -23,6 +23,7 @@
   .icon-svg > img {
     height: 16rem;
     width: 16rem;
+    margin: 10px;
   }
   .socialsharing-icon {
     display: inline-block;
diff --git a/www/views/feedback/rateApp.html b/www/views/feedback/rateApp.html
index 9cdce4c20..476646919 100644
--- a/www/views/feedback/rateApp.html
+++ b/www/views/feedback/rateApp.html
@@ -9,10 +9,10 @@
         </i>
       </div>
     </div>
-    <div class="subtitle">
+    <div class="subtitle text-center">
         <span translate>5-star ratings help us get BitPay Wallet into more hands, and more users means more resoucers can be committed to the app!</span>
     </div>
-    <div class="subtitle">
+    <div class="subtitle text-center">
       <span class="text-bold" translate>Would you be willing to rate BitPay Wallet in the app store?</span>
     </div>
     <div class="buttons">

From e9f8889a66e2e8f9143e1b8bf812dede970b6d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 15 Nov 2016 00:13:47 -0300
Subject: [PATCH 3/6] fix

---
 www/views/feedback/complete.html | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/www/views/feedback/complete.html b/www/views/feedback/complete.html
index c8eb2b230..07f6730a8 100644
--- a/www/views/feedback/complete.html
+++ b/www/views/feedback/complete.html
@@ -4,14 +4,32 @@
       <a ui-sref="tabs.home"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
     </div>
     <div ng-show="skipped && isCordova">
-      <div class="title" translate>Invite friends to BitPay Wallet!</div>
-      <div class="text-center">
-        <i class="icon addressbook-icon-svg">
-          <img src="img/address-book-add.svg"/>
-        </i>
+      <div ng-show="score > 3">
+        <div class="title" translate>Invite friends to BitPay Wallet!</div>
+        <div class="text-center">
+          <i class="icon addressbook-icon-svg">
+            <img src="img/address-book-add.svg"/>
+          </i>
+        </div>
+        <div class="text-center">
+          <span translate>Share the love by inviting your friends.</span>
+        </div>
       </div>
-      <div class="text-center">
-        <span translate>Share the love by inviting your friends.</span>
+      <div ng-show="score <= 3">
+        <div class="title" translate>Thank you!</div>
+        <div class="subtitle">
+          <span translate>A member of the team will review your feedback as soon as possible.</span>
+        </div>
+        <div class="subtitle" ng-if="score <= 3 || !isCordova">
+          <span translate>If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab.</span>
+        </div>
+        <div ng-if="score <= 3 || !isCordova">
+          <div class="text-center">
+            <i class="icon icon-svg">
+              <img src="img/illustration-send-feedback.png"/>
+            </i>
+          </div>
+        </div>
       </div>
     </div>
     <div ng-show="!skipped || !isCordova">

From 57a730413fdb8ebc6106b3c187c017a1652be07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 15 Nov 2016 00:26:18 -0300
Subject: [PATCH 4/6] fixes

---
 src/js/controllers/feedback/rateCard.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/feedback/rateCard.js b/src/js/controllers/feedback/rateCard.js
index 46d788659..4c858b3ed 100644
--- a/src/js/controllers/feedback/rateCard.js
+++ b/src/js/controllers/feedback/rateCard.js
@@ -53,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);
   }
 
 });

From 31953edf29af9b13e95d8f3d0d2caa2c6fb4c719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 15 Nov 2016 00:45:59 -0300
Subject: [PATCH 5/6] fix skip from rate app view

---
 src/js/controllers/feedback/rateApp.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

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
+      });
     });
   };
 

From b65a42396a7c73c04f5d4d7ad37ef466d63f634d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Tue, 15 Nov 2016 01:02:29 -0300
Subject: [PATCH 6/6] align title and icon on rate app view

---
 src/sass/views/feedback/rateApp.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/sass/views/feedback/rateApp.scss b/src/sass/views/feedback/rateApp.scss
index d90f5700d..9f44f5920 100644
--- a/src/sass/views/feedback/rateApp.scss
+++ b/src/sass/views/feedback/rateApp.scss
@@ -7,14 +7,13 @@
   .icon-svg > img {
     width: 80px;
     height: 80px;
-    margin-right: 30px;
     margin-top: 15px;
   }
   .title {
     font-size: 20px;
     font-weight: bold;
     color: $dark-gray;
-    margin: 40px 10px 10px;
+    margin: 40px 50px 10px;
     text-align: center;
   }
   .subtitle {