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

Hide AdvOpts after click on SendAll

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-11-23 10:47:24 -03:00
commit cfcda94052
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/walletHome.html
View file

@ -278,7 +278,7 @@
<a class="right lh" <a class="right lh"
ng-if="index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount" ng-if="index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr, index.feeRateToSendMax)" ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr, index.feeRateToSendMax, index.currentFeeLevel)"
translate> Send All translate> Send All
</a> </a>
@ -383,7 +383,7 @@
</div> </div>
</div> </div>
<div class="m20b" ng-init="home.hideAdvSend=true"> <div class="m20b" ng-init="home.hideAdvSend=true" ng-show="!home.disableAdvSend">
<a class="button outline light-gray expand tiny m0" ng-click="home.hideAdvSend=!home.hideAdvSend"> <a class="button outline light-gray expand tiny m0" ng-click="home.hideAdvSend=!home.hideAdvSend">
<i class="fi-widget m3r"></i> <i class="fi-widget m3r"></i>
<span translate ng-hide="!home.hideAdvSend">Show advanced options</span> <span translate ng-hide="!home.hideAdvSend">Show advanced options</span>

10
src/js/controllers/walletHome.js
View file

@ -23,6 +23,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.isMobile = isMobile.any(); this.isMobile = isMobile.any();
this.isWindowsPhoneApp = isMobile.Windows() && isCordova; this.isWindowsPhoneApp = isMobile.Windows() && isCordova;
this.blockUx = false; this.blockUx = false;
this.disableAdvSend = false;
this.isRateAvailable = false; this.isRateAvailable = false;
this.showScanner = false; this.showScanner = false;
this.isMobile = isMobile.any(); this.isMobile = isMobile.any();
@ -1022,6 +1023,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.lockAmount = false; this.lockAmount = false;
this.currentSendFeeLevel = null; this.currentSendFeeLevel = null;
this.hideAdvSend = true; this.hideAdvSend = true;
this.disableAdvSend = false;
$scope.currentSpendUnconfirmed = configService.getSync().wallet.spendUnconfirmed; $scope.currentSpendUnconfirmed = configService.getSync().wallet.spendUnconfirmed;
this._amount = this._address = null; this._amount = this._address = null;
@ -1285,15 +1287,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.setForm(null, amount, null, feeRate); this.setForm(null, amount, null, feeRate);
}; };
this.sendAll = function(amount, feeStr, feeRate) { this.sendAll = function(amount, feeStr, feeRate, currentFeeLevel) {
var self = this; var self = this;
var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", { var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", {
fee: feeStr fee: feeStr
}); });
confirmDialog.show(msg, function(confirmed) { confirmDialog.show(msg, function(confirmed) {
if (confirmed) if (confirmed) {
self._doSendAll(amount, feeRate); self._doSendAll(amount, feeRate);
self.disableAdvSend = true;
self.currentSendFeeLevel = currentFeeLevel;
$scope.currentSpendUnconfirmed = configService.getSync().wallet.spendUnconfirmed;
}
}); });
}; };