From 38fb1c033da1450f593ac28a749d80c360a0c17c Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 16 Sep 2016 17:14:22 -0300
Subject: [PATCH] Fix addressbook route

---
 public/views/addressbook.add.html  |  8 +++-----
 public/views/addressbook.html      | 10 ++++------
 public/views/addressbook.view.html |  8 +++-----
 public/views/tab-send.html         |  5 ++---
 src/js/routes.js                   |  2 +-
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/public/views/addressbook.add.html b/public/views/addressbook.add.html
index c5b3762fe..bd8307fd0 100644
--- a/public/views/addressbook.add.html
+++ b/public/views/addressbook.add.html
@@ -1,10 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-buttons side="primary">
-      <button class="button button-clear" ui-sref="tabs.addressbook">
-        <i class="icon ion-ios-arrow-thin-left"></i>
-      </button>
-    </ion-nav-buttons>
+    <ion-nav-back-button>
+      <i class="icon ion-ios-arrow-thin-left"></i>
+    </ion-nav-back-button>
     <ion-nav-title>
       <span translate>Add entry</span>
     </ion-nav-title>
diff --git a/public/views/addressbook.html b/public/views/addressbook.html
index fdd60accb..88b5869ab 100644
--- a/public/views/addressbook.html
+++ b/public/views/addressbook.html
@@ -1,15 +1,13 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-buttons side="primary">
-      <button class="button button-clear" ui-sref="tabs.settings">
-        <i class="icon ion-ios-arrow-thin-left"></i>
-      </button>
-    </ion-nav-buttons>
+    <ion-nav-back-button>
+      <i class="icon ion-ios-arrow-thin-left"></i>
+    </ion-nav-back-button>
     <ion-nav-title>
       <span translate>Addressbook</span>
     </ion-nav-title>
     <ion-nav-buttons side="secondary">
-      <button class="button button-clear" ui-sref="tabs.addressbook.add">
+      <button class="button button-back button-clear" ui-sref="tabs.addressbook.add">
         <i class="icon ion-ios-plus-empty"></i>
       </button>
     </ion-nav-buttons>
diff --git a/public/views/addressbook.view.html b/public/views/addressbook.view.html
index 16549a4ec..6b215612e 100644
--- a/public/views/addressbook.view.html
+++ b/public/views/addressbook.view.html
@@ -1,10 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-buttons side="primary">
-      <button class="button button-clear" ui-sref="tabs.addressbook">
-        <i class="icon ion-ios-arrow-thin-left"></i>
-      </button>
-    </ion-nav-buttons>
+    <ion-nav-back-button>
+      <i class="icon ion-ios-arrow-thin-left"></i>
+    </ion-nav-back-button>
     <ion-nav-title>
       <span translate>Addressbook</span>
     </ion-nav-title>
diff --git a/public/views/tab-send.html b/public/views/tab-send.html
index c7d278453..b5e96e682 100644
--- a/public/views/tab-send.html
+++ b/public/views/tab-send.html
@@ -17,9 +17,8 @@
     </div>
 
     <div class="card" ng-if="list[0]">
-      <div class="item item-heading item-icon-right" ui-sref="tabs.addressbook">
-        <span translate>Contacts & Wallets</span>
-        <i class="icon nav-item-arrow-right"></i>
+      <div class="item item-heading">
+        <span translate>Contacts &amp; Wallets</span>
       </div>
       <div class="item text-center" ng-show="!list[0]" translate>No Wallet - Contact</div>
       <a class="item item-icon-left" ng-repeat="item in list" ng-click="goToAmount(item)">
diff --git a/src/js/routes.js b/src/js/routes.js
index 33435e551..7575cd37b 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -495,7 +495,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
     .state('tabs.addressbook', {
         url: '/addressbook',
         views: {
-          'tab-settings': {
+          'tab-settings@tabs': {
             templateUrl: 'views/addressbook.html',
             controller: 'addressbookListController'
           }