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

Removes unused fee rate variable

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-02 12:21:26 -03:00
commit 4cbee7261e
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/walletHome.html
View file

@ -270,7 +270,7 @@
<available-balance></available-balance> <available-balance></available-balance>
<a class="db" <a class="db"
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)"
translate> Send All translate> Send All
</a> </a>
</h4> </h4>
@ -311,7 +311,7 @@
</div> </div>
<a class="postfix button" <a class="postfix button"
ng-style="{'background-color':index.backgroundColor}" ng-style="{'background-color':index.backgroundColor}"
ng-click="openDestinationAddressModal(index.otherWallets, _address)"> ng-click="home.openDestinationAddressModal(index.otherWallets, _address)">
<i class="fi-plus size-14 lh"></i> <i class="fi-plus size-14 lh"></i>
</a> </a>
</div> </div>

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

@ -113,10 +113,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var cancel_msg = gettextCatalog.getString('Cancel'); var cancel_msg = gettextCatalog.getString('Cancel');
var confirm_msg = gettextCatalog.getString('Confirm'); var confirm_msg = gettextCatalog.getString('Confirm');
$scope.openDestinationAddressModal = function(wallets, address) { this.openDestinationAddressModal = function(wallets, address) {
$rootScope.modalOpened = true; $rootScope.modalOpened = true;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
self.resetForm(); self.lockAddress = false;
self._address = null;
var ModalInstanceCtrl = function($scope, $modalInstance) { var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.wallets = wallets; $scope.wallets = wallets;
@ -969,7 +970,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}); });
}; };
this.setForm = function(to, amount, comment, feeRate) { this.setForm = function(to, amount, comment) {
var form = $scope.sendForm; var form = $scope.sendForm;
if (to) { if (to) {
form.address.$setViewValue(to); form.address.$setViewValue(to);
@ -990,10 +991,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
form.comment.$isValid = true; form.comment.$isValid = true;
form.comment.$render(); form.comment.$render();
} }
if (feeRate) {
form.feeRate = feeRate;
}
}; };
@ -1009,10 +1006,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var form = $scope.sendForm; var form = $scope.sendForm;
if (form && form.feeRate) {
form.feeRate = null;
}
if (form && form.amount) { if (form && form.amount) {
form.amount.$pristine = true; form.amount.$pristine = true;
form.amount.$setViewValue(''); form.amount.$setViewValue('');
@ -1262,11 +1255,11 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
return actions.hasOwnProperty('create'); return actions.hasOwnProperty('create');
}; };
this._doSendAll = function(amount, feeRate) { this._doSendAll = function(amount) {
this.setForm(null, amount, null, feeRate); this.setForm(null, amount, null);
}; };
this.sendAll = function(amount, feeStr, feeRate) { this.sendAll = function(amount, feeStr) {
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
@ -1274,7 +1267,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
confirmDialog.show(msg, function(confirmed) { confirmDialog.show(msg, function(confirmed) {
if (confirmed) { if (confirmed) {
self._doSendAll(amount, feeRate); self._doSendAll(amount);
} }
}); });
}; };