From 1615db989010b833f5d427a8a179e5bdb5353bde Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Thu, 13 Sep 2018 14:49:06 +0200
Subject: [PATCH 01/15] Wallet Settings button in Wallet Details

---
 src/js/controllers/preferences.js               | 15 ++++++++++++++-
 src/js/controllers/wallet-details.controller.js |  7 +++++++
 src/js/routes.js                                |  2 +-
 www/views/preferences.html                      |  2 +-
 www/views/walletDetails.html                    |  3 +++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index 2053e32a5..799c3db37 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -1,9 +1,10 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesController',
-  function($scope, $rootScope, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) {
+  function($scope, $rootScope, $state, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) {
     var wallet;
     var walletId;
+    var backToDetails = false;
 
     $scope.hiddenBalanceChange = function() {
       var opts = {
@@ -83,6 +84,7 @@ angular.module('copayApp.controllers').controller('preferencesController',
     };
 
     $scope.$on("$ionicView.beforeEnter", function(event, data) {
+      backToDetails = data.stateParams.backToDetails;
       wallet = profileService.getWallet(data.stateParams.walletId);
       walletId = wallet.credentials.walletId;
       $scope.wallet = wallet;
@@ -116,4 +118,15 @@ angular.module('copayApp.controllers').controller('preferencesController',
     $scope.$on("$ionicView.enter", function(event, data) {
       $ionicNavBarDelegate.showBar(true);
     });
+
+    $scope.goBack = function() {
+      if (backToDetails) {
+        $state.go('tabs.home').then(function () {
+          $ionicHistory.clearHistory();
+          $state.go('tabs.wallet', {'walletId': wallet.id});
+        });
+      } else {
+        $ionicHistory.goBack();
+      }
+    };
   });
diff --git a/src/js/controllers/wallet-details.controller.js b/src/js/controllers/wallet-details.controller.js
index f3109db8b..fba848fa5 100644
--- a/src/js/controllers/wallet-details.controller.js
+++ b/src/js/controllers/wallet-details.controller.js
@@ -115,6 +115,13 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     });
   };
 
+  $scope.openSettings = function() {
+    $state.go('tabs.settings').then(function () {
+      $ionicHistory.clearHistory();
+      $state.go('tabs.preferences', {'walletId': $scope.wallet.id, 'backToDetails': true});
+    });
+  };
+
   $scope.openSearchModal = function() {
     $scope.color = $scope.wallet.color;
     $scope.isSearching = true;
diff --git a/src/js/routes.js b/src/js/routes.js
index d2b78aac3..fde04b70c 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -526,7 +526,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
        */
 
       .state('tabs.preferences', {
-        url: '/preferences/:walletId',
+        url: '/preferences/:walletId/:backToDetails',
         views: {
           'tab-settings@tabs': {
             controller: 'preferencesController',
diff --git a/www/views/preferences.html b/www/views/preferences.html
index 3ee68dc11..a25270a35 100644
--- a/www/views/preferences.html
+++ b/www/views/preferences.html
@@ -3,7 +3,7 @@
     <ion-nav-title>
       {{'Wallet Settings'|translate}}
     </ion-nav-title>
-    <ion-nav-back-button>
+    <ion-nav-back-button ng-click="goBack()">
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 302a2b7a4..eb758b707 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -8,6 +8,9 @@
       <button class="button back-button" ng-click="startSearch(); openSearchModal()" ng-if="txHistory.length > 4">
         <i class="icon ion-ios-search-strong tx-search"></i>
       </button>
+      <button class="button" ng-click="openSettings();">
+        <i class="icon ion-android-settings"></i>
+      </button>
     </ion-nav-buttons>
   </ion-nav-bar>
   <style type="text/css">

From 276bce8bc45acb18c772e51b52cf4288d43fe444 Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Tue, 18 Sep 2018 15:19:06 +0200
Subject: [PATCH 02/15] disable animation

---
 src/js/controllers/preferences.js               | 3 +++
 src/js/controllers/wallet-details.controller.js | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index 799c3db37..ca1e789e9 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -123,6 +123,9 @@ angular.module('copayApp.controllers').controller('preferencesController',
       if (backToDetails) {
         $state.go('tabs.home').then(function () {
           $ionicHistory.clearHistory();
+          $ionicHistory.nextViewOptions({
+            disableAnimate: true
+          });
           $state.go('tabs.wallet', {'walletId': wallet.id});
         });
       } else {
diff --git a/src/js/controllers/wallet-details.controller.js b/src/js/controllers/wallet-details.controller.js
index fba848fa5..6e6ed0890 100644
--- a/src/js/controllers/wallet-details.controller.js
+++ b/src/js/controllers/wallet-details.controller.js
@@ -116,8 +116,14 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
   };
 
   $scope.openSettings = function() {
+    $ionicHistory.nextViewOptions({
+      disableAnimate: true,
+    });
     $state.go('tabs.settings').then(function () {
       $ionicHistory.clearHistory();
+      $ionicHistory.nextViewOptions({
+        disableAnimate: true,
+      });
       $state.go('tabs.preferences', {'walletId': $scope.wallet.id, 'backToDetails': true});
     });
   };

From 33df5044d5d5c4adbb7837e9d0af8c5af119e50c Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Wed, 19 Sep 2018 11:37:46 +0200
Subject: [PATCH 03/15] Hardware back button support

---
 src/js/controllers/preferences.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index ca1e789e9..f3ccb46fe 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesController',
-  function($scope, $rootScope, $state, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) {
+  function($scope, $rootScope, $state, $timeout, $log, $ionicHistory, $ionicPlatform, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) {
     var wallet;
     var walletId;
     var backToDetails = false;
@@ -121,15 +121,18 @@ angular.module('copayApp.controllers').controller('preferencesController',
 
     $scope.goBack = function() {
       if (backToDetails) {
+        $ionicHistory.nextViewOptions({disableAnimate: true});
         $state.go('tabs.home').then(function () {
           $ionicHistory.clearHistory();
-          $ionicHistory.nextViewOptions({
-            disableAnimate: true
-          });
           $state.go('tabs.wallet', {'walletId': wallet.id});
         });
       } else {
         $ionicHistory.goBack();
       }
     };
+
+    $ionicPlatform.registerBackButtonAction(function (event) {
+      event.preventDefault();
+      $scope.goBack()
+    }, 1000);
   });

From 0ba4db83e0f9ad5a06b6104a393d89ac0f8e0250 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Sat, 22 Sep 2018 11:03:26 -0700
Subject: [PATCH 04/15] Handling confirmation updates correctly for early
 transactions.

---
 src/js/services/wallet-history.service.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/js/services/wallet-history.service.js b/src/js/services/wallet-history.service.js
index 512a2d8b1..798c92671 100644
--- a/src/js/services/wallet-history.service.js
+++ b/src/js/services/wallet-history.service.js
@@ -28,8 +28,8 @@
       function addEarlyTransactions(walletId, cachedTxs, newTxs) {
 
         var cachedTxIndexFromId = {};
-        cachedTxs.forEach(function forCachedTx(tx){
-          cachedTxIndexFromId[tx.txid] = true;
+        cachedTxs.forEach(function forCachedTx(tx, txIndex){
+          cachedTxIndexFromId[tx.txid] = txIndex;
         });
 
         var confirmationsUpdated = false;
@@ -147,7 +147,7 @@
        * @param {function(error, txs)} cb - txs is always an array, may be empty
        */
       function getCachedTxHistory(walletId, cb) {
-        console.log('txhistory updateLocalTxHistoryByPage()');
+        console.log('txhistory getCachedTxHistory()');
         storageService.getTxHistory(walletId, function onGetTxHistory(err, txHistoryString){
           if (err) {
             return cb(err, []);
@@ -230,7 +230,7 @@
       }
 
       function updateLocalTxHistoryByPage(wallet, getLatest, flushCacheOnNew, cb) {
-        console.log('txhistory updaetLocalTxHistoryByPage()');
+        console.log('txhistory updateLocalTxHistoryByPage()');
         if (flushCacheOnNew) {
           fetchTxHistoryByPage(wallet, 0, function onFetchTxHistory(err, txs){
             if (err) {

From a5a1d3edb673f589e17110deb55194a76ab170ab Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Sat, 22 Sep 2018 11:07:24 -0700
Subject: [PATCH 05/15] Remove debug logging.

---
 src/js/services/wallet-history.service.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/js/services/wallet-history.service.js b/src/js/services/wallet-history.service.js
index 798c92671..5cb08e6ee 100644
--- a/src/js/services/wallet-history.service.js
+++ b/src/js/services/wallet-history.service.js
@@ -147,7 +147,6 @@
        * @param {function(error, txs)} cb - txs is always an array, may be empty
        */
       function getCachedTxHistory(walletId, cb) {
-        console.log('txhistory getCachedTxHistory()');
         storageService.getTxHistory(walletId, function onGetTxHistory(err, txHistoryString){
           if (err) {
             return cb(err, []);
@@ -230,7 +229,6 @@
       }
 
       function updateLocalTxHistoryByPage(wallet, getLatest, flushCacheOnNew, cb) {
-        console.log('txhistory updateLocalTxHistoryByPage()');
         if (flushCacheOnNew) {
           fetchTxHistoryByPage(wallet, 0, function onFetchTxHistory(err, txs){
             if (err) {

From c661798cd14128a2266acb36786bd285685a6506 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Sat, 22 Sep 2018 17:45:19 -0700
Subject: [PATCH 06/15] Android Debug and release builds work when Gradle 3.3
 is in PATH.

---
 Gruntfile.js                     | 2 +-
 app-template/config-template.xml | 2 +-
 src/android/build-extras.gradle  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 7968f2510..4ac23e47a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -71,7 +71,7 @@ module.exports = function(grunt) {
       sign_android: {
         // When the build log outputs "Built the following apk(s):", it seems to need the filename to start with "android-release".
         // It looks like it simply lists all apk files starting with "android-release"
-        command: 'rm -f platforms/android/build/outputs/apk/android-release-signed-*.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../bitcoin-com-release-key.jks -signedjar platforms/android/build/outputs/apk/android-release-signed.apk  platforms/android/build/outputs/apk/android-release-unsigned.apk bitcoin-com && zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/bitcoin-com-wallet-<%= pkg.fullVersion %>-android-signed-aligned.apk',
+        command: 'rm -f platforms/android/build/outputs/apk/release/*-android-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../bitcoin-com-release-key.jks -signedjar platforms/android/build/outputs/apk/release/android-release-signed.apk  platforms/android/build/outputs/apk/release/android-release-unsigned.apk bitcoin-com && zipalign -v 4 platforms/android/build/outputs/apk/release/android-release-signed.apk platforms/android/build/outputs/apk/release/bitcoin-com-wallet-<%= pkg.fullVersion %>-android-signed-aligned.apk',
         stdin: true,
       },
       sign_desktop_dist: {
diff --git a/app-template/config-template.xml b/app-template/config-template.xml
index 8686b7b36..b24b86fae 100644
--- a/app-template/config-template.xml
+++ b/app-template/config-template.xml
@@ -77,7 +77,7 @@
     </plugin>
     <!-- Supported Platforms -->
     <engine name="ios" spec="~4.5.3" />
-    <engine name="android" spec="~6.3.0" />
+    <engine name="android" spec="~6.4.0" />
     <engine name="windows" spec="~5.0.0" />
 
     <!-- Platform Specific Settings -->
diff --git a/src/android/build-extras.gradle b/src/android/build-extras.gradle
index e7dd50572..c90145418 100644
--- a/src/android/build-extras.gradle
+++ b/src/android/build-extras.gradle
@@ -1,5 +1,6 @@
 ext {
   ANDROID_SUPPORT_V4_VERSION = '26.1.0'
+  ANDROID_SUPPORT_ANNOTATIONS_VERSION = '26.1.0'
 }
 
 configurations.all {

From 1b0541a7b5746c0ef2eae602695bc816cab1b0dc Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Sat, 22 Sep 2018 22:22:06 -0700
Subject: [PATCH 07/15] Return error from Shapeshift when pairs are
 unavailable.

---
 src/js/services/shapeShiftApiService.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/js/services/shapeShiftApiService.js b/src/js/services/shapeShiftApiService.js
index cc5fb0792..92564464a 100644
--- a/src/js/services/shapeShiftApiService.js
+++ b/src/js/services/shapeShiftApiService.js
@@ -23,6 +23,13 @@ var ShapeShift = (function() {
                 if (xmlhttp.status == 200) {
                     var parsedResponse = JP(xmlhttp.responseText);
                     cb.apply(null, [parsedResponse]);
+                } else if (xmlhttp.status === 500) {
+                    var parsedResponse = JP(xmlhttp.responseText);
+                    if (typeof parsedResponse.error === 'string') {
+                        cb.apply(null, [parsedResponse]);
+                    } else {
+                        cb.apply(null, [new Error('Request Failed')]);
+                    }
                 } else {
                     cb.apply(null, [new Error('Request Failed')])
                 }

From 6452a0c7f4797a7321b58f4bff2ef72a54c01dda Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Sun, 23 Sep 2018 13:06:36 -0700
Subject: [PATCH 08/15] Handling JSON exception.

---
 src/js/services/shapeShiftApiService.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/js/services/shapeShiftApiService.js b/src/js/services/shapeShiftApiService.js
index 92564464a..67e6f23de 100644
--- a/src/js/services/shapeShiftApiService.js
+++ b/src/js/services/shapeShiftApiService.js
@@ -23,15 +23,17 @@ var ShapeShift = (function() {
                 if (xmlhttp.status == 200) {
                     var parsedResponse = JP(xmlhttp.responseText);
                     cb.apply(null, [parsedResponse]);
-                } else if (xmlhttp.status === 500) {
-                    var parsedResponse = JP(xmlhttp.responseText);
-                    if (typeof parsedResponse.error === 'string') {
-                        cb.apply(null, [parsedResponse]);
-                    } else {
-                        cb.apply(null, [new Error('Request Failed')]);
-                    }
                 } else {
-                    cb.apply(null, [new Error('Request Failed')])
+                    var cbResponse = new Error('Request Failed');
+                    if (xmlhttp.status === 500) {
+                        try {
+                            var errorResponse = JSON.parse(xmlhttp.responseText);
+                            if (typeof errorResponse.error === 'string') {
+                                cbResponse = errorResponse;
+                            }
+                        } catch (e) { /* nop */ }
+                    }
+                    cb.apply(null, [cbResponse]);
                 }
             }
         };

From babdc8a13bb52474bd79d5433bc5a37f10293cd2 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Sun, 23 Sep 2018 20:14:42 -0700
Subject: [PATCH 09/15] Restored production setting for page size.

---
 src/js/services/wallet-history.service.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/services/wallet-history.service.js b/src/js/services/wallet-history.service.js
index 5cb08e6ee..a0b36288d 100644
--- a/src/js/services/wallet-history.service.js
+++ b/src/js/services/wallet-history.service.js
@@ -7,8 +7,8 @@
     .factory('walletHistoryService', walletHistoryService);
     
     function walletHistoryService(configService, storageService, lodash, $log, txFormatService) {
-      //var PAGE_SIZE = 50;
-      var PAGE_SIZE = 20; // For dev only
+      var PAGE_SIZE = 50;
+      //var PAGE_SIZE = 20; // For dev only
       // How much to overlap on each end of the page, for mitigating inconsistent sort order.
       var PAGE_OVERLAP_FRACTION = 0.2;
       var PAGE_OVERLAP = Math.floor(PAGE_SIZE * PAGE_OVERLAP_FRACTION);

From 8f8027d573832c100e4293f9166bdd8a1cbb290a Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Sun, 23 Sep 2018 20:56:15 -0700
Subject: [PATCH 10/15] Reverse out bugfix.

---
 src/js/services/shapeShiftApiService.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/js/services/shapeShiftApiService.js b/src/js/services/shapeShiftApiService.js
index 67e6f23de..a90e587d4 100644
--- a/src/js/services/shapeShiftApiService.js
+++ b/src/js/services/shapeShiftApiService.js
@@ -24,16 +24,7 @@ var ShapeShift = (function() {
                     var parsedResponse = JP(xmlhttp.responseText);
                     cb.apply(null, [parsedResponse]);
                 } else {
-                    var cbResponse = new Error('Request Failed');
-                    if (xmlhttp.status === 500) {
-                        try {
-                            var errorResponse = JSON.parse(xmlhttp.responseText);
-                            if (typeof errorResponse.error === 'string') {
-                                cbResponse = errorResponse;
-                            }
-                        } catch (e) { /* nop */ }
-                    }
-                    cb.apply(null, [cbResponse]);
+                    cb.apply(null, [new Error('Request Failed')]);
                 }
             }
         };

From d2178d670f2949f8c89164bdc7e94ed44ce31ecf Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Sun, 23 Sep 2018 21:05:26 -0700
Subject: [PATCH 11/15] Fix identification of BitPay.

---
 src/js/services/send-flow.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/services/send-flow.service.js b/src/js/services/send-flow.service.js
index e8be2e487..babf5096a 100644
--- a/src/js/services/send-flow.service.js
+++ b/src/js/services/send-flow.service.js
@@ -52,7 +52,7 @@ angular
                 // Detect some merchant that we know
                 if (payProData.memo.indexOf('eGifter') > -1) {
                   name = 'eGifter'
-                } else if (paymentUrl.indexOf('https://bitpay.com') > -1) {
+                } else if (payProData.url.indexOf('https://bitpay.com') > -1) {
                   name = 'BitPay';
                 }
 

From fc5f6cfa65f6459fb2a7f069f6069f052ed61d77 Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Tue, 2 Oct 2018 14:55:31 +0200
Subject: [PATCH 12/15] Remove wallet preferences from App Settings and change
 the route to be able to use inside wallet Details (within tab-home)

---
 src/js/controllers/preferences.js             | 19 ++----------
 .../controllers/wallet-details.controller.js  | 13 ++-------
 src/js/routes.js                              | 29 +++++++++----------
 www/views/tab-settings.html                   | 24 +++++++--------
 www/views/walletDetails.html                  |  2 +-
 5 files changed, 31 insertions(+), 56 deletions(-)

diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index f3ccb46fe..e79a9063b 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -4,7 +4,6 @@ angular.module('copayApp.controllers').controller('preferencesController',
   function($scope, $rootScope, $state, $timeout, $log, $ionicHistory, $ionicPlatform, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) {
     var wallet;
     var walletId;
-    var backToDetails = false;
 
     $scope.hiddenBalanceChange = function() {
       var opts = {
@@ -84,7 +83,6 @@ angular.module('copayApp.controllers').controller('preferencesController',
     };
 
     $scope.$on("$ionicView.beforeEnter", function(event, data) {
-      backToDetails = data.stateParams.backToDetails;
       wallet = profileService.getWallet(data.stateParams.walletId);
       walletId = wallet.credentials.walletId;
       $scope.wallet = wallet;
@@ -120,19 +118,6 @@ angular.module('copayApp.controllers').controller('preferencesController',
     });
 
     $scope.goBack = function() {
-      if (backToDetails) {
-        $ionicHistory.nextViewOptions({disableAnimate: true});
-        $state.go('tabs.home').then(function () {
-          $ionicHistory.clearHistory();
-          $state.go('tabs.wallet', {'walletId': wallet.id});
-        });
-      } else {
-        $ionicHistory.goBack();
-      }
+      $ionicHistory.goBack();
     };
-
-    $ionicPlatform.registerBackButtonAction(function (event) {
-      event.preventDefault();
-      $scope.goBack()
-    }, 1000);
-  });
+});
diff --git a/src/js/controllers/wallet-details.controller.js b/src/js/controllers/wallet-details.controller.js
index 6339d555f..82f8dc5b1 100644
--- a/src/js/controllers/wallet-details.controller.js
+++ b/src/js/controllers/wallet-details.controller.js
@@ -115,17 +115,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     });
   };
 
-  $scope.openSettings = function() {
-    $ionicHistory.nextViewOptions({
-      disableAnimate: true,
-    });
-    $state.go('tabs.settings').then(function () {
-      $ionicHistory.clearHistory();
-      $ionicHistory.nextViewOptions({
-        disableAnimate: true,
-      });
-      $state.go('tabs.preferences', {'walletId': $scope.wallet.id, 'backToDetails': true});
-    });
+  $scope.openWalletSettings = function() {
+    $state.go('tabs.preferences', {'walletId': $scope.wallet.id, 'backToDetails': true});
   };
 
   $scope.openSearchModal = function() {
diff --git a/src/js/routes.js b/src/js/routes.js
index fde04b70c..a0bac3576 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -526,9 +526,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
        */
 
       .state('tabs.preferences', {
-        url: '/preferences/:walletId/:backToDetails',
+        url: '/preferences/:walletId',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'preferencesController',
             templateUrl: 'views/preferences.html'
           }
@@ -537,7 +537,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.preferencesAlias', {
         url: '/preferencesAlias',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'preferencesAliasController',
             templateUrl: 'views/preferencesAlias.html'
           }
@@ -546,7 +546,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.preferencesColor', {
         url: '/preferencesColor',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'preferencesColorController',
             templateUrl: 'views/preferencesColor.html'
           }
@@ -555,7 +555,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.backupWarning', {
         url: '/backupWarning/:from',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'backupWarningController',
             templateUrl: 'views/backupWarning.html'
           }
@@ -564,7 +564,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.backup', {
         url: '/backup',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'backupController',
             templateUrl: 'views/backup.html'
           }
@@ -573,7 +573,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.preferencesAdvanced', {
         url: '/preferencesAdvanced',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'preferencesAdvancedController',
             templateUrl: 'views/preferencesAdvanced.html'
           }
@@ -582,7 +582,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.information', {
         url: '/information',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'preferencesInformation',
             templateUrl: 'views/preferencesInformation.html'
           }
@@ -591,7 +591,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.export', {
         url: '/export',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'exportController',
             templateUrl: 'views/export.html'
           }
@@ -600,7 +600,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.preferencesBwsUrl', {
         url: '/preferencesBwsUrl',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'preferencesBwsUrlController',
             templateUrl: 'views/preferencesBwsUrl.html'
           }
@@ -609,7 +609,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.preferencesHistory', {
         url: '/preferencesHistory',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'preferencesHistory',
             templateUrl: 'views/preferencesHistory.html'
           }
@@ -618,7 +618,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.preferencesExternal', {
         url: '/preferencesExternal',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'preferencesExternalController',
             templateUrl: 'views/preferencesExternal.html'
           }
@@ -627,17 +627,16 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
       .state('tabs.preferences.delete', {
         url: '/delete',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'preferencesDeleteWalletController',
             templateUrl: 'views/preferencesDeleteWallet.html'
           }
         }
       })
-
       .state('tabs.preferencesCash.scan', {
         url: '/cashScan',
         views: {
-          'tab-settings@tabs': {
+          'tab-home@tabs': {
             controller: 'cashScanController',
             templateUrl: 'views/cashScan.html'
           }
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index 3091e63a6..dd379903d 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -100,21 +100,21 @@
         <i class="icon bp-arrow-right"></i>
       </a>
 
-      <div class="item item-divider" ng-show="walletsBch[0]">{{'Bitcoin Cash (BCH)' | translate}}</div>
+      <!--<div class="item item-divider" ng-show="walletsBch[0]">{{'Bitcoin Cash (BCH)' | translate}}</div>-->
 
-      <a class="item item-icon-left item-icon-right" href
-           ui-sref="tabs.preferences({'walletId': wallet.id})"
-           ng-repeat="wallet in walletsBch track by $index">
-        <span ng-include="'views/includes/walletListSettings.html'"></span>
-      </a>
+      <!--<a class="item item-icon-left item-icon-right" href-->
+           <!--ui-sref="tabs.preferences({'walletId': wallet.id})"-->
+           <!--ng-repeat="wallet in walletsBch track by $index">-->
+        <!--<span ng-include="'views/includes/walletListSettings.html'"></span>-->
+      <!--</a>-->
 
-      <div class="item item-divider" ng-show="walletsBtc[0]">{{'Bitcoin Core (BTC)' | translate}}</div>
+      <!--<div class="item item-divider" ng-show="walletsBtc[0]">{{'Bitcoin Core (BTC)' | translate}}</div>-->
 
-      <a class="item item-icon-left item-icon-right" href
-           ui-sref="tabs.preferences({'walletId': wallet.id})"
-           ng-repeat="wallet in walletsBtc track by $index">
-        <span ng-include="'views/includes/walletListSettings.html'"></span>
-      </a>
+      <!--<a class="item item-icon-left item-icon-right" href-->
+           <!--ui-sref="tabs.preferences({'walletId': wallet.id})"-->
+           <!--ng-repeat="wallet in walletsBtc track by $index">-->
+        <!--<span ng-include="'views/includes/walletListSettings.html'"></span>-->
+      <!--</a>-->
 
       <div class="item item-divider" ng-show="bitpayAccounts || buyAndSellServices[0]">{{'Integrations' | translate}}</div>
 
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index eb758b707..6a28a2972 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -8,7 +8,7 @@
       <button class="button back-button" ng-click="startSearch(); openSearchModal()" ng-if="txHistory.length > 4">
         <i class="icon ion-ios-search-strong tx-search"></i>
       </button>
-      <button class="button" ng-click="openSettings();">
+      <button class="button" ng-click="openWalletSettings();">
         <i class="icon ion-android-settings"></i>
       </button>
     </ion-nav-buttons>

From 2cbf6ef50ef9d274467f140dbf21d90875a06abe Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Tue, 2 Oct 2018 15:00:11 +0200
Subject: [PATCH 13/15] Removed some unused previous situation code.

---
 src/js/controllers/preferences.js               |  2 +-
 src/js/controllers/wallet-details.controller.js |  4 ----
 www/views/preferences.html                      |  2 +-
 www/views/tab-settings.html                     | 16 ----------------
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index e79a9063b..f5f45a481 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesController',
-  function($scope, $rootScope, $state, $timeout, $log, $ionicHistory, $ionicPlatform, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) {
+  function($scope, $rootScope, $timeout, $log, $ionicHistory, configService, profileService, fingerprintService, walletService, platformInfo, externalLinkService, gettextCatalog, $ionicNavBarDelegate) {
     var wallet;
     var walletId;
 
diff --git a/src/js/controllers/wallet-details.controller.js b/src/js/controllers/wallet-details.controller.js
index 82f8dc5b1..429420741 100644
--- a/src/js/controllers/wallet-details.controller.js
+++ b/src/js/controllers/wallet-details.controller.js
@@ -115,10 +115,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     });
   };
 
-  $scope.openWalletSettings = function() {
-    $state.go('tabs.preferences', {'walletId': $scope.wallet.id, 'backToDetails': true});
-  };
-
   $scope.openSearchModal = function() {
     $scope.color = $scope.wallet.color;
     $scope.isSearching = true;
diff --git a/www/views/preferences.html b/www/views/preferences.html
index a25270a35..3ee68dc11 100644
--- a/www/views/preferences.html
+++ b/www/views/preferences.html
@@ -3,7 +3,7 @@
     <ion-nav-title>
       {{'Wallet Settings'|translate}}
     </ion-nav-title>
-    <ion-nav-back-button ng-click="goBack()">
+    <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index dd379903d..7b2578383 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -100,22 +100,6 @@
         <i class="icon bp-arrow-right"></i>
       </a>
 
-      <!--<div class="item item-divider" ng-show="walletsBch[0]">{{'Bitcoin Cash (BCH)' | translate}}</div>-->
-
-      <!--<a class="item item-icon-left item-icon-right" href-->
-           <!--ui-sref="tabs.preferences({'walletId': wallet.id})"-->
-           <!--ng-repeat="wallet in walletsBch track by $index">-->
-        <!--<span ng-include="'views/includes/walletListSettings.html'"></span>-->
-      <!--</a>-->
-
-      <!--<div class="item item-divider" ng-show="walletsBtc[0]">{{'Bitcoin Core (BTC)' | translate}}</div>-->
-
-      <!--<a class="item item-icon-left item-icon-right" href-->
-           <!--ui-sref="tabs.preferences({'walletId': wallet.id})"-->
-           <!--ng-repeat="wallet in walletsBtc track by $index">-->
-        <!--<span ng-include="'views/includes/walletListSettings.html'"></span>-->
-      <!--</a>-->
-
       <div class="item item-divider" ng-show="bitpayAccounts || buyAndSellServices[0]">{{'Integrations' | translate}}</div>
 
       <a class=" item item-icon-left item-icon-right"

From 9b7827236cd9dcab4853d9d58d4413174413d21a Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Tue, 2 Oct 2018 15:02:04 +0200
Subject: [PATCH 14/15] remove unused goBack function

---
 src/js/controllers/preferences.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index f5f45a481..927a113e5 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -116,8 +116,4 @@ angular.module('copayApp.controllers').controller('preferencesController',
     $scope.$on("$ionicView.enter", function(event, data) {
       $ionicNavBarDelegate.showBar(true);
     });
-
-    $scope.goBack = function() {
-      $ionicHistory.goBack();
-    };
 });

From 3f359f033e56c405aea5265a37965d74cd2a94d5 Mon Sep 17 00:00:00 2001
From: Sebastiaan Pasma <sebastiaan@enkodo.nl>
Date: Tue, 2 Oct 2018 15:48:50 +0200
Subject: [PATCH 15/15] openWalletSettings-function + refactor of
 addresses-route.. Removed unused paths.

---
 src/js/controllers/addresses.js               | 13 ++----
 .../preferencesAdvancedController.js          |  2 +-
 .../controllers/wallet-details.controller.js  |  8 +++-
 src/js/routes.js                              | 44 ++++---------------
 www/views/walletDetails.html                  |  2 +-
 5 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js
index a62ba5fd8..5750fdc23 100644
--- a/src/js/controllers/addresses.js
+++ b/src/js/controllers/addresses.js
@@ -158,14 +158,7 @@ angular.module('copayApp.controllers').controller('addressesController', functio
   };
 
   $scope.viewAllAddresses = function() {
-    var fromView = $ionicHistory.currentStateName();
-    var path;
-    if (fromView.indexOf('settings') !== -1) {
-      path = 'tabs.settings.allAddresses';
-    } else {
-      path = 'tabs.wallet.allAddresses';
-    }
-    $state.go(path, {
+    $state.go('tabs.wallet.allAddresses', {
       walletId: $scope.wallet.id
     });
   };
@@ -209,7 +202,7 @@ angular.module('copayApp.controllers').controller('addressesController', functio
         return '';
       }
       return dateObj.toJSON();
-    };
+    }
 
     ongoingProcess.set('sendingByEmail', true);
     $timeout(function() {
@@ -240,7 +233,7 @@ angular.module('copayApp.controllers').controller('addressesController', functio
   };
 
   $scope.$on("$ionicView.afterEnter", function(event, data) {
-    $scope.allAddressesView = data.stateName == 'tabs.receive.allAddresses' ? true : false;
+    $scope.allAddressesView = data.stateName === 'tabs.wallet.allAddresses';
     if (!isCachedWallet($stateParams.walletId)) $scope.init();
     else $log.debug('Addresses cached for Wallet:', $stateParams.walletId);
   });
diff --git a/src/js/controllers/preferencesAdvancedController.js b/src/js/controllers/preferencesAdvancedController.js
index ddc30bdf0..6987be694 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.settings.addresses', {
+    $state.go('tabs.preferences.addresses', {
       walletId: $stateParams.walletId,
     });
   };
diff --git a/src/js/controllers/wallet-details.controller.js b/src/js/controllers/wallet-details.controller.js
index 429420741..d2aef1f76 100644
--- a/src/js/controllers/wallet-details.controller.js
+++ b/src/js/controllers/wallet-details.controller.js
@@ -15,7 +15,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     updatingTxHistory: false,
     fetchedAllTxHistory: false,
     //updateTxHistoryError: false
-    updateTxHistoryFailed: false
+    updateTxHistoryFailed: false,
+
+    openWalletSettings: openWalletSettings
   };
 
   // Need flag for when to allow infinite scroll at bottom
@@ -115,6 +117,10 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     });
   };
 
+  function openWalletSettings() {
+    $state.go('tabs.preferences', {'walletId': $scope.wallet.id, 'backToDetails': true});
+  }
+
   $scope.openSearchModal = function() {
     $scope.color = $scope.wallet.color;
     $scope.isSearching = true;
diff --git a/src/js/routes.js b/src/js/routes.js
index a0bac3576..46ca8862e 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -194,16 +194,6 @@ 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: {
@@ -588,6 +578,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           }
         }
       })
+      .state('tabs.preferences.addresses', { /* Addresses */
+        url: '/addresses/:walletId/:toAddress',
+        views: {
+          'tab-home@tabs': {
+            controller: 'addressesController',
+            templateUrl: 'views/addresses.html'
+          }
+        }
+      })
       .state('tabs.preferences.export', {
         url: '/export',
         views: {
@@ -694,31 +693,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
 
-      /*
-       *
-       * Addresses
-       *
-       */
-
-      .state('tabs.settings.addresses', {
-        url: '/addresses/:walletId/:toAddress',
-        views: {
-          'tab-settings@tabs': {
-            controller: 'addressesController',
-            templateUrl: 'views/addresses.html'
-          }
-        }
-      })
-      .state('tabs.settings.allAddresses', {
-        url: '/allAddresses/:walletId',
-        views: {
-          'tab-settings@tabs': {
-            controller: 'addressesController',
-            templateUrl: 'views/allAddresses.html'
-          }
-        }
-      })
-
       /*
        *
        * Request Specific amount
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 6a28a2972..04e4bcc7a 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -8,7 +8,7 @@
       <button class="button back-button" ng-click="startSearch(); openSearchModal()" ng-if="txHistory.length > 4">
         <i class="icon ion-ios-search-strong tx-search"></i>
       </button>
-      <button class="button" ng-click="openWalletSettings();">
+      <button class="button" ng-click="vm.openWalletSettings();">
         <i class="icon ion-android-settings"></i>
       </button>
     </ion-nav-buttons>