anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Better handling of Shapeshift error.

Browse source
This commit is contained in:
Brendon Duncan 2018-09-05 18:16:01 +12:00
commit d01baa6060
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/js/controllers/amount.js
View file

@ -238,15 +238,20 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
ongoingProcess.set('connectingShapeshift', false);
if (data.error) {
popupService.showAlert(gettextCatalog.getString('Shapeshift Error'), typeof data.error === 'string'?data.error:(data.error.message?data.error.message:''), function () {
$ionicHistory.goBack();
// TODO: translatable string. use goBack(), don't execute the code beyond.
popupService.showAlert(
gettextCatalog.getString('Shapeshift Error'),
typeof data.error === 'string' ? data.error : (data.error.message ? data.error.message : ''),
function () {
goBack();
});
} else {
vm.thirdParty.data.minAmount = vm.minAmount = parseFloat(data.minimum);
vm.thirdParty.data.maxAmount = vm.maxAmount = parseFloat(data.maxLimit);
setMaximumButtonFromWallet(vm.fromWallet);
}
vm.thirdParty.data['minAmount'] = vm.minAmount = parseFloat(data.minimum);
vm.thirdParty.data['maxAmount'] = vm.maxAmount = parseFloat(data.maxLimit);
setMaximumButtonFromWallet(vm.fromWallet);
});