Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.
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) {