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

Merge branch 'wallet/task/514' of https://github.com/Bitcoin-com/Wallet into wallet/task/514

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-07 17:37:32 +09:00
commit a295c03b2e
1 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/js/services/shapeshiftService.js
View file

@ -8,21 +8,6 @@ angular.module('copayApp.services').factory('shapeshiftService', function ($http
root.returnAddress = ''; root.returnAddress = '';
root.amount = ''; root.amount = '';
root.marketData = {}; root.marketData = {};
root.withdrawalAddress = function (address) {
root.withdrawalAddress = address;
};
root.returnAddress = function (address) {
root.returnAddress = address;
};
root.amount = function (amount) {
root.amount = amount;
};
root.coinIn = function (coinIn) {
root.coinIn = coinIn.toUpperCase();
};
root.coinOut = function (coinOut) {
root.coinOut = coinOut.toUpperCase();
};
root.getMarketDataIn = function (coin) { root.getMarketDataIn = function (coin) {
if (coin === root.coinOut) return root.getMarketData(root.coinOut, root.coinIn); if (coin === root.coinOut) return root.getMarketData(root.coinOut, root.coinIn);
@ -66,8 +51,10 @@ angular.module('copayApp.services').factory('shapeshiftService', function ($http
root.shiftIt = function (coinIn, coinOut, withdrawalAddress, returnAddress, cb) { root.shiftIt = function (coinIn, coinOut, withdrawalAddress, returnAddress, cb) {
ongoingProcess.set('connectingShapeshift', true); ongoingProcess.set('connectingShapeshift', true);
root.withdrawalAddress(withdrawalAddress); root.withdrawalAddress = withdrawalAddress;
root.returnAddress(returnAddress); root.returnAddress = returnAddress;
root.coinIn = coinIn;
root.coinOut = coinOut;
var validate = shapeshiftApiService.ValidateAddress(withdrawalAddress, coinOut); var validate = shapeshiftApiService.ValidateAddress(withdrawalAddress, coinOut);
validate.then(function (valid) { validate.then(function (valid) {
var tx = ShapeShift(); var tx = ShapeShift();