From b564be7275d9231c2705f30985c467edd7d3af66 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 17 Nov 2016 13:30:52 -0300
Subject: [PATCH] remove next address button - add copy to clipboard - load
 list after transition

---
 src/js/controllers/addresses.js  |  2 +-
 src/js/services/walletService.js |  4 +---
 src/sass/views/addresses.scss    | 25 ++++++++++---------------
 src/sass/views/tab-receive.scss  |  2 ++
 www/views/addresses.html         |  6 +++---
 www/views/allAddresses.html      |  2 +-
 www/views/tab-receive.html       |  8 +-------
 7 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js
index 5b08ac0cd..e347d816a 100644
--- a/src/js/controllers/addresses.js
+++ b/src/js/controllers/addresses.js
@@ -111,7 +111,7 @@ angular.module('copayApp.controllers').controller('addressesController', functio
     });
   };
 
-  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+  $scope.$on("$ionicView.afterEnter", function(event, data) {
     config = configService.getSync().wallet.settings;
     unitToSatoshi = config.unitToSatoshi;
     satToUnit = 1 / unitToSatoshi;
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index 83e83a6a5..b00722c76 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -776,10 +776,8 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
   root.getMainAddresses = function(wallet, opts, cb) {
     opts = opts || {};
     opts.reverse = true;
-
     wallet.getMainAddresses(opts, function(err, addresses) {
-      if (err) return cb(err);
-      return cb(null, addresses);
+      return cb(err, addresses);
     });
   };
 
diff --git a/src/sass/views/addresses.scss b/src/sass/views/addresses.scss
index 4e3ed9106..a900f41b9 100644
--- a/src/sass/views/addresses.scss
+++ b/src/sass/views/addresses.scss
@@ -4,11 +4,6 @@
       padding: 0 1rem;
       margin: 1rem 0;
     }
-    &-heading {
-      font-size: 17px;
-      color: $dark-gray;
-      margin: 1rem 0;
-    }
     &-description {
       text-align: center;
       font-size: 15px;
@@ -20,10 +15,6 @@
         cursor: hand;
       }
     }
-    &-description-disabled {
-      color: cadetblue;
-      text-decoration: none;
-    }
     &-balance {
       margin-top: 4px;
       color: #5DD263;
@@ -32,15 +23,19 @@
       margin-top: 4px;
       color: #B8B8B8;
     }
-    .addr-title, .addr-value {
-      display: block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
   }
 
   .addr-list {
+    .big-icon-svg {
+      padding: 0 7px;
+      border-radius: 50%;
+      width: 40px;
+      height: 40px;
+      box-shadow: none;
+      background-repeat: no-repeat;
+      background-clip: padding-box;
+      background-size: 103%;
+    }
     .item {
       color: $dark-gray;
       padding-top: 1.3rem;
diff --git a/src/sass/views/tab-receive.scss b/src/sass/views/tab-receive.scss
index 6743b1363..ead483f40 100644
--- a/src/sass/views/tab-receive.scss
+++ b/src/sass/views/tab-receive.scss
@@ -86,6 +86,8 @@
     .bit-address {
       font-size: .8rem;
       // left:10%;
+      cursor: pointer;
+      cursor: hand;
       position: absolute;
       transition: all .15s ease;
       width:100%;
diff --git a/www/views/addresses.html b/www/views/addresses.html
index 81a3ebaf0..7756ff947 100644
--- a/www/views/addresses.html
+++ b/www/views/addresses.html
@@ -8,7 +8,7 @@
   <ion-content>
     <div class="addr-list">
       <div class="text-center padding size-42">
-        <i class="icon ion-ios-ionic-outline"></i>
+        <i class="icon ion-ios-ionic-outline big-icon-svg"></i>
       </div>
 
       <div class="addr-explanation">
@@ -36,7 +36,7 @@
             <p ng-if="showMore" translate>The restore process will stop when 20 addresses are generated in a row which contain no funds. To safely generate more addresses, make a payment to one of the unused addresses which has already been generated. <a ng-click="readMore()" translate>Read less</a></p>
           </div>
 
-          <div class="item" ng-repeat="u in latestUnused track by $index">
+          <div class="item" ng-repeat="u in latestUnused track by $index" copy-to-clipboard="u.address">
             {{u.address}}
             <div class="addr-path">
               {{u.path}} {{u.createdOn * 1000 | amDateFormat:'MMMM Do YYYY, hh:mm a'}}
@@ -49,7 +49,7 @@
             Addresses With Balance
           </div>
 
-          <div class="item" ng-repeat="w in latestWithBalance track by $index">
+          <div class="item" ng-repeat="w in latestWithBalance track by $index" copy-to-clipboard="w.address">
             {{w.address}}
             <div class="addr-balance">{{w.balanceStr}}</div>
           </div>
diff --git a/www/views/allAddresses.html b/www/views/allAddresses.html
index f7aef99f3..4d3fece56 100644
--- a/www/views/allAddresses.html
+++ b/www/views/allAddresses.html
@@ -9,7 +9,7 @@
     <div class="addr-list list">
       <div class="item item-divider"></div>
 
-      <div class="item" ng-repeat="a in allAddresses track by $index">
+      <div class="item" ng-repeat="a in allAddresses track by $index" copy-to-clipboard="a.address">
         {{a.address}}
         <div class="addr-path" ng-if="!a.balanceStr">
           {{a.path}} {{a.createdOn * 1000 | amDateFormat:'MMMM Do YYYY, hh:mm a'}}
diff --git a/www/views/tab-receive.html b/www/views/tab-receive.html
index 9a2678faf..c88b7746c 100644
--- a/www/views/tab-receive.html
+++ b/www/views/tab-receive.html
@@ -64,19 +64,13 @@
             <i class="icon ion-ios-upload-outline"></i>
             <span translate>Share</span>
           </div>
-          <div ng-class="{'center-block': !isCordova || !addr}">
-            <div class="item item-icon-left" ng-click="setAddress(true)">
-              <i class="icon ion-ios-loop"></i>
-              <span translate>Next Address</span>
-            </div>
-          </div>
         </div>
         <div id="bit-address" class="row border-top" ng-click="showAddresses()">
           <div class="center-block bit-address text-center" ng-repeat="wallet in wallets track by $index" ng-class="walletPosition($index)">
             <div class="item item-icon-left item-icon-right">
               <i class="icon icon-svg receive-tab-bitcoin-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
               <span class="bit-address-gen-address" ng-if="generatingAddress">...</span>
-              <span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="walletAddrs[wallet.id]">{{walletAddrs[wallet.id]}}</span>
+              <span class="bit-address-gen-address" ng-if="!generatingAddress">{{walletAddrs[wallet.id]}}</span>
               <i class="icon ion-ios-arrow-right"></i>
             </div>
           </div>