From fabf6a6fd158069f7fdedeb6a8e9a5462b9035e0 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 23 Sep 2016 13:34:47 -0300
Subject: [PATCH] Minor fixes. Fix Glidera

---
 public/views/tab-send.html        | 4 ++--
 src/js/controllers/buyGlidera.js  | 5 ++---
 src/js/controllers/glidera.js     | 6 +++---
 src/js/controllers/sellGlidera.js | 5 ++---
 src/js/controllers/tab-send.js    | 1 +
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/public/views/tab-send.html b/public/views/tab-send.html
index 31cfcc4c0..861fa5892 100644
--- a/public/views/tab-send.html
+++ b/public/views/tab-send.html
@@ -10,8 +10,8 @@
         <i class="icon ion-search placeholder-icon"></i>
         <input type="text"
                placeholder="Search or enter bitcoin address"
-               ng-model="search"
-               ng-change="findContact(search)"
+               ng-model="formData.search"
+               ng-change="findContact(formData.search)"
                ng-model-onblur>
       </label>
     </div>
diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js
index a68751d18..e25612418 100644
--- a/src/js/controllers/buyGlidera.js
+++ b/src/js/controllers/buyGlidera.js
@@ -7,6 +7,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
     var self = this;
     this.show2faCodeInput = null;
     this.success = null;
+    $scope.network = glideraService.getEnvironment();
 
     $scope.$on('Wallet/Changed', function(event, w) {
       if (lodash.isEmpty(w)) {
@@ -116,9 +117,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
     };
 
     $scope.$on("$ionicView.enter", function(event, data){
-      $scope.network = glideraService.getEnvironment();
-
-      $scope.token = accessToken;
+      $scope.token = null;
       $scope.permissions = null;
       $scope.email = null;
       $scope.personalInfo = null;
diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js
index c909e9aa2..9f701e984 100644
--- a/src/js/controllers/glidera.js
+++ b/src/js/controllers/glidera.js
@@ -3,13 +3,13 @@
 angular.module('copayApp.controllers').controller('glideraController',
   function($scope, $timeout, $ionicModal, $log, storageService, glideraService, ongoingProcess, platformInfo, externalLinkService, popupService, gettextCatalog) {
 
+    $scope.network = glideraService.getEnvironment();
+
     $scope.openExternalLink = function(url, target) {
       externalLinkService.open(url, target);
     };
 
     var initGlidera = function(accessToken) {
-      $scope.network = glideraService.getEnvironment();
-
       $scope.token = null;
       $scope.permissions = null;
       $scope.email = null;
@@ -113,7 +113,7 @@ angular.module('copayApp.controllers').controller('glideraController',
       });
     };
 
-    $scope.$on("$ionicView.enter", function(event, data){
+    $scope.$on("$ionicView.beforeEnter", function(event, data){
       initGlidera();
     });
 
diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js
index defc5067c..be19a4298 100644
--- a/src/js/controllers/sellGlidera.js
+++ b/src/js/controllers/sellGlidera.js
@@ -8,6 +8,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
     this.show2faCodeInput = null;
     this.success = null;
     var wallet;
+    $scope.network = glideraService.getEnvironment();
 
     $scope.$on('Wallet/Changed', function(event, w) {
       if (lodash.isEmpty(w)) {
@@ -189,9 +190,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
     };
 
     $scope.$on("$ionicView.enter", function(event, data){
-      $scope.network = glideraService.getEnvironment();
-
-      $scope.token = accessToken;
+      $scope.token = null;
       $scope.permissions = null;
       $scope.email = null;
       $scope.personalInfo = null;
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index acd08dfde..58aaf6aef 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -84,6 +84,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
   };
 
   $scope.$on("$ionicView.enter", function(event, data){
+    $scope.formData = { search: null };
     updateList();
   });