From 9153580cfba523c13de8aa4a0861eccd83096cf4 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 25 Aug 2016 18:18:38 -0300
Subject: [PATCH 1/2] Fix addressbook []

---
 src/js/services/addressbookService.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/js/services/addressbookService.js b/src/js/services/addressbookService.js
index d6035bf8f..74fe7edcc 100644
--- a/src/js/services/addressbookService.js
+++ b/src/js/services/addressbookService.js
@@ -3,16 +3,6 @@
 angular.module('copayApp.services').factory('addressbookService', function(bitcore, storageService, lodash) {
   var root = {};
 
-  var getNetwork = function(addr) {
-    var Address = bitcore.Address;
-    if (Address.isValid(addr, 'livenet')) {
-      return 'livenet';
-    }
-    if (Address.isValid(addr, 'testnet')) {
-      return 'testnet';
-    }
-  };
-
   root.getLabel = function(addr, cb) {
     storageService.getAddressbook('testnet', function(err, ab) {
       if (ab && ab[addr]) return cb(ab[addr]);
@@ -41,11 +31,12 @@ angular.module('copayApp.services').factory('addressbookService', function(bitco
   };
 
   root.add = function(entry, cb) {
-    var network = getNetwork(entry.address);
+    var network = (new bitcore.Address(entry.address)).network.name;
     storageService.getAddressbook(network, function(err, ab) {
       if (err) return cb(err);
       if (ab) ab = JSON.parse(ab);
       ab = ab || {};
+      if (lodash.isArray(ab)) ab = {}; // No array
       if (ab[entry.address]) return cb('Entry already exist');
       ab[entry.address] = entry.label;
       storageService.setAddressbook(network, JSON.stringify(ab), function(err, ab) {
@@ -58,7 +49,7 @@ angular.module('copayApp.services').factory('addressbookService', function(bitco
   };
 
   root.remove = function(addr, cb) {
-    var network = getNetwork(addr);
+    var network = (new bitcore.Address(addr)).network.name;
     storageService.getAddressbook(network, function(err, ab) {
       if (err) return cb(err);
       if (ab) ab = JSON.parse(ab);

From 505cce100387f9371ff6745d06eea747855af766 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 25 Aug 2016 18:22:41 -0300
Subject: [PATCH 2/2] removes unused html

---
 src/js/routes.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/js/routes.js b/src/js/routes.js
index d60d6a712..a69c7508b 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -95,11 +95,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      *
      */
 
-      .state('disclaimer', {
-      url: '/disclaimer',
-      templateUrl: 'views/disclaimer.html',
-    })
-
     .state('unsupported', {
       url: '/unsupported',
       templateUrl: 'views/unsupported.html'