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

Fix wallet from

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-07-17 16:01:37 +09:00
commit 255e3b85bb
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,9 +38,11 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.minShapeshiftAmount = parseFloat(data.stateParams.minShapeshiftAmount); $scope.minShapeshiftAmount = parseFloat(data.stateParams.minShapeshiftAmount);
$scope.maxShapeshiftAmount = parseFloat(data.stateParams.maxShapeshiftAmount); $scope.maxShapeshiftAmount = parseFloat(data.stateParams.maxShapeshiftAmount);
$scope.shapeshiftOrderId = data.stateParams.shapeshiftOrderId; $scope.shapeshiftOrderId = data.stateParams.shapeshiftOrderId;
$scope.fromWalletId = data.stateParams.fromWalletId;
} }
// To get the wallet from with the new flow
$scope.fromWalletId = data.stateParams.fromWalletId;
if (data.stateParams.noPrefix) { if (data.stateParams.noPrefix) {
$scope.showWarningMessage = data.stateParams.noPrefix != 0; $scope.showWarningMessage = data.stateParams.noPrefix != 0;
if ($scope.showWarningMessage) { if ($scope.showWarningMessage) {
@ -458,7 +460,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
amount: $scope.useSendMax ? null : _amount, amount: $scope.useSendMax ? null : _amount,
currency: unit.id.toUpperCase(), currency: unit.id.toUpperCase(),
coin: coin, coin: coin,
useSendMax: $scope.useSendMax useSendMax: $scope.useSendMax,
fromWalletId: $scope.fromWalletId || undefined
}); });
} else { } else {
var amount = _amount; var amount = _amount;
@ -479,6 +482,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
toColor: $scope.toColor, toColor: $scope.toColor,
coin: coin, coin: coin,
useSendMax: $scope.useSendMax, useSendMax: $scope.useSendMax,
fromWalletId: $scope.fromWalletId || undefined
}; };
if ($scope.shapeshiftOrderId) { if ($scope.shapeshiftOrderId) {

2
src/js/controllers/tab-send.js
View file

@ -76,7 +76,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
return $state.transitionTo('tabs.send.amount', { return $state.transitionTo('tabs.send.amount', {
displayAddress: $scope.walletToWalletFrom.coin === 'bch' ? bitcoinCashJsService.translateAddresses(addr).cashaddr : addr, displayAddress: $scope.walletToWalletFrom.coin === 'bch' ? bitcoinCashJsService.translateAddresses(addr).cashaddr : addr,
recipientType: 'wallet', recipientType: 'wallet',
fromWalletId: $scope.walletToWalletFrom.walletId, fromWalletId: $scope.walletToWalletFrom.id,
toAddress: addr, toAddress: addr,
coin: $scope.walletToWalletFrom.coin coin: $scope.walletToWalletFrom.coin
}); });