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

Merge branch 'wallet/task/416' of https://github.com/Bitcoin-com/Wallet into wallet/task/416

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-07-17 18:38:06 +09:00
commit 36152edaae
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -461,7 +461,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
currency: unit.id.toUpperCase(), currency: unit.id.toUpperCase(),
coin: coin, coin: coin,
useSendMax: $scope.useSendMax, useSendMax: $scope.useSendMax,
fromWalletId: $scope.fromWalletId || undefined fromWalletId: $scope.fromWalletId
}); });
} else { } else {
var amount = _amount; var amount = _amount;
@ -482,7 +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 fromWalletId: $scope.fromWalletId
}; };
if ($scope.shapeshiftOrderId) { if ($scope.shapeshiftOrderId) {