Merge remote-tracking branch 'origin/wallet/task/537' into wallet/task/537

src/js/controllers/tab-home.js

@@ -214,6 +214,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
       var j = 0;
 
       lodash.each(wallets, function(wallet) {
+        walletService.invalidateCache(wallet); // Temporary solution, to have the good balance, when we ask to reload the wallets.
         walletService.getStatus(wallet, {}, function(err, status) {
           if (err) {
 

src/js/controllers/tab-receive.js

@@ -158,6 +158,10 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
         soundService.play('misc/payment_received.mp3');
       } 
 
+      // Notify new tx
+      $scope.$emit('bwsEvent', $scope.wallet.id);
+
+
       $scope.$apply(function () {
         $scope.showingPaymentReceived = true;
       });

src/js/controllers/walletSelectorController.js

@@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
       sendFlowService.popState();
     }
 
-    var stateParams = sendFlowService.getState();
+    $scope.params = sendFlowService.getState();
 
     var config = configService.getSync().wallet.settings;
     priceDisplayAsFiat = config.priceDisplay === 'fiat';
@@ -29,18 +29,17 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
         $scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
         break;
       case 'tabs.send.destination':
-        if (stateParams.fromWalletId) {
+        if ($scope.params.fromWalletId) {
           $scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
         }
         break;
       default:
-        if (!stateParams.thirdParty) {
+        if (!$scope.params.thirdParty) {
           $scope.sendFlowTitle = gettextCatalog.getString('Send');
         }
        // nop
     }
 
-    $scope.params = sendFlowService;
     $scope.coin = false; // Wallets to show (for destination screen or contacts)
     $scope.type = $scope.params['fromWalletId'] ? 'destination' : 'origin'; // origin || destination
     fromWalletId = $scope.params['fromWalletId'];

src/js/directives/formattedAmount.js

@@ -90,7 +90,7 @@
       // to both being in value. Don't want to use previous currency value.
       // Try to extract currency from value..
       var currencySplit = $scope.value.split(" ");
-      if (currencySplit.length === 2) {
+      if (currencySplit.length === 2 && !$scope.currency) {
         $scope.currency = currencySplit[1];
       }
       $scope.currency = $scope.currency || '';