From 1cd1fdafd528b8c6f39bcbdb7298602f1ece930d Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 28 Jun 2017 15:25:58 -0300
Subject: [PATCH] Fixes path to allAddresses from walletDetails

---
 src/js/controllers/addresses.js   |  9 ++++++++-
 src/js/routes.js                  | 19 +++++++++++++++++++
 src/sass/views/walletDetails.scss |  1 +
 www/views/addresses.html          |  4 ++--
 www/views/walletDetails.html      |  2 +-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js
index 19db9ad11..47ec668ce 100644
--- a/src/js/controllers/addresses.js
+++ b/src/js/controllers/addresses.js
@@ -141,7 +141,14 @@ angular.module('copayApp.controllers').controller('addressesController', functio
   };
 
   $scope.viewAllAddresses = function() {
-    $state.go('tabs.settings.allAddresses', {
+    var fromView = $ionicHistory.currentStateName();
+    var path;
+    if (fromView.indexOf('settings') !== -1) {
+      path = 'tabs.settings.allAddresses';
+    } else {
+      path = 'tabs.wallet.allAddresses';
+    }
+    $state.go(path, {
       walletId: $scope.wallet.id
     });
   };
diff --git a/src/js/routes.js b/src/js/routes.js
index 17267fa93..fefffd355 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -202,6 +202,25 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
 
+      .state('tabs.wallet.addresses', {
+        url: '/addresses/:walletId/:toAddress',
+        views: {
+          'tab-home@tabs': {
+            controller: 'addressesController',
+            templateUrl: 'views/addresses.html'
+          }
+        }
+      })
+      .state('tabs.wallet.allAddresses', {
+        url: '/allAddresses/:walletId',
+        views: {
+          'tab-home@tabs': {
+            controller: 'addressesController',
+            templateUrl: 'views/allAddresses.html'
+          }
+        }
+      })
+
       /*
        *
        * Tabs
diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss
index 8de214a4d..9553bf489 100644
--- a/src/sass/views/walletDetails.scss
+++ b/src/sass/views/walletDetails.scss
@@ -248,6 +248,7 @@
   text-decoration: none;
   z-index: 9999;
   position: relative;
+  padding: 2px 5px;
 }
 
 a.item {
diff --git a/www/views/addresses.html b/www/views/addresses.html
index 4831e7c81..d21d7ce74 100644
--- a/www/views/addresses.html
+++ b/www/views/addresses.html
@@ -1,4 +1,4 @@
-<ion-view id="addresses" class="addr">
+<ion-view id="addresses" class="addr" hide-tabs>
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Wallet Addresses' | translate}}</ion-nav-title>
     <ion-nav-back-button>
@@ -33,7 +33,7 @@
         <div class="item item-icon-right view-all" ng-if="viewAll.value" ng-click="viewAllAddresses()">
           <span translate>View All Addresses</span>
           <i class="icon ion-ios-arrow-thin-right"></i>
-        </div> 
+        </div>
 
         <div class="item item-divider item-icon-right"  ng-click="newAddress()">
           <span translate>Unused Addresses</span>
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 0041b352a..a2dbd7ae8 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -159,7 +159,7 @@
     </a>
 
 
-    <a class="wallet-not-backed-up-warning" ng-if="lowUtxosWarning" ui-sref="tabs.settings.addresses({walletId:wallet.id,from: 'tabs.wallet'})" translate>
+    <a class="wallet-not-backed-up-warning" ng-if="lowUtxosWarning" ui-sref="tabs.wallet.addresses({walletId:wallet.id,from: 'tabs.wallet'})" translate>
       Spending this balance will need significant Bitcoin network fees
     </a>