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

Fix for sending ShapeShift transaction to Shapeshift deposit address, rather than own wallet.

Browse source
This commit is contained in:
Brendon Duncan 2018-09-26 15:12:37 +12:00
commit 5b7eb57d76
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
vm.sendingTitle = gettextCatalog.getString('You are sending'); vm.sendingTitle = gettextCatalog.getString('You are sending');
vm.sendStatus = ''; vm.sendStatus = '';
vm.showAddress = true; vm.showAddress = true;
vm.thirdParty = false; vm.thirdParty = null;
vm.wallet = null; vm.wallet = null;
vm.memoExpanded = false; vm.memoExpanded = false;
@ -270,6 +270,9 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
txp: {}, txp: {},
}; };
if (vm.thirdParty && vm.thirdParty.id === "shapeshift") {
tx.toAddress = vm.thirdParty.toAddress;
}
if (data.stateParams.requiredFeeRate) { if (data.stateParams.requiredFeeRate) {
vm.usingMerchantFee = true; vm.usingMerchantFee = true;
@ -283,7 +286,14 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
var B = tx.coin === 'bch' ? bitcoreCash : bitcore; var B = tx.coin === 'bch' ? bitcoreCash : bitcore;
var networkName; var networkName;
try { try {
if (vm.destination.kind === 'wallet') { // This is a wallet-to-wallet transfer // Final destination is a wallet, but this transaction must go to an address for the first stage of the exchange.
if (sendFlowData.thirdParty && sendFlowData.thirdParty.id === 'shapeshift') {
networkName = (new B.Address(tx.toAddress)).network.name;
tx.network = networkName;
console.log('calling setupTx() for shapeshift.');
setupTx(tx);
} else if (vm.destination.kind === 'wallet') { // This is a wallet-to-wallet transfer
ongoingProcess.set('generatingNewAddress', true); ongoingProcess.set('generatingNewAddress', true);
var toWallet = profileService.getWallet(destinationWalletId); var toWallet = profileService.getWallet(destinationWalletId);
@ -498,9 +508,6 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
function initShapeshift(cb) { function initShapeshift(cb) {
vm.sendingTitle = gettextCatalog.getString('You are shifting'); vm.sendingTitle = gettextCatalog.getString('You are shifting');
if (!vm.thirdParty.data) {
vm.thirdParty.data = {};
}
var toWallet = profileService.getWallet(destinationWalletId); var toWallet = profileService.getWallet(destinationWalletId);
vm.destination.name = toWallet.name; vm.destination.name = toWallet.name;
@ -525,9 +532,8 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
if (err) { if (err) {
return cb(err); return cb(err);
} else { } else {
vm.destination.kind = 'shapeshift'; // Want it to appear like a wallet-to-wallet transfer, so don't set the main toAddress.
vm.destination.address = toAddress; vm.thirdParty.toAddress = shapeshiftData.toAddress;
tx.toAddress = shapeshiftData.toAddress;
vm.memo = 'ShapeShift Order:\nhttps://www.shapeshift.io/#/status/' + shapeshiftData.orderId; vm.memo = 'ShapeShift Order:\nhttps://www.shapeshift.io/#/status/' + shapeshiftData.orderId;
vm.memoExpanded = !!vm.memo; vm.memoExpanded = !!vm.memo;
ongoingProcess.set('connectingShapeshift', false); ongoingProcess.set('connectingShapeshift', false);