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

Fix for some changes which broke Shapeshift flow.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-07 14:23:53 +12:00
commit 6c46ec2bca
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
originWalletId = data.stateParams.fromWalletId; originWalletId = data.stateParams.fromWalletId;
satoshis = parseInt(data.stateParams.amount, 10); satoshis = parseInt(data.stateParams.amount, 10);
toAddress = data.stateParams.toAddress; toAddress = data.stateParams.toAddress;
destinationWalletId = data.stateParams.toWalletId;
vm.originWallet = profileService.getWallet(originWalletId); vm.originWallet = profileService.getWallet(originWalletId);
vm.origin.currency = vm.originWallet.coin.toUpperCase(); vm.origin.currency = vm.originWallet.coin.toUpperCase();
@ -257,7 +258,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
try { try {
if (vm.destination.kind === 'wallet') { // This is a wallet-to-wallet transfer if (vm.destination.kind === 'wallet') { // This is a wallet-to-wallet transfer
$ionicLoading.show(); $ionicLoading.show();
var toWallet = profileService.getWallet(data.stateParams.toWalletId); var toWallet = profileService.getWallet(destinationWalletId);
// We need an address to send to, so we ask the walletService to create a new address for the toWallet. // We need an address to send to, so we ask the walletService to create a new address for the toWallet.
console.log('Getting address for wallet...'); console.log('Getting address for wallet...');
@ -468,7 +469,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
vm.thirdParty.data = {}; vm.thirdParty.data = {};
} }
var toWallet = profileService.getWallet(data.stateParams.toWalletId); var toWallet = profileService.getWallet(destinationWalletId);
$ionicLoading.show(); $ionicLoading.show();
walletService.getAddress(vm.originWallet, false, function onWalletAddress(err, returnAddr) { walletService.getAddress(vm.originWallet, false, function onWalletAddress(err, returnAddr) {
walletService.getAddress(toWallet, false, function onWalletAddress(err, withdrawalAddr) { walletService.getAddress(toWallet, false, function onWalletAddress(err, withdrawalAddr) {