From b997d6ff9c3a361c367cdd8808667f64d0901673 Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Wed, 20 Sep 2017 11:58:55 -0300
Subject: [PATCH 1/4] ref backup view for unavailable recovery phrase - fix
 translate tag

---
 src/sass/views/wallet-backup-phrase.scss | 18 ++++++++++++++++++
 www/views/backup.html                    | 13 ++++++++++---
 www/views/cashScan.html                  |  2 +-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/sass/views/wallet-backup-phrase.scss b/src/sass/views/wallet-backup-phrase.scss
index de3879b0d..c012b09f2 100644
--- a/src/sass/views/wallet-backup-phrase.scss
+++ b/src/sass/views/wallet-backup-phrase.scss
@@ -1,4 +1,22 @@
 #wallet-backup-phrase {
+  .comment {
+    color: #667;
+    font-size: 0.9em;
+  }
+  .item {
+    color: $v-dark-gray;
+    padding-top: 1.3rem;
+    padding-bottom: 1.3rem;
+    border: none;
+  }
+  .heading {
+    font-size: 17px;
+    color: $v-dark-gray;
+    margin: 1rem 0;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    border: none;
+  }
   h3 {
     padding: 15px;
   }
diff --git a/www/views/backup.html b/www/views/backup.html
index cfaee0902..c636bf060 100644
--- a/www/views/backup.html
+++ b/www/views/backup.html
@@ -7,9 +7,16 @@
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
-    <div class="ng-hide" ng-show="deleted">
-        <div class="phrase-unavailable" translate>Wallet recovery phrase not available.</div>
-        <div class="phrase-unavailable-instructions" translate>You can still export it from Advanced &gt; Export.</div>
+    <div class="ng-hide list card" ng-show="deleted">
+      <div class="item heading">
+        <span translate>Wallet recovery phrase not available</span>
+      </div>
+      <div class="item">
+        <span class="comment" translate>You can still export it from Advanced &gt; Export.</span>
+      </div>
+    </div>
+    <div class="item">
+      <span class="comment" ng-if="wallet.coin == 'bch'" translate>Note: if this BCH wallet was duplicated from a BTC wallet, they share the same recovery phrase.</span>
     </div>
     <!--
       ## STEP 1
diff --git a/www/views/cashScan.html b/www/views/cashScan.html
index 114bc208a..e11c39172 100644
--- a/www/views/cashScan.html
+++ b/www/views/cashScan.html
@@ -48,7 +48,7 @@
     </div>
 
     <div class="item">
-      <span class="comment">Some of you wallets are not eligible for Bitcon Cash support because there where created before Copay v1.2. Please use our recovery tool to access your Bitcoin Cash balance for those wallets</span>
+      <span class="comment" translate>Some of you wallets are not eligible for Bitcon Cash support because there where created before Copay v1.2. Please use our recovery tool to access your Bitcoin Cash balance for those wallets</span>
     </div>
   </div>
 </div>

From 5867edfa26e506af7e0d02d4596508350eab0f28 Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Wed, 20 Sep 2017 17:24:45 -0300
Subject: [PATCH 2/4] list available and unavailable wallets properly

---
 src/js/controllers/cashScan.js | 54 +++++++++++++++++++++++++++++-----
 www/views/cashScan.html        | 39 +++++++++++++++++++-----
 2 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/src/js/controllers/cashScan.js b/src/js/controllers/cashScan.js
index f00ed3ebf..bf0fbeb51 100644
--- a/src/js/controllers/cashScan.js
+++ b/src/js/controllers/cashScan.js
@@ -45,19 +45,57 @@ angular.module('copayApp.controllers').controller('cashScanController',
         return !xPubKeyIndex[w.credentials.xPubKey];
       });
 
-      // Filter out non BIP44 wallets
-      var wallets = lodash.filter(walletsBTC, function(w) {
-        return w.credentials.derivationStrategy == 'BIP44'
-      });
+      var availableWallets = [];
+      var nonEligibleWallets = [];
 
