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

implemented appropriate send max button for shapeshift

Browse source
This commit is contained in:
Kadir Sekha 2018-01-03 14:41:59 +00:00
commit efe2c333a8
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -395,7 +395,6 @@ angular.module('copayApp.controllers').controller('amountController', function($
} }
if ($scope.nextStep) { if ($scope.nextStep) {
$state.transitionTo($scope.nextStep, { $state.transitionTo($scope.nextStep, {
id: _id, id: _id,
amount: $scope.useSendMax ? null : _amount, amount: $scope.useSendMax ? null : _amount,
@ -428,6 +427,22 @@ angular.module('copayApp.controllers').controller('amountController', function($
shapeshiftOrderUrl += $scope.shapeshiftOrderId; shapeshiftOrderUrl += $scope.shapeshiftOrderId;
confirmData.description = shapeshiftOrderUrl; confirmData.description = shapeshiftOrderUrl;
confirmData.fromWalletId = $scope.fromWalletId; confirmData.fromWalletId = $scope.fromWalletId;
if (confirmData.useSendMax) {
var wallet = lodash.find(profileService.getWallets({ coin: coin }),
function(w) {
return w.id == $scope.fromWalletId;
});
var balance = parseFloat(wallet.cachedBalance.substring(0, wallet.cachedBalance.length-4));
if (balance < $scope.minShapeshiftAmount * 1.04) {
confirmData.useSendMax = false;
confirmData.toAmount = $scope.minShapeshiftAmount * unitToSatoshi;
} else if (balance > $scope.maxShapeshiftAmount) {
confirmData.useSendMax = false;
confirmData.toAmount = $scope.maxShapeshiftAmount * unitToSatoshi * 0.99;
}
}
} }
$state.transitionTo('tabs.send.confirm', confirmData); $state.transitionTo('tabs.send.confirm', confirmData);

4
www/views/amount.html
View file

@ -49,7 +49,7 @@
<div class="amount__result-equiv">&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</div> <div class="amount__result-equiv">&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</div>
</div> </div>
<div> <div>
<button class="button button-sendmax" ng-if="!shapeshiftOrderId" ng-click="sendMax()"> <button class="button button-sendmax" ng-click="sendMax()">
<span> <span>
<i class="icon ion-ios-speedometer-outline"></i>&emsp; <i class="icon ion-ios-speedometer-outline"></i>&emsp;
<span translate>Send max amount</span> <span translate>Send max amount</span>
@ -74,7 +74,7 @@
<span>&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</span> <span>&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</span>
</div> </div>
<div> <div>
<button class="button button-sendmax" ng-if="!shapeshiftOrderId" ng-click="sendMax()"> <button class="button button-sendmax" ng-click="sendMax()">
<span> <span>
<i class="icon ion-ios-speedometer-outline"></i>&emsp; <i class="icon ion-ios-speedometer-outline"></i>&emsp;
<span translate>Send max amount</span> <span translate>Send max amount</span>