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

Fix modal

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-09-21 10:23:02 +02:00
commit 5cb3d7521d
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/services/onGoingProcess.js
View file

@ -75,9 +75,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
var showName = $filter('translate')(processNames[name] || name); var showName = $filter('translate')(processNames[name] || name);
if (customHandler) { if (root.onGoingProcessName) {
customHandler(processName, showName, isOn);
} else if (root.onGoingProcessName) {
var tmpl; var tmpl;
if (isWindowsPhoneApp) tmpl = '<div>' + showName + '</div>'; if (isWindowsPhoneApp) tmpl = '<div>' + showName + '</div>';
else tmpl = '<div class="item-icon-left">' + showName + '<ion-spinner class="spinner-stable" icon="lines"></ion-spinner></div>'; else tmpl = '<div class="item-icon-left">' + showName + '<ion-spinner class="spinner-stable" icon="lines"></ion-spinner></div>';
@ -87,6 +85,10 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
} else { } else {
$ionicLoading.hide(); $ionicLoading.hide();
} }
if (customHandler) {
customHandler(processName, showName, isOn);
}
}; };
return root; return root;

2
src/js/services/shapeshift.service.js
View file

@ -57,7 +57,7 @@ angular
function shiftIt(coinIn, coinOut, withdrawalAddress, returnAddress, amount, cb) { function shiftIt(coinIn, coinOut, withdrawalAddress, returnAddress, amount, cb) {
// Test if the amount is correct depending on the min and max // Test if the amount is correct depending on the min and max
if (!amount || typeof amount !== 'number') { if (!amount || typeof amount !== 'number') {
cb(new Error(gettextCatalog.getString('Amount is not defined')))); cb(new Error(gettextCatalog.getString('Amount is not defined')));
} else if (amount < service.marketData.minimum) { } else if (amount < service.marketData.minimum) {
cb(new Error(gettextCatalog.getString('Amount is below the minimun'))); cb(new Error(gettextCatalog.getString('Amount is below the minimun')));
} else if (amount > service.marketData.maxLimit) { } else if (amount > service.marketData.maxLimit) {