sendMax bugfix when returning to previous screen

This commit is contained in:
Sebastiaan Pasma 2018-08-09 13:39:27 +02:00
commit ee0042b6e7
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
3 changed files with 12 additions and 6 deletions

View file

@ -29,6 +29,7 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
vm.finish = finish;
vm.goBack = goBack;
vm.loadMore = loadMore;
vm.next = next;
vm.openPopup = openPopup;
vm.pushDigit = pushDigit;
vm.removeDigit = removeDigit;
@ -478,7 +479,7 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
// Currency
var next = 10;
var nextCurrencies = 10;
var completeAlternativeList = [];
var popularCurrencyList = [
@ -537,12 +538,17 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
function loadMore() {
$timeout(function() {
vm.altCurrencyList = completeAlternativeList.slice(0, next);
next += 10;
vm.altCurrencyList = completeAlternativeList.slice(0, nextCurrencies);
nextCurrencies += 10;
vm.listComplete = vm.altCurrencyList.length >= completeAlternativeList.length;
$scope.$broadcast('scroll.infiniteScrollComplete');
}, 100);
};
}
function next() {
useSendMax = false;
vm.finish();
}
function findCurrency(search) {
if (!search) initCurrencies();

View file

@ -223,7 +223,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
// Grab stateParams
tx = {
amount: parseInt(sendFlowData.amount),
sendMax: sendFlowData.sendMax === 'true' ? true : false,
sendMax: sendFlowData.sendMax,
fromWalletId: sendFlowData.fromWalletId,
toAddress: sendFlowData.toAddress,
paypro: txPayproData,

View file

@ -90,7 +90,7 @@
<button
class="button button-full button-primary no-margin"
ng-disabled="!vm.allowSend"
ng-click="vm.finish()"
ng-click="vm.next()"
style="position: absolute; bottom: 0;"
translate>
Next