From d8d565f1d3c3ba7629afa24cb07dff2b660944e9 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 17 Nov 2016 11:06:22 -0300
Subject: [PATCH] Fix back button from share app

---
 src/js/controllers/feedback/complete.js | 14 ++++++--------
 src/js/controllers/feedback/send.js     | 11 +++++++++--
 src/sass/ionic.scss                     |  3 ++-
 www/views/feedback/complete.html        |  8 ++++----
 www/views/feedback/send.html            |  7 ++++---
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/js/controllers/feedback/complete.js b/src/js/controllers/feedback/complete.js
index 0601fb5b0..73a5af840 100644
--- a/src/js/controllers/feedback/complete.js
+++ b/src/js/controllers/feedback/complete.js
@@ -46,20 +46,18 @@ angular.module('copayApp.controllers').controller('completeController', function
     });
   };
 
-  $scope.$on("$ionicView.afterEnter", function() {
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+    $scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null;
+    $scope.skipped = (data.stateParams && data.stateParams.skipped) ? true : false;
+    $scope.rated = (data.stateParams && data.stateParams.rated) ? true : false;
+    $scope.fromSettings = (data.stateParams && data.stateParams.fromSettings) ? true : false;
+
     if (!$scope.fromSettings) {
       $ionicConfig.views.swipeBackEnabled(false);
     } else {
       $ionicNavBarDelegate.showBackButton(true);
       $ionicConfig.views.swipeBackEnabled(true);
     }
-  });
-
-  $scope.$on("$ionicView.beforeEnter", function(event, data) {
-    $scope.score = (data.stateParams && data.stateParams.score) ? parseInt(data.stateParams.score) : null;
-    $scope.skipped = (data.stateParams && data.stateParams.skipped) ? true : false;
-    $scope.rated = (data.stateParams && data.stateParams.rated) ? true : false;
-    $scope.fromSettings = (data.stateParams && data.stateParams.fromSettings) ? true : false;
 
     storageService.getFeedbackInfo(function(error, info) {
       var feedbackInfo = lodash.isString(info) ? JSON.parse(info) : null;
diff --git a/src/js/controllers/feedback/send.js b/src/js/controllers/feedback/send.js
index 7e13ac322..21bd8d6e5 100644
--- a/src/js/controllers/feedback/send.js
+++ b/src/js/controllers/feedback/send.js
@@ -54,9 +54,8 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
     $scope.feedback = {};
 
     if ($scope.score) {
-      $ionicNavBarDelegate.showBackButton(false);
       $ionicConfig.views.swipeBackEnabled(false);
-    } else $ionicNavBarDelegate.showBackButton(true);
+    }
 
     switch ($scope.score) {
       case 1:
@@ -90,4 +89,12 @@ angular.module('copayApp.controllers').controller('sendController', function($sc
     $scope.showForm = true;
   });
 
+  $scope.goBack = function() {
+    $ionicHistory.nextViewOptions({
+      disableAnimate: false,
+      historyRoot: true
+    });
+    $ionicHistory.goBack();
+  };
+
 });
diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss
index 1c2fc0a87..22fef9a07 100644
--- a/src/sass/ionic.scss
+++ b/src/sass/ionic.scss
@@ -7,7 +7,8 @@
 // Please include a description of the problem solved by the workaround.
 
 // class to dynamically hide the ion-nav-bar for v1 Amazon flow
-ion-nav-bar.hide { display: block !important; }
+// Fix hide-nav-bar (true|false)
+//ion-nav-bar.hide { display: block !important; }
 
 // the ion tabs element never needs it's own background (backgrounds are
 // rendered by the tabs), and the default background would cover the scanner
diff --git a/www/views/feedback/complete.html b/www/views/feedback/complete.html
index ef5fe01d8..bf7ceee5c 100644
--- a/www/views/feedback/complete.html
+++ b/www/views/feedback/complete.html
@@ -1,11 +1,11 @@
-<ion-view id="complete" hide-tabs>
-  <ion-nav-bar class="bar-royal" ng-if="fromSettings">
+<ion-view id="complete" hide-nav-bar="!fromSettings" hide-tabs>
+  <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
     </ion-nav-back-button>
     <ion-nav-title>{{'Share BitPay' | translate}}</ion-nav-title>
   </ion-nav-bar>
-  <ion-content scroll="false">
-    <a class="close-button" ng-show="!fromSettings" ng-click="close()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
+  <ion-content scroll="false" has-header="fromSettings">
+    <a class="close-button ng-hide" ng-show="!fromSettings" ng-click="close()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
     <div class="complete-layout">
       <div class="complete-layout__expand" ng-class="{'fade-in': !animate || socialsharing}">
         <div ng-show="fromSettings">
diff --git a/www/views/feedback/send.html b/www/views/feedback/send.html
index 8672725ff..ef6b3644b 100644
--- a/www/views/feedback/send.html
+++ b/www/views/feedback/send.html
@@ -1,12 +1,13 @@
 <ion-view id="send-feedback" hide-tabs>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-back-button>
-    </ion-nav-back-button>
     <ion-nav-title>{{'Send Feedback' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button ng-show="score" class="button no-border" ng-click="sendFeedback(null, true, true)" translate>
+      <button ng-show="score" class="button no-border ng-hide" ng-click="sendFeedback(null, true, true)" translate>
         Cancel
       </button>
+      <button ng-show="!score || fromSettings" class="button back-button button-clear ng-hide" ng-click="goBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
+      </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>