Merge pull request #6709 from JDonadio/ref/send-max-desktop

Fix send max changing fee level on desktop
This commit is contained in:
Gustavo Maximiliano Cortez 2017-09-07 17:14:10 -03:00 committed by GitHub
commit bd222a906a

View file

@ -287,7 +287,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
tx.toAmount = tx.sendMaxInfo.amount; tx.toAmount = tx.sendMaxInfo.amount;
updateAmount(); updateAmount();
ongoingProcess.set('calculatingFee', false); ongoingProcess.set('calculatingFee', false);
showSendMaxWarning(wallet, sendMaxInfo); $timeout(function() {
showSendMaxWarning(wallet, sendMaxInfo);
}, 200);
} }
// txp already generated for this wallet? // txp already generated for this wallet?
@ -347,11 +349,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.buttonText = gettextCatalog.getString('Click to accept'); $scope.buttonText = gettextCatalog.getString('Click to accept');
} }
} else } else
if (isCordova && !isWindowsPhoneApp) { if (isCordova && !isWindowsPhoneApp) {
$scope.buttonText = gettextCatalog.getString('Slide to send'); $scope.buttonText = gettextCatalog.getString('Slide to send');
} else { } else {
$scope.buttonText = gettextCatalog.getString('Click to send'); $scope.buttonText = gettextCatalog.getString('Click to send');
} }
}; };