BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4323 from JDonadio/bug/fee 

Bug fee selection on mobile
This commit is contained in:
Matias Alejo Garcia 2016-06-09 12:13:32 -03:00
parent 88de164318 93b789f050
commit a0c64ea88d
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/views/preferencesFee.html
View File

@ -8,31 +8,28 @@
<div class="preferences-fee" ng-show="prefFee.loading"> <div class="preferences-fee" ng-show="prefFee.loading">
<div class="row p20 text-center"> <div class="row p20 text-center">
<div class="columns large-12 medium-12 small-12 m10b"> <div class="columns large-12 medium-12 small-12 m10b">
<ion-spinner class="spinner-stable" icon="lines"></ion-spinner> <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
</div> </div>
<div class="size-12 text-gray m20t" translate> <div class="size-12 text-gray m20t" translate>
Loading... Loading...
</div> </div>
</div> </div>
</div> </div>
<ul class="no-bullet m0">
<li ng-repeat="fee in prefFee.feeLevels.livenet" <ion-radio class="size-12" ng-repeat="fee in prefFee.feeLevels.livenet" ng-value="fee.level" ng-model="data.currentFeeLevel"
ng-click="prefFee.save(fee.level)"> ng-click="prefFee.save(fee)">{{prefFee.feeOpts[fee.level]|translate}}
{{prefFee.feeOpts[fee.level]|translate}} </ion-radio>
<i class="fi-check size-16 right" ng-show="prefFee.currentFeeLevel == fee.level"></i>
</li>
</ul>
<div class="row m20t"> <div class="row m20t">
<div class="text-gray size-12 text-center" ng-repeat="fee in prefFee.feeLevels.livenet" ng-if="fee.level == prefFee.currentFeeLevel"> <div class="text-gray size-12 text-center" ng-repeat="fee in prefFee.feeLevels.livenet" ng-if="fee.level == data.currentFeeLevel">
<div ng-show="fee.nbBlocks"> <div ng-show="fee.nbBlocks">
<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>. <span class="text-bold" translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>.
</div> </div>
<span class="size-12 text-light" translate>Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB</span> <span class="text-bold" translate>Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB</span>
</div> </div>
</div> </div>
<div class="row m20t"> <div class="m15">
<div class="text-gray size-12 text-center" translate> <div class="text-gray size-12 text-center" translate>
Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy. Bitcoin transactions may include a fee collected by miners on the network. The higher the fee, the greater the incentive a miner has to include that transaction in a block. Actual fees are determined based on network load and the selected policy.
</div> </div>

4
src/css/ionic-migration.css
View File

@ -20,6 +20,10 @@
z-index: -1; z-index: -1;
} }
.item-radio .radio-icon {
font-size: 16px;
}
.popup-container.active .popup { .popup-container.active .popup {
border-radius: 10px; border-radius: 10px;
} }

8
src/js/controllers/preferencesFee.js
View File

@ -9,7 +9,9 @@ angular.module('copayApp.controllers').controller('preferencesFeeController',
feeService.getFeeLevels(function(levels) { feeService.getFeeLevels(function(levels) {
self.loading = false; self.loading = false;
self.feeOpts = feeService.feeOpts; self.feeOpts = feeService.feeOpts;
self.currentFeeLevel = feeService.getCurrentFeeLevel(); $scope.data = {
currentFeeLevel: feeService.getCurrentFeeLevel()
};
self.feeLevels = levels; self.feeLevels = levels;
$scope.$apply(); $scope.$apply();
}); });
@ -20,14 +22,14 @@ angular.module('copayApp.controllers').controller('preferencesFeeController',
var opts = { var opts = {
wallet: { wallet: {
settings: { settings: {
feeLevel: newFee feeLevel: newFee.level
} }
} }
}; };
configService.set(opts, function(err) { configService.set(opts, function(err) {
if (err) $log.debug(err); if (err) $log.debug(err);
self.currentFeeLevel = feeService.getCurrentFeeLevel(); $scope.currentFeeLevel = newFee.level;
}); });
}; };