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

Recommendation #brendon :)

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-09-06 15:17:37 +09:00
commit 98e6e8ac75
3 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/review.controller.js
View file

@ -525,11 +525,11 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
if (err) {
return cb(err);
} else {
vm.destination.kind = 'shapeshift';
vm.destination.address = toAddress;
tx.toAddress = shapeshiftData.toAddress;
vm.memo = 'ShapeShift Order:\nhttps://www.shapeshift.io/#/status/' + shapeshiftData.orderId;
vm.memoExpanded = !!vm.memo;
tx.toAddress = shapeshiftData.toAddress;
vm.destination.address = toAddress;
vm.destination.kind = 'shapeshift';
ongoingProcess.set('connectingShapeshift', false);
cb();
}

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

@ -6,7 +6,7 @@ angular
.module('bitcoincom.services')
.factory('shapeshiftService', shapeshiftService);
function shapeshiftService(shapeshiftApiService) {
function shapeshiftService(shapeshiftApiService, gettext) {
var service = {
// Variables
@ -30,13 +30,9 @@ angular
function handleError(response, defaultMessage, cb) {
if (!response || !response.error || !response.error.message) {
if (cb) {
cb(new Error(defaultMessage));
}
cb(new Error(defaultMessage));
} else {
if (cb) {
cb(new Error(response.error.message));
}
cb(new Error(response.error.message));
}
}
@ -51,17 +47,19 @@ angular
} else {
service.marketData = response;
service.rateString = service.marketData.rate.toString() + ' ' + coinOut.toUpperCase() + '/' + coinIn.toUpperCase();
if (cb) {
cb(null, response);
}
cb(null, response);
}
});
}
function shiftIt(coinIn, coinOut, withdrawalAddress, returnAddress, amount, cb) {
// Test if the amount is correct depending on the min and max
if (!amount || typeof amount !== 'number' || amount < service.marketData.minimum || amount > service.marketData.maxLimit) {
cb(new Error('Invalid amount'));
if (!amount || typeof amount !== 'number') {
cb(new Error(gettext('Amount is not defined'))));
} else if (amount < service.marketData.minimum) {
cb(new Error(gettext('Amount is below the minimun')));
} else if (amount > service.marketData.maxLimit) {
cb(new Error(gettext('Amount is above the limit')));
} else {
// Init service data
service.withdrawalAddress = withdrawalAddress;
@ -75,20 +73,17 @@ angular
.ValidateAddress(withdrawalAddress, coinOut)
.then(function onSuccess(response) {
if (response && response.isvalid) {
// Prepare the transaction shapeshift side
shapeshiftApiService.NormalTx(service).then(function onResponse(response) {
// If error, return it
if (!response || response.error) {
handleError(response, 'Invalid response', cb);
handleError(response, gettext('Invalid response from Shapeshift'), cb);
} else {
var txData = response;
// If the content is not that it was expected, get back an error
if (!txData || !txData.orderId || !txData.deposit) {
if (cb) {
cb(new Error('Invalid response'));
}
cb(new Error(gettext('Invalid response from Shapeshift')));
} else {
// Get back the data
service.depositInfo = txData;
@ -105,8 +100,8 @@ angular
}
}
});
} else if (cb) {
cb(new Error('Invalid address or coin'));
} else {
cb(new Error(gettext('Invalid address')));
}
});
}