sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ensure fees decrease as target blocks increase, show priority on target blocks slider track

Browse source
This commit is contained in:
Craig Raw 2021-03-19 13:35:59 +02:00
parent 8d9e253f93
commit 1274d56fce
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/sparrowwallet/sparrow/net/FeeRatesSource.java
View file

@ -63,6 +63,7 @@ public enum FeeRatesSource {
try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream()); Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) { try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream()); Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
Gson gson = new Gson(); Gson gson = new Gson();
ThreeTierRates threeTierRates = gson.fromJson(reader, ThreeTierRates.class); ThreeTierRates threeTierRates = gson.fromJson(reader, ThreeTierRates.class);
Double lastRate = null;
for(Integer blockTarget : defaultblockTargetFeeRates.keySet()) { for(Integer blockTarget : defaultblockTargetFeeRates.keySet()) {
if(blockTarget < BLOCKS_IN_HALF_HOUR) { if(blockTarget < BLOCKS_IN_HALF_HOUR) {
blockTargetFeeRates.put(blockTarget, threeTierRates.fastestFee); blockTargetFeeRates.put(blockTarget, threeTierRates.fastestFee);
@ -75,6 +76,11 @@ public enum FeeRatesSource {
} else { } else {
blockTargetFeeRates.put(blockTarget, defaultblockTargetFeeRates.get(blockTarget)); blockTargetFeeRates.put(blockTarget, defaultblockTargetFeeRates.get(blockTarget));
} }
if(lastRate != null) {
blockTargetFeeRates.put(blockTarget, Math.min(lastRate, blockTargetFeeRates.get(blockTarget)));
}
lastRate = blockTargetFeeRates.get(blockTarget);
} }
if(threeTierRates.minimumFee != null) { if(threeTierRates.minimumFee != null) {

7
src/main/resources/com/sparrowwallet/sparrow/wallet/send.css
View file

@ -104,3 +104,10 @@
#transactionDiagram .utxo-label:hover .button .label .text { #transactionDiagram .utxo-label:hover .button .label .text {
-fx-fill: -fx-text-base-color; -fx-fill: -fx-text-base-color;
} }
#targetBlocks .track {
-fx-background-color: -fx-shadow-highlight-color,
linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
linear-gradient(to bottom, derive(-fx-control-inner-background, -9%), derive(-fx-control-inner-background, 0%), derive(-fx-control-inner-background, -5%), derive(-fx-control-inner-background, -12%)),
linear-gradient(to right, #c8416466 0%, #a0a1a766 50%, #a0a1a700 100%);
}