diff --git a/public/views/confirm.html b/public/views/confirm.html
index 9e434de58..225a00ffd 100644
--- a/public/views/confirm.html
+++ b/public/views/confirm.html
@@ -45,7 +45,7 @@
Not available
-
+
Add Description
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index 6ef673a76..6f310209b 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -34,7 +34,7 @@
...
{{addr}}
-
+
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 2791eb459..af4440289 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -92,8 +92,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
};
$scope.init = function() {
- $scope.notAvailable = false;
$scope.wallet = profileService.getWallets()[0];
+ $scope.notAvailable = false;
+ $scope.hasWallet = $scope.wallet ? true : false;
if ($stateParams.paypro) {
return setFromPayPro($stateParams.paypro, function(err) {
diff --git a/src/js/controllers/tab-receive.js b/src/js/controllers/tab-receive.js
index f2c56281a..d9f2009be 100644
--- a/src/js/controllers/tab-receive.js
+++ b/src/js/controllers/tab-receive.js
@@ -6,6 +6,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
$scope.init = function() {
$scope.defaultWallet = profileService.getWallets()[0];
+ $scope.hasWallet = $scope.defaultWallet ? true : false;
$scope.isCordova = platformInfo.isCordova;
$scope.isNW = platformInfo.isNW;
$scope.setAddress(false);
diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js
index 38812db2a..5ddc43718 100644
--- a/src/js/directives/directives.js
+++ b/src/js/directives/directives.js
@@ -157,8 +157,8 @@ angular.module('copayApp.directives')
scope.content = {};
scope.content.wallets = [];
scope.content.notAvailable = false;
- var minBalance = attrs.minBalance ? parseInt(attrs.minBalance) : 0;
var wallets = profileService.getWallets(opts);
+ var minBalance = attrs.minBalance ? parseInt(attrs.minBalance) : 0;
var filteredWallets = [];
var index = 0;