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

Merge remote-tracking branch 'origin/wallet/task/514' into wallet/task/427

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-08-07 15:06:54 +02:00
commit 01a7024b52
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
61 changed files with 3583 additions and 924 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/directives/shapeshiftCoinTrader.js
View file

@ -111,7 +111,7 @@ angular.module('copayApp.directives').directive('shapeshiftCoinTrader', function
orderId: $scope.depositInfo.orderId
};
if (incomingData.redir(sendAddress, shapeshiftData)) {
if (incomingData.redir(sendAddress, 'shapeshift', shapeshiftData)) {
ongoingProcess.set('connectingShapeshift', false);
return;
}