From 0ffbd585f8d58bc1b412f145427ee06636d48634 Mon Sep 17 00:00:00 2001
From: Yemel Jardi <angel.jardi@gmail.com>
Date: Fri, 18 Jul 2014 11:23:45 -0300
Subject: [PATCH] Add QR modal at address list and clean deprecated code

---
 js/controllers/addresses.js | 25 +++++++++++++++------
 views/addresses.html        | 45 +++++++++++++------------------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js
index a0281e1b1..20f5a92a5 100644
--- a/js/controllers/addresses.js
+++ b/js/controllers/addresses.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('AddressesController',
-  function($scope, $rootScope, $timeout, controllerUtils) {
+  function($scope, $rootScope, $timeout, $modal, controllerUtils) {
     $scope.loading = false;
     var w = $rootScope.wallet;
 
@@ -16,8 +16,21 @@ angular.module('copayApp.controllers').controller('AddressesController',
       });
     };
 
-    $scope.selectAddress = function(addr) {
-      $scope.selectedAddr = addr;
+    $scope.openAddressModal = function(address) {
+      var ModalInstanceCtrl = function ($scope, $modalInstance, address) {
+        $scope.address = address;
+        $scope.cancel = function () {
+          $modalInstance.dismiss('cancel');
+        };
+      };
+
+      $modal.open({
+        templateUrl: 'addressModal.html',
+        controller: ModalInstanceCtrl,
+        resolve: {
+          address: function() { return address; }
+        }
+      });
     };
 
     $rootScope.$watch('addrInfos', function() {
@@ -37,9 +50,7 @@ angular.module('copayApp.controllers').controller('AddressesController',
             'owned': addrinfo.owned
           });
         }
-        $scope.selectedAddr = $scope.addresses[0];
-        $scope.addrWithFund = $rootScope.receivedFund ? $rootScope.receivedFund[1] : null;
-        $rootScope.receivedFund = null;
       }
     }
-  });
+  }
+);
diff --git a/views/addresses.html b/views/addresses.html
index 1cdf417aa..ffc56db9e 100644
--- a/views/addresses.html
+++ b/views/addresses.html
@@ -8,53 +8,40 @@
       <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
         <div class="large-12 medium-12" ng-init="showAll=0">
           <ul>
-            <li class="panel radius db" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll"
-              ng-click="selectAddress(addr)"
-              ng-class="{selected : addr.address == selectedAddr.address}">
+            <li class="panel radius db" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
 
               <span><contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/></span>
               <small ng-if="addr.isChange">change</small>
+              <a href="#" ng-click="openAddressModal(addr)">Show QR</a>
 
               <span class="right">
-                <span ng-if="addrWithFund == addr.address">
-                  <span ng-if="$root.updatingBalance">
-                    <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-                  </span>
-                  <span ng-if="!$root.updatingBalance">
-                    {{$root.balanceByAddr[addr.address] || 0|noFractionNumber}} {{$root.unitName}}
-                  </span>
+                <span ng-if="$root.updatingBalance">
+                  <i class="fi-bitcoin-circle icon-rotate spinner"></i>
                 </span>
-                <span ng-if="addrWithFund != addr.address">
+                <span ng-if="!$root.updatingBalance">
                   {{addr.balance || 0|noFractionNumber}} {{$root.unitName}}
                 </span>
               </span>
-              <a href="#" data-reveal-id="view-qr">Click Me For A Modal</a>
             </li>
           </ul>
+
           <a class="secondary radius" ng-click="showAll=!showAll" ng-show="(addresses|removeEmpty).length != (addresses|removeEmpty|limitAddress).length">
             <span ng-if="!showAll">Show all</span>
             <span ng-if="showAll">Show less</span>
           </a>
         </div>
 
-        <div id="view-qr" class="reveal-modal" data-reveal>
-          <qrcode size="160" data="{{selectedAddr.address}}"></qrcode>
-          <p class="m10t">
-          <strong>
-            <span ng-if="addrWithFund == selectedAddr.address">
-              <span ng-if="$root.updatingBalance">
+        <script type="text/ng-template" id="addressModal.html">
+          <qrcode size="160" data="{{address.address}}"></qrcode>
+          Address: {{address.address}}<br/>
+          <span ng-if="$root.updatingBalance">
                 <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-              </span>
-              <span ng-if="!$root.updatingBalance">{{balanceByAddr[selectedAddr.address] || 0 | noFractionNumber}}
-              </span>
-            </span>
-            <span ng-if="addrWithFund != selectedAddr.address">
-              {{selectedAddr.address}}<br/>
-              {{selectedAddr.balance || 0|noFractionNumber}} {{$root.unitName}}
-            </span>
-          </strong>
-          </p>
-        </div>
+          </span>
+          <span ng-if="!$root.updatingBalance">
+            Balance: {{address.balance || 0|noFractionNumber}} {{$root.unitName}}
+          </span>
+          <a class="close-reveal-modal" ng-click="cancel()">&#215;</a>
+        </script>
       </div>
   </div>
 </div>