Merge branch 'master' into nymkappa/bugfix/umbrel-electrs-504

This commit is contained in:
Felipe Knorr Kuhn authored and GitHub committed 2022-06-28 06:18:34 -07:00
commit 1b2fbfd506
3 files changed
+18 -8

No files matched your search

@@ -140,9 +140,8 @@ export default class TxView implements TransactionStripped {
}
getColor(): Color {
let feeLevelIndex = feeLevels.slice().reverse().findIndex((feeLvl) => (this.feerate || 1) >= feeLvl);
feeLevelIndex = feeLevelIndex >= 0 ? feeLevels.length - feeLevelIndex : feeLevelIndex;
return hexToColor(mempoolFeeColors[feeLevelIndex - 1] || mempoolFeeColors[mempoolFeeColors.length - 1]);
const feeLevelIndex = feeLevels.findIndex((feeLvl) => Math.max(1, this.feerate) < feeLvl) - 1;
return hexToColor(mempoolFeeColors[feeLevelIndex] || mempoolFeeColors[mempoolFeeColors.length - 1]);
}
}