-      $scope.wallets = wallets;
-      $scope.nonBIP44Wallets = lodash.filter(walletsBTC, function(w) {
+      function addToNonEligibleWallets(wallets) {
+        if (!wallets) return;
+        lodash.each(wallets, function(w) {
+          nonEligibleWallets.push(w);
+        });
+      };
+
+      // Filter out non BIP44 wallets
+      var nonBIP44Wallets = lodash.filter(walletsBTC, function(w) {
         return w.credentials.derivationStrategy != 'BIP44';
       });
 
-      var i = wallets.length;
+      if (!lodash.isEmpty(nonBIP44Wallets)) {
+        availableWallets = lodash.filter(walletsBTC, function(w) {
+          return w.credentials.derivationStrategy == 'BIP44';
+        });
+        addToNonEligibleWallets(nonBIP44Wallets);
+      }
+
+      // Filter out read only wallets
+      var readOnlyWallets = lodash.filter(availableWallets, function(w) {
+        return !w.canSign();
+      });
+
+      if (!lodash.isEmpty(readOnlyWallets)) {
+        availableWallets = lodash.filter(availableWallets, function(w) {
+          return w.canSign();
+        });
+        addToNonEligibleWallets(readOnlyWallets);
+      }
+
+      // Filter out non backed up wallets
+      $scope.nonBackedUpWallets = lodash.filter(availableWallets, function(w) {
+        return w.needsBackup;
+      });
+
+      if (!lodash.isEmpty($scope.nonBackedUpWallets)) {
+        availableWallets = lodash.filter(availableWallets, function(w) {
+          return !w.needsBackup;
+        });
+      }
+
+      $scope.nonEligibleWallets = nonEligibleWallets;
+      $scope.availableWallets = availableWallets;
+
+      var i = availableWallets.length;
       var j = 0;
-      lodash.each(wallets, function(wallet) {
+      lodash.each(availableWallets, function(wallet) {
         walletService.getBalance(wallet, {
           coin: 'bch'
         }, function(err, balance) {
diff --git a/www/views/cashScan.html b/www/views/cashScan.html
index e11c39172..551e11a18 100644
--- a/www/views/cashScan.html
+++ b/www/views/cashScan.html
@@ -10,7 +10,7 @@
   <ion-content>
 
 <div class="list card">
-  <div class="item" ng-if="(!wallets || !wallets[0]) && !nonBIP44Wallets[0]">
+  <div class="item" ng-if="(!availableWallets || !availableWallets[0]) && !nonEligibleWallets[0]">
     <span class="assertive" translate>No wallets eligible for Bitcoin Cash support</span>
   </div>
 
@@ -19,11 +19,13 @@
   </div>
 
   <div class="item heading">
-    <span translate>BTC Wallets</span>
+    <span translate>BTC wallets</span>
   </div>
 
-  <div ng-repeat="wallet in wallets track by $index" class="item wallet supported">
-    <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
+  <div ng-repeat="wallet in availableWallets track by $index" class="item wallet supported">
+    <i class="icon big-icon-svg">
+      <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
+    </i>
     <div class="wallet-content">
       <div>{{wallet.name || wallet.id}}</div>
       <div class="balanced">{{wallet.bchBalance  || ('Checking...' | translate)}} </div>
@@ -35,20 +37,41 @@
     </div>
   </div>
 
-  <div ng-if="nonBIP44Wallets[0]">
+  <div ng-if="nonBackedUpWallets[0]">
+    <div class="item item-divider"></div>
+
+    <div class="item heading">
+      <span translate>Backup needed</span>
+    </div>
+
+    <div ng-repeat="wallet in nonBackedUpWallets track by $index" class="item item-sub item-icon-left item-big-icon-left item-button-right wallet">
+      <i class="icon big-icon-svg">
+        <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': walletDisabled}" class="bg wallet"/>
+      </i>
+      <span class="text-disabled">{{wallet.name || wallet.id}}</span>
+    </div>
+
+    <div class="item">
+      <span class="comment" translate>Complete the backup process to use this option</span>
+    </div>
+  </div>
+
+  <div ng-if="nonEligibleWallets[0]">
     <div class="item item-divider"></div>
 
     <div class="item heading">
       <span translate>Non eligible BTC wallets</span>
     </div>
 
-    <div ng-repeat="wallet in nonBIP44Wallets track by $index" class="item item-sub item-icon-left item-big-icon-left item-button-right wallet">
-      <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
+    <div ng-repeat="wallet in nonEligibleWallets track by $index" class="item item-sub item-icon-left item-big-icon-left item-button-right wallet">
+      <i class="icon big-icon-svg">
+        <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': walletDisabled}" class="bg wallet"/>
+      </i>
       <span class="text-disabled">{{wallet.name || wallet.id}}</span>
     </div>
 
     <div class="item">
-      <span class="comment" translate>Some of you wallets are not eligible for Bitcon Cash support because there where created before Copay v1.2. Please use our recovery tool to access your Bitcoin Cash balance for those wallets</span>
+      <span class="comment" translate>Some of you wallets are not eligible for Bitcon Cash support because both there where created before Copay v1.2 or are not available to sign. Please use our recovery tool to access your Bitcoin Cash balance for those wallets</span>
     </div>
   </div>
 </div>

From dc5d24d010c3311cbb725dcd0efc97d1d18cf269 Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Wed, 20 Sep 2017 17:35:55 -0300
Subject: [PATCH 3/4] ref wallet filters - add recovery tool external link

---
 src/js/controllers/cashScan.js | 70 ++++++++++++----------------------
 src/sass/views/cashScan.scss   |  4 ++
 www/views/cashScan.html        | 53 ++++++++++---------------
 3 files changed, 48 insertions(+), 79 deletions(-)

diff --git a/src/js/controllers/cashScan.js b/src/js/controllers/cashScan.js
index bf0fbeb51..85fddf239 100644
--- a/src/js/controllers/cashScan.js
+++ b/src/js/controllers/cashScan.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('cashScanController',
-  function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, $ionicHistory, $window, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, txFormatService, bwcError, pushNotificationsService, bwcService) {
+  function($rootScope, $timeout, $scope, $state, $ionicHistory, gettextCatalog, lodash, ongoingProcess, profileService, walletService, $log, txFormatService, bwcError, pushNotificationsService, bwcService, externalLinkService) {
     var wallet;
     var errors = bwcService.getErrors();
     $scope.error = null;
@@ -11,6 +11,16 @@ angular.module('copayApp.controllers').controller('cashScanController',
       updateAllWallets();
     });
 
+    $scope.openRecoveryToolLink = function() {
+      var url = 'https://bitpay.github.io/copay-recovery/';
+      var optIn = true;
+      var title = null;
+      var message = gettextCatalog.getString('Open the recovery tool.');
+      var okText = gettextCatalog.getString('Open');
+      var cancelText = gettextCatalog.getString('Go Back');
+      externalLinkService.open(url, optIn, title, message, okText, cancelText);
+    };
+
     var goHome = function() {
       $ionicHistory.nextViewOptions({
         disableAnimate: true,
@@ -29,11 +39,6 @@ angular.module('copayApp.controllers').controller('cashScanController',
         network: 'livenet'
       });
 
-      if (lodash.isEmpty(walletsBTC)) {
-        goHome();
-        return;
-      }
-
       // Filter out already duplicated wallets
       var walletsBCH = profileService.getWallets({
         coin: 'bch',
@@ -48,50 +53,23 @@ angular.module('copayApp.controllers').controller('cashScanController',
       var availableWallets = [];
       var nonEligibleWallets = [];
 
-      function addToNonEligibleWallets(wallets) {
-        if (!wallets) return;
-        lodash.each(wallets, function(w) {
+      lodash.each(walletsBTC, function(w) {
+        if (w.credentials.derivationStrategy != 'BIP44') {
+          w.excludeReason = gettextCatalog.getString('Non BIP44 wallet');
           nonEligibleWallets.push(w);
-        });
-      };
-
-      // Filter out non BIP44 wallets
-      var nonBIP44Wallets = lodash.filter(walletsBTC, function(w) {
-        return w.credentials.derivationStrategy != 'BIP44';
+        } else if (!w.canSign()) {
+          w.excludeReason = gettextCatalog.getString('Read only wallet');
+          nonEligibleWallets.push(w);
+        } else if (w.needsBackup) {
+          w.excludeReason = gettextCatalog.getString('Backup needed');
+          nonEligibleWallets.push(w);
+        } else {
+          availableWallets.push(w);
+        }
       });
 
-      if (!lodash.isEmpty(nonBIP44Wallets)) {
-        availableWallets = lodash.filter(walletsBTC, function(w) {
-          return w.credentials.derivationStrategy == 'BIP44';
-        });
-        addToNonEligibleWallets(nonBIP44Wallets);
-      }
-
-      // Filter out read only wallets
-      var readOnlyWallets = lodash.filter(availableWallets, function(w) {
-        return !w.canSign();
-      });
-
-      if (!lodash.isEmpty(readOnlyWallets)) {
-        availableWallets = lodash.filter(availableWallets, function(w) {
-          return w.canSign();
-        });
-        addToNonEligibleWallets(readOnlyWallets);
-      }
-
-      // Filter out non backed up wallets
-      $scope.nonBackedUpWallets = lodash.filter(availableWallets, function(w) {
-        return w.needsBackup;
-      });
-
-      if (!lodash.isEmpty($scope.nonBackedUpWallets)) {
-        availableWallets = lodash.filter(availableWallets, function(w) {
-          return !w.needsBackup;
-        });
-      }
-
-      $scope.nonEligibleWallets = nonEligibleWallets;
       $scope.availableWallets = availableWallets;
+      $scope.nonEligibleWallets = nonEligibleWallets;
 
       var i = availableWallets.length;
       var j = 0;
diff --git a/src/sass/views/cashScan.scss b/src/sass/views/cashScan.scss
index 5ae76ef53..f13e1b390 100644
--- a/src/sass/views/cashScan.scss
+++ b/src/sass/views/cashScan.scss
@@ -36,4 +36,8 @@
     right: 15px;
     padding-top: .5rem;
   }
+
+  a {
+    cursor: pointer;
+  }
 }
diff --git a/www/views/cashScan.html b/www/views/cashScan.html
index 551e11a18..ccf2a4ae0 100644
--- a/www/views/cashScan.html
+++ b/www/views/cashScan.html
@@ -10,49 +10,34 @@
   <ion-content>
 
 <div class="list card">
-  <div class="item" ng-if="(!availableWallets || !availableWallets[0]) && !nonEligibleWallets[0]">
-    <span class="assertive" translate>No wallets eligible for Bitcoin Cash support</span>
+  <div ng-if="!availableWallets[0]">
+    <div class="item">
+      <span class="assertive" translate>No wallets eligible for Bitcoin Cash support</span>
+    </div>
   </div>
 
   <div class="item" ng-if="error">
     <span class="assertive">{{error}}</span>
   </div>
 
-  <div class="item heading">
-    <span translate>BTC wallets</span>
-  </div>
-
-  <div ng-repeat="wallet in availableWallets track by $index" class="item wallet supported">
-    <i class="icon big-icon-svg">
-      <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
-    </i>
-    <div class="wallet-content">
-      <div>{{wallet.name || wallet.id}}</div>
-      <div class="balanced">{{wallet.bchBalance  || ('Checking...' | translate)}} </div>
-      <div class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1" translate>{{wallet.m}}-of-{{wallet.n}}</div>
-    </div>
-
-    <div class="duplicate-button">
-      <button ng-click="duplicate(wallet)" class="button button-small button-outline button-primary" translate>Duplicate for BCH</button>
-    </div>
-  </div>
-
-  <div ng-if="nonBackedUpWallets[0]">
-    <div class="item item-divider"></div>
-
+  <div ng-if="availableWallets[0]">
     <div class="item heading">
-      <span translate>Backup needed</span>
+      <span translate>BTC wallets</span>
     </div>
 
-    <div ng-repeat="wallet in nonBackedUpWallets track by $index" class="item item-sub item-icon-left item-big-icon-left item-button-right wallet">
+    <div ng-repeat="wallet in availableWallets track by $index" class="item wallet supported">
       <i class="icon big-icon-svg">
-        <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': walletDisabled}" class="bg wallet"/>
+        <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
       </i>
-      <span class="text-disabled">{{wallet.name || wallet.id}}</span>
-    </div>
+      <div class="wallet-content">
+        <div>{{wallet.name || wallet.id}}</div>
+        <div class="balanced">{{wallet.bchBalance  || ('Checking...' | translate)}} </div>
+        <div class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1" translate>{{wallet.m}}-of-{{wallet.n}}</div>
+      </div>
 
-    <div class="item">
-      <span class="comment" translate>Complete the backup process to use this option</span>
+      <div class="duplicate-button">
+        <button ng-click="duplicate(wallet)" class="button button-small button-outline button-primary" translate>Duplicate for BCH</button>
+      </div>
     </div>
   </div>
 
@@ -67,11 +52,13 @@
       <i class="icon big-icon-svg">
         <img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': walletDisabled}" class="bg wallet"/>
       </i>
-      <span class="text-disabled">{{wallet.name || wallet.id}}</span>
+      <div class="text-disabled">{{wallet.name || wallet.id}}</div>
+      <div class="text-disabled">{{wallet.excludeReason}}</div>
     </div>
 
     <div class="item">
-      <span class="comment" translate>Some of you wallets are not eligible for Bitcon Cash support because both there where created before Copay v1.2 or are not available to sign. Please use our recovery tool to access your Bitcoin Cash balance for those wallets</span>
+      <span class="comment" translate>Some of you wallets are not eligible for Bitcon Cash support because both there where created before Copay v1.2 or are not available to sign. To access the funds from these wallets please use our</span>
+      <a ng-click="openRecoveryToolLink()" translate>recovery tool.</a>
     </div>
   </div>
 </div>

From 341be3cef0ed148a44179e2881fbe7cd0195cdaa Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Thu, 21 Sep 2017 12:36:00 -0300
Subject: [PATCH 4/4] fix text note

---
 www/views/cashScan.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/views/cashScan.html b/www/views/cashScan.html
index ccf2a4ae0..64cfd083c 100644
--- a/www/views/cashScan.html
+++ b/www/views/cashScan.html
@@ -57,7 +57,7 @@
     </div>
 
     <div class="item">
-      <span class="comment" translate>Some of you wallets are not eligible for Bitcon Cash support because both there where created before Copay v1.2 or are not available to sign. To access the funds from these wallets please use our</span>
+      <span class="comment" translate>Some of your wallets are not eligible for Bitcoin Cash support. You can try to access BCH funds from these wallets using the</span>
       <a ng-click="openRecoveryToolLink()" translate>recovery tool.</a>
     </div>
   </div>