From 8b4b0c69c34c34ccaeefa100e6bd81bf934bf286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 17 Nov 2016 14:33:49 -0300
Subject: [PATCH] remove skipped from send feedback controller

---
 src/js/controllers/feedback/send.js | 20 ++++++--------------
 www/views/feedback/send.html        |  6 +++---
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/js/controllers/feedback/send.js b/src/js/controllers/feedback/send.js
index 21bd8d6e5..6410ea02c 100644
--- a/src/js/controllers/feedback/send.js
+++ b/src/js/controllers/feedback/send.js
@@ -2,22 +2,22 @@
 
 angular.module('copayApp.controllers').controller('sendController', function($scope, $state, $log, $timeout, $stateParams, $ionicNavBarDelegate, $ionicHistory, $ionicConfig, $window, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) {
 
-  $scope.sendFeedback = function(feedback, skip, goHome) {
+  $scope.sendFeedback = function(feedback, goHome) {
 
     var config = configService.getSync();
 
     var dataSrc = {
       "Email": lodash.values(config.emailFor)[0] || ' ',
-      "Feedback": skip ? ' ' : feedback,
+      "Feedback": goHome ? ' ' : feedback,
       "Score": $stateParams.score || ' ',
       "AppVersion": $window.version,
       "Platform": ionic.Platform.platform(),
       "DeviceVersion": ionic.Platform.version()
     };
 
-    if(!(goHome || skip)) ongoingProcess.set('sendingFeedback', true);
+    if (!goHome) ongoingProcess.set('sendingFeedback', true);
     feedbackService.send(dataSrc, function(err) {
-      if(goHome || skip) return;
+      if (goHome) return;
       ongoingProcess.set('sendingFeedback', false);
       if (err) {
         popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Feedback could not be submitted. Please try again later.'));
@@ -35,18 +35,10 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
         return;
       }
       $state.go('tabs.rate.complete', {
-        score: $stateParams.score,
-        skipped: skip
+        score: $stateParams.score
       });
     });
-    if(goHome){
-      $state.go('tabs.home');
-    } else if(skip) {
-      $state.go('tabs.rate.complete', {
-        score: $stateParams.score,
-        skipped: skip
-      });
-    }
+    if (goHome) $state.go('tabs.home');
   };
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
diff --git a/www/views/feedback/send.html b/www/views/feedback/send.html
index ef6b3644b..24a0d07b7 100644
--- a/www/views/feedback/send.html
+++ b/www/views/feedback/send.html
@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Send Feedback' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button ng-show="score" class="button no-border ng-hide" ng-click="sendFeedback(null, true, true)" translate>
+      <button ng-show="score" class="button no-border ng-hide" ng-click="sendFeedback(null, true)" translate>
         Cancel
       </button>
       <button ng-show="!score || fromSettings" class="button back-button button-clear ng-hide" ng-click="goBack()">
@@ -10,7 +10,7 @@
       </button>
     </ion-nav-buttons>
     <ion-nav-buttons side="secondary">
-      <button ng-disabled="!feedback.value" class="button no-border" type="submit" ng-click="sendFeedback(feedback.value, false)" translate>
+      <button ng-disabled="!feedback.value" class="button no-border" type="submit" ng-click="sendFeedback(feedback.value)" translate>
         Send
       </button>
     </ion-nav-buttons>
@@ -40,7 +40,7 @@
     </div>
     <div ng-if="showForm" class="form-fade-in">
       <textarea class="user-feedback" ng-model="feedback.value" rows="5" placeholder="Your ideas, feedback, or comments" autofocus></textarea>
-      <button ng-disabled="!feedback.value" type="submit" class="button button-standard button-primary" ng-click="sendFeedback(feedback.value, false)" translate>
+      <button ng-disabled="!feedback.value" type="submit" class="button button-standard button-primary" ng-click="sendFeedback(feedback.value)" translate>
         Send
       </button>
     </div>