From 13996dc26a2ae645df4f80567f3792573c787a0f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 18 Feb 2016 16:54:13 -0300
Subject: [PATCH] mv addr to walletData

---
 public/views/walletHome.html       | 16 ++++++++--------
 src/js/controllers/walletHome.js   | 27 +++++++++++++++++++++++----
 src/js/services/txFormatService.js |  3 ++-
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index df40e7b7d..9ae9f0376 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -302,8 +302,8 @@
           <!-- Address-->
           <div class="large-12 columns">
             <h2 class="text-center m10t" translate>My Bitcoin address</h2>
-            <div class="text-center" ng-click="home.copyToClipboard(home.addr[index.walletId])" ng-show="home.addr[index.walletId] || home.generatingAddress">
-              <qrcode size="220" data="bitcoin:{{home.addr[index.walletId]}}"></qrcode>
+            <div class="text-center" ng-click="home.copyToClipboard(home.getWalletData('addr'))" ng-show="home.getWalletData('addr') || home.generatingAddress">
+              <qrcode size="220" data="bitcoin:{{home.getWalletData('addr')}}"></qrcode>
               <div ng-show="home.generatingAddress" style="position:relative; top:-226px; height:0px">
                 <div style="height:220px; width:220px; margin:auto; background: white">
                   <div class="spinner" style="margin-top:85px">
@@ -317,29 +317,29 @@
               </div>
               <div class="m10t" >
                 <h4 ng-class="{'enable_text_select': !index.isCordova}" class="size-12">
-                  {{home.generatingAddress ? '...' : home.addr[index.walletId]}}
+                  {{home.generatingAddress ? '...' : home.getWalletData('addr')}}
                 </h4>
               </div>
             </div>
           </div>
         </div>
         <div class="row m20t">
-          <div class="small-12 columns" ng-show="index.isCordova && home.addr[index.walletId]">
+          <div class="small-12 columns" ng-show="index.isCordova && home.getWalletData('addr')">
             <button class="button outline light-gray small round expand"
-              ng-click="home.shareAddress(home.addr[index.walletId])"
+              ng-click="home.shareAddress(home.getWalletData('addr'))"
               ng-disabled="home.generatingAddress">
               <span translate>Share address</span>
             </button>
           </div>
-          <div class="small-12 columns" ng-show="home.addr[index.walletId]">
-            <button class="button expand small round m10b" ng-click="home.openCustomizedAmountModal(home.addr[index.walletId])"
+          <div class="small-12 columns" ng-show="home.getWalletData('addr')">
+            <button class="button expand small round m10b" ng-click="home.openCustomizedAmountModal(home.getWalletData('addr'))"
             ng-style="{'background-color':index.backgroundColor}"
             ng-disabled="home.generatingAddress">
               <span translate>Request a specific amount</span>
             </button>
           </div>
         </div>
-        <div class="row m10t" ng-show="home.addr[index.walletId]" >
+        <div class="row m10t" ng-show="home.getWalletData('addr')" >
           <div class="large-12 columns">
             <div class="line-t size-10 text-gray m10b p10t">
               <span translate> Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.</span>
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 744aeda6e..a750b8ace 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -25,10 +25,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   this.blockUx = false;
   this.isRateAvailable = false;
   this.showScanner = false;
-  this.addr = {};
   this.lockedCurrentFeePerKb = null;
   this.paymentExpired = false;
 
+
   var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) {
     self.setForm(data);
     $rootScope.$emit('Local/SetTab', 'send');
@@ -52,7 +52,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   });
 
   var disableFocusListener = $rootScope.$on('Local/NewFocusedWallet', function() {
-    self.addr = {};
     self.resetForm();
   });
 
@@ -88,6 +87,26 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     $rootScope.shouldHideMenuBar = false;
   });
 
+
+  this.walletData = {};
+  this.getWalletData = function(key) {
+    var fc = profileService.focusedClient;
+    if (!fc) return;
+    if (!this.walletData[fc.credentials.walletId]) return;
+
+    return this.walletData[fc.credentials.walletId][key];
+  };
+
+  this.setWalletData = function(key,val) {
+    var fc = profileService.focusedClient;
+    if (!fc) return;
+    if (!this.walletData[fc.credentials.walletId] )
+      this.walletData[fc.credentials.walletId] = {};
+
+    this.walletData[fc.credentials.walletId][key] = val;
+  };
+ 
+
   this.onQrCodeScanned = function(data) {
     if (data) go.send();
     $rootScope.$emit('dataScanned', data);
@@ -510,7 +529,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       return;
 
     // Address already set?
-    if (!forceNew && self.addr[fc.credentials.walletId]) {
+    if (!forceNew && self.getWalletData('addr')) {
       return;
     }
 
@@ -523,7 +542,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
           self.addrError = err;
         } else {
           if (addr)
-            self.addr[fc.credentials.walletId] = addr;
+            self.setWalletData('addr',addr);;
         }
 
         $scope.$digest();
diff --git a/src/js/services/txFormatService.js b/src/js/services/txFormatService.js
index 9623753e8..4cd12d23e 100644
--- a/src/js/services/txFormatService.js
+++ b/src/js/services/txFormatService.js
@@ -22,7 +22,8 @@ angular.module('copayApp.services').factory('txFormatService', function(profileS
   };
 
   root.processTx = function(tx) {
-    if (!tx) return; 
+    if (!tx || tx.action == 'invalid') 
+      return tx; 
 
     // New transaction output format
     if (tx.outputs) {