From 3c0bc734a4b4a772775c5d9a6a9663406a3ca7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 1 Sep 2016 17:46:56 -0300
Subject: [PATCH] fix email label

---
 src/js/controllers/preferencesEmail.js | 23 ++++++++++++++++++-----
 src/js/controllers/walletDetails.js    |  6 +++---
 src/js/services/configService.js       |  1 +
 src/js/services/profileService.js      |  1 +
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js
index 7d24ef4ec..1fb89216a 100644
--- a/src/js/controllers/preferencesEmail.js
+++ b/src/js/controllers/preferencesEmail.js
@@ -1,17 +1,30 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('preferencesEmailController', function($rootScope, $scope, $ionicHistory, $stateParams, $ionicNavBarDelegate, gettextCatalog, profileService, walletService) {
+angular.module('copayApp.controllers').controller('preferencesEmailController', function($scope, $ionicHistory, $stateParams, $ionicNavBarDelegate, gettextCatalog, profileService, walletService, configService) {
   $ionicNavBarDelegate.title(gettextCatalog.getString('Email Notifications'));
+
+  var wallet = profileService.getWallet($stateParams.walletId);
+  var walletId = wallet.credentials.walletId;
+
+  var config = configService.getSync();
+  config.amailFor = config.amailFor || {};
+  $scope.email = config.emailFor && config.emailFor[walletId];
+
   $scope.save = function(form) {
-    var wallet = profileService.getWallet($stateParams.walletId);
     var email = $scope.email || '';
+    var opts = {
+      emailFor: {}
+    };
+    opts.emailFor[walletId] = $scope.email;
 
     walletService.updateRemotePreferences(wallet, {
-      email: email,
+      email: $scope.email,
     }, function(err) {
       if (err) $log.warn(err);
-      $ionicHistory.goBack();
+      configService.set(opts, function(err) {
+        if (err) $log.warn(err);
+        $ionicHistory.goBack();
+      });
     });
   };
-
 });
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index 9994be0dd..033eadd55 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -117,7 +117,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     walletService.recreate();
   };
 
-  $scope.updateTxHistory = function(cb) {
+  $scope.updateTxHistory = function() {
 
     if ($scope.updatingTxHistory) return;
 
@@ -152,7 +152,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
         $timeout(function() {
           $scope.$apply();
         }, 1);
-        return cb();
+        return;
       });
     });
   };
@@ -172,7 +172,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
 
   $scope.updateAll = function(cb)  {
     $scope.updateStatus(false);
-    $scope.updateTxHistory(cb);
+    $scope.updateTxHistory();
   }
 
   $scope.hideToggle = function() {
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 53bb686e9..9ef2fdf23 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -122,6 +122,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
       configCache.bwsFor = configCache.bwsFor || {};
       configCache.colorFor = configCache.colorFor || {};
       configCache.aliasFor = configCache.aliasFor || {};
+      configCache.emailFor = configCache.emailFor || {};
 
       // Coinbase
       // Disabled for testnet
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index abb066d6d..2c240035b 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -36,6 +36,7 @@ angular.module('copayApp.services')
 
       wallet.name = config.aliasFor && (config.aliasFor[wallet.id] || wallet.credentials.walletName);
       wallet.color = config.colorFor && (config.colorFor[wallet.id] || '#4A90E2');
+      wallet.email = config.emailFor && config.emailFor[wallet.id];
     }
 
     root.setBackupFlag = function(walletId) {