diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 16724bf18..fd268671f 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -133,6 +133,11 @@ angular.module('copayApp.controllers').controller('amountController', function($ setAvailableUnits(); updateUnitUI(); + $scope.hasMaxAmount = true; + if ($ionicHistory.backView().stateName == 'tabs.receive') { + $scope.hasMaxAmount = false; + } + $scope.showMenu = $ionicHistory.backView() && ($ionicHistory.backView().stateName == 'tabs.send' || $ionicHistory.backView().stateName == 'tabs.bitpayCard'); $scope.recipientType = data.stateParams.recipientType || null; $scope.toAddress = data.stateParams.toAddress; diff --git a/src/js/services/configService.js b/src/js/services/configService.js index b7072372d..5cf454558 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -184,7 +184,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer // If display is not configure, take the default value if (!configCache.wallet.settings.priceDisplay) { - configCache.wallet.settings.display = defaultConfig.wallet.settings.priceDisplay; + configCache.wallet.settings.priceDisplay = defaultConfig.wallet.settings.priceDisplay; } // Convert tarascash wallet to new style cash wallet diff --git a/www/views/amount.html b/www/views/amount.html index a1dd8bd7b..85f69100b 100644 --- a/www/views/amount.html +++ b/www/views/amount.html @@ -50,7 +50,7 @@