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

Merge pull request #347 from Bitcoin-com/wallet/task/546

Browse source 
546 - Fix modal & shapeshift
This commit is contained in:
Brendon Duncan 2018-09-21 11:26:08 -07:00 • committed by GitHub
commit fb2802f392
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/shapeshift.js
View file

@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
walletsBtc = profileService.getWallets({coin: 'btc'}); walletsBtc = profileService.getWallets({coin: 'btc'});
walletsBch = profileService.getWallets({coin: 'bch'}); walletsBch = profileService.getWallets({coin: 'bch'});
$scope.fromWallets = lodash.filter(walletsBtc.concat(walletsBch), function(w) { $scope.fromWallets = lodash.filter(walletsBtc.concat(walletsBch), function(w) {
return w.status.balance.availableAmount > 0; return (w.status && w.status.balance && w.status.balance.availableAmount > 0);
}); });
$scope.singleFromWallet = $scope.fromWallets.length === 1; $scope.singleFromWallet = $scope.fromWallets.length === 1;

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

@ -74,10 +74,8 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
root.onGoingProcessName = name; root.onGoingProcessName = name;
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;