From e76924cb749a4f17d0550458cc721b125f59719e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 3 May 2017 17:08:18 -0300
Subject: [PATCH] move addresses view to settings

---
 src/js/controllers/addresses.js                     | 10 +++++++++-
 src/js/controllers/preferencesAdvancedController.js |  2 +-
 src/js/controllers/tab-receive.js                   |  4 ++--
 src/js/routes.js                                    |  8 ++++----
 www/views/addresses.html                            |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js
index f0a8a5b9c..5f765a8c0 100644
--- a/src/js/controllers/addresses.js
+++ b/src/js/controllers/addresses.js
@@ -130,8 +130,16 @@ angular.module('copayApp.controllers').controller('addressesController', functio
 
   $scope.scan = function() {
     walletService.startScan($scope.wallet);
+    $ionicHistory.nextViewOptions({
+      disableAnimate: true,
+      historyRoot: true
+    });
     $ionicHistory.clearHistory();
-    $state.go('tabs.home');
+    $state.go('tabs.home').then(function() {
+      $state.transitionTo('tabs.wallet', {
+        walletId: $scope.wallet.credentials.walletId
+      });
+    });
   };
 
   $scope.sendByEmail = function() {
diff --git a/src/js/controllers/preferencesAdvancedController.js b/src/js/controllers/preferencesAdvancedController.js
index 0cbb742a0..c49c6e9e5 100644
--- a/src/js/controllers/preferencesAdvancedController.js
+++ b/src/js/controllers/preferencesAdvancedController.js
@@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('preferencesAdvancedController
   $scope.wallet = wallet;
 
   $scope.goToAddresses = function() {
-    $state.go('tabs.receive.addresses', {
+    $state.go('tabs.settings.addresses', {
       walletId: $stateParams.walletId,
     });
   };
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index b36680b9e..d86851bf2 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -13,11 +13,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     });
   };
 
-  $scope.setAddress = function(forceNew) {
+  $scope.setAddress = function() {
     if (!$scope.wallet || $scope.generatingAddress || !$scope.wallet.isComplete()) return;
     $scope.addr = null;
     $scope.generatingAddress = true;
-    walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
+    walletService.getAddress($scope.wallet, false, function(err, addr) {
       $scope.generatingAddress = false;
 
       if (err) {
diff --git a/src/js/routes.js b/src/js/routes.js
index e55d65401..1fa783a6c 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -655,19 +655,19 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
        *
        */
 
-      .state('tabs.receive.addresses', {
+      .state('tabs.settings.addresses', {
         url: '/addresses/:walletId/:toAddress',
         views: {
-          'tab-receive@tabs': {
+          'tab-settings@tabs': {
             controller: 'addressesController',
             templateUrl: 'views/addresses.html'
           }
         }
       })
-      .state('tabs.receive.allAddresses', {
+      .state('tabs.settings.allAddresses', {
         url: '/allAddresses/:walletId',
         views: {
-          'tab-receive@tabs': {
+          'tab-settings@tabs': {
             controller: 'addressesController',
             templateUrl: 'views/allAddresses.html'
           }
diff --git a/www/views/addresses.html b/www/views/addresses.html
index 155cb044c..5f2748221 100644
--- a/www/views/addresses.html
+++ b/www/views/addresses.html
@@ -1,4 +1,4 @@
-<ion-view hide-tabs id="addresses" class="addr">
+<ion-view id="addresses" class="addr">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Wallet Addresses' | translate}}</ion-nav-title>
     <ion-nav-back-button>