From 828b174c233619de3097b4182044caa56b6c1786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 24 May 2017 16:40:07 -0300
Subject: [PATCH] remove slide to delete and adding that option to addr entry
 view

---
 src/js/controllers/addressbook.js     | 13 -------------
 src/js/controllers/addressbookView.js | 10 ++++++++++
 www/views/addressbook.html            |  3 ---
 www/views/addressbook.view.html       |  7 ++++++-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/js/controllers/addressbook.js b/src/js/controllers/addressbook.js
index 08ca7d25e..8c83852fa 100644
--- a/src/js/controllers/addressbook.js
+++ b/src/js/controllers/addressbook.js
@@ -46,19 +46,6 @@ angular.module('copayApp.controllers').controller('addressbookListController', f
     $scope.addressbook = result;
   };
 
-  $scope.remove = function(addr) {
-    $timeout(function() {
-      addressbookService.remove(addr, function(err, ab) {
-        if (err) {
-          popupService.showAlert(gettextCatalog.getString('Error'), err);
-          return;
-        }
-        initAddressbook();
-        $scope.$digest();
-      });
-    }, 100);
-  };
-
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     $scope.isChromeApp = platformInfo.isChromeApp;
     $scope.showAddIcon = false;
diff --git a/src/js/controllers/addressbookView.js b/src/js/controllers/addressbookView.js
index 347de91d9..1cf8e9e1e 100644
--- a/src/js/controllers/addressbookView.js
+++ b/src/js/controllers/addressbookView.js
@@ -19,4 +19,14 @@ angular.module('copayApp.controllers').controller('addressbookViewController', f
     }, 100);
   };
 
+  $scope.remove = function(addr) {
+    addressbookService.remove(addr, function(err, ab) {
+      if (err) {
+        popupService.showAlert(gettextCatalog.getString('Error'), err);
+        return;
+      }
+      $ionicHistory.goBack();
+    });
+  };
+
 });
diff --git a/www/views/addressbook.html b/www/views/addressbook.html
index 2dc0f88ae..19890db00 100644
--- a/www/views/addressbook.html
+++ b/www/views/addressbook.html
@@ -42,9 +42,6 @@
         <h2>{{addrEntry.name}}</h2>
         <p>{{addrEntry.address}}</p>
         <i class="icon bp-arrow-right"></i>
-        <ion-option-button class="button-assertive" ng-click="remove(addrEntry.address)">
-          <i class="icon ion-minus-circled"></i>
-        </ion-option-button>
       </ion-item>
     </ion-list>
   </ion-content>
diff --git a/www/views/addressbook.view.html b/www/views/addressbook.view.html
index 3d63abd6a..4953d6e58 100644
--- a/www/views/addressbook.view.html
+++ b/www/views/addressbook.view.html
@@ -5,6 +5,11 @@
     <ion-nav-title>
       <span>{{addressbookEntry.name}}</span>
     </ion-nav-title>
+    <ion-nav-buttons side="secondary">
+      <button class="button back-button" ng-click="remove(addressbookEntry.address)">
+        Remove
+      </button>
+    </ion-nav-buttons>
   </ion-nav-bar>
   <ion-content scroll="false">
     <div class="gravatar-content">
@@ -23,7 +28,7 @@
         <span>{{addressbookEntry.email}}</span>
       </div>
       <div class="item item-text-wrap">
-        <span class="address-book-field-label" translate>Address</span>
+        <span class="address-book-field-label" copy-to-clipboard="addressbookEntry.address" translate>Address</span>
         <span>{{addressbookEntry.address}}</span>
       </div>
     </div>