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

fixed bug where user could send to shapeshift from wrong wallet

Browse source
This commit is contained in:
Kadir Sekha 2018-01-02 15:38:40 +00:00
commit 64b11fba3a
7 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/amount.js
View file

@ -34,6 +34,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.minShapeshiftAmount = parseFloat(data.stateParams.minShapeshiftAmount);
$scope.maxShapeshiftAmount = parseFloat(data.stateParams.maxShapeshiftAmount);
$scope.shapeshiftOrderId = data.stateParams.shapeshiftOrderId;
$scope.fromWalletId = data.stateParams.fromWalletId;
}
var config = configService.getSync().wallet.settings;
@ -427,6 +428,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
var shapeshiftOrderUrl = 'https://www.shapeshift.io/#/status/';
shapeshiftOrderUrl += $scope.shapeshiftOrderId;
confirmData.description = shapeshiftOrderUrl;
confirmData.fromWalletId = $scope.fromWalletId;
}
$state.transitionTo('tabs.send.confirm', confirmData);

9
src/js/controllers/confirm.js
View file

@ -81,6 +81,14 @@ angular.module('copayApp.controllers').controller('confirmController', function(
coin: coin
});
if (tx.fromWalletId) {
$scope.wallets = lodash.filter($scope.wallets, function(w) {
return w.id == tx.fromWalletId;
});
}
if (!$scope.wallets || !$scope.wallets.length) {
setNoWallet(gettextCatalog.getString('No wallets available'), true);
return cb();
@ -150,6 +158,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
tx = {
toAmount: parseInt(data.stateParams.toAmount),
sendMax: data.stateParams.useSendMax == 'true' ? true : false,
fromWalletId: data.stateParams.fromWalletId,
toAddress: data.stateParams.toAddress,
description: data.stateParams.description,
paypro: data.stateParams.paypro,