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

Merge pull request #8144 from cmgustavo/bug/v3-required-fee-rate 

[v3] Fixes "feeRate" as integer if usingMerchantFee
This commit is contained in:
Gabriel Edgardo Bazán 2018-03-02 14:51:00 -03:00 committed by GitHub
parent 6d6d6c35e6 4fc2c7cc21
commit 4625589ba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/controllers/confirm.js
View File

@ -173,7 +173,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
if (data.stateParams.requiredFeeRate) {
usingMerchantFee = true;
tx.feeRate = data.stateParams.requiredFeeRate;
tx.feeRate = parseInt(data.stateParams.requiredFeeRate);
} else {
tx.feeLevel= (tx.coin && tx.coin == 'bch') ? 'normal ' : configFeeLevel;
}

2
www/views/confirm.html
View File

@ -36,7 +36,7 @@
<i ng-if="wallet.coin == 'btc'" class="icon bp-arrow-right"></i>
</div>
<div class="item single-line" ng-if="tx.paypro">
<div class="item single-line" ng-if="tx.paypro && !criticalError">
<span class="label" translate>Payment Expires:</span>
<span class="item-note" ng-if="!paymentExpired">{{remainingTimeStr}}</span>
<span class="item-note" ng-if="paymentExpired" ng-style="{'color': 'red'}" translate>Expired</span>