From 82211a5812a179cf4a0777f0c078773b1abfeadb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 26 Sep 2016 14:16:17 -0300
Subject: [PATCH] fixes

---
 src/js/controllers/tab-receive.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index b17468ae5..aec3c8b20 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -34,14 +34,11 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
     $scope.addr = null;
     $scope.generatingAddress = true;
 
-    $timeout(function() {
-      walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
-        $scope.generatingAddress = false;
-        if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
-        $scope.addr = addr;
-        $scope.$apply();
-      });
-    }, 1);
+    walletService.getAddress($scope.wallet, forceNew, function(err, addr) {
+      $scope.generatingAddress = false;
+      if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
+      $scope.addr = addr;
+    });
   };
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
@@ -52,9 +49,12 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
         $log.debug('No wallet provided');
         return;
       }
-      $scope.wallet = wallet;
-      $log.debug('Wallet changed: ' + wallet.name);
-      $scope.setAddress();
+      $timeout(function() {
+        $scope.wallet = wallet;
+        $log.debug('Wallet changed: ' + wallet.name);
+        $scope.setAddress();
+        $scope.$apply();
+      });
     });
   });