From 88b6e722f28f93d0464523029ac0334f8380e030 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 10 May 2017 12:31:40 -0300
Subject: [PATCH] Fix addresses view. Also show adddress cached if error occurs

---
 src/js/controllers/addresses.js   |  6 +++++-
 src/js/controllers/tab-receive.js |  2 +-
 www/views/addresses.html          | 10 +++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js
index f0525a517..b730646b5 100644
--- a/src/js/controllers/addresses.js
+++ b/src/js/controllers/addresses.js
@@ -84,7 +84,11 @@ angular.module('copayApp.controllers').controller('addressesController', functio
     walletService.getAddress($scope.wallet, true, function(err, addr) {
       if (err) {
         ongoingProcess.set('generatingNewAddress', false);
-        $scope.gapReached = true;
+        if (err.toString().match('MAIN_ADDRESS_GAP_REACHED')) {
+          $scope.gapReached = true;
+        } else {
+          popupService.showAlert(err);
+        }
         $timeout(function() {
           $scope.$digest();
         });
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index 8bc07ef07..3e9dd0aa7 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -23,7 +23,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
 
       if (err) {
         //Error is already formated
-        return popupService.showAlert(err);
+        popupService.showAlert(err);
       }
 
       $scope.addr = addr;
diff --git a/www/views/addresses.html b/www/views/addresses.html
index 6701b33b4..f0e8ca243 100644
--- a/www/views/addresses.html
+++ b/www/views/addresses.html
@@ -33,6 +33,11 @@
         <div class="item item-icon-right view-all" ng-if="viewAll.value" ng-click="viewAllAddresses()">
           <span translate>View All Addresses</span>
           <i class="icon ion-ios-arrow-thin-right"></i>
+        </div> 
+
+        <div class="item item-divider item-icon-right" ng-click="newAddress()">
+          <span translate>Unused Addresses</span>
+          <i class="icon ion-ios-plus-empty"></i>
         </div>
 
         <div ng-if="loading" class="updating">
@@ -47,11 +52,6 @@
         </div>
 
         <div ng-if="latestUnused[0]">
-          <div class="item item-divider item-icon-right" ng-click="newAddress()">
-            <span translate>Unused Addresses</span>
-            <i class="icon ion-ios-plus-empty"></i>
-          </div>
-
           <div class="box-error" ng-if="gapReached">
             <h5 translate>Unused Addresses Limit</h5>
             <p><span translate>The maximum number of consecutive unused addresses (20) has been reached. When one of your unused addresses receives a payment, a new address will be generated and shown in your Receive tab.</span>&nbsp<a ng-click="readMore()" ng-if="!showMore" translate>Read more</a></p>