From 8f40484a714ccf630938e43131075718692d3071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 22 Sep 2016 16:50:06 -0300
Subject: [PATCH] fixes

---
 public/views/copayers.html     |  5 -----
 src/js/controllers/copayers.js |  3 +--
 src/js/controllers/create.js   | 13 ++++++++-----
 src/js/routes.js               |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/public/views/copayers.html b/public/views/copayers.html
index 9ffa55a52..62590dba8 100644
--- a/public/views/copayers.html
+++ b/public/views/copayers.html
@@ -4,11 +4,6 @@
     <ion-nav-back-button>
     </ion-nav-back-button>
     <ion-nav-title>{{wallet.name}}</ion-nav-title>
-    <ion-nav-buttons side="secondary">
-      <button class="button back-button" ng-click="goHome()" ng-if="fromAddShared">
-        {{'Close' | translate}}
-      </button>
-    </ion-nav-buttons>
   </ion-nav-bar>
 
   <ion-content>
diff --git a/src/js/controllers/copayers.js b/src/js/controllers/copayers.js
index 567018167..186c23ae1 100644
--- a/src/js/controllers/copayers.js
+++ b/src/js/controllers/copayers.js
@@ -3,12 +3,11 @@
 angular.module('copayApp.controllers').controller('copayersController',
   function($scope, $log, $ionicNavBarDelegate, $timeout, $stateParams, $state, $rootScope, $ionicHistory, lodash, profileService, walletService, popupService, platformInfo, gettextCatalog, ongoingProcess) {
 
-    $scope.$on("$ionicView.enter", function(event, data) {
+    $scope.$on("$ionicView.beforeEnter", function(event, data) {
       init();
     });
 
     var init = function() {
-      $scope.fromAddShared = $stateParams.fromAddShared;
       $scope.isCordova = platformInfo.isCordova;
       $scope.wallet = profileService.getWallet($stateParams.walletId);
       updateWallet();
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index ecfe160d0..012143336 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -178,12 +178,15 @@ angular.module('copayApp.controllers').controller('createController',
 
           if (!client.isComplete()) {
             $ionicHistory.nextViewOptions({
-              disableBack: true
-            });
-            $state.go('tabs.copayers', {
-              walletId: client.credentials.walletId,
-              fromAddShared: true
+              disableAnimate: true
             });
+            $ionicHistory.removeBackView();
+            $state.go('tabs.home');
+            $timeout(function() {
+              $state.transitionTo('tabs.copayers', {
+                walletId: client.credentials.walletId
+              });
+            }, 100);
           }
           else $state.go('tabs.home')
         });
diff --git a/src/js/routes.js b/src/js/routes.js
index 304c0724e..3c4708d08 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -556,7 +556,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      */
 
     .state('tabs.copayers', {
-      url: '/copayers/:walletId/:fromAddShared',
+      url: '/copayers/:walletId',
       views: {
         'tab-home': {
           templateUrl: 'views/copayers.html',