aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 22:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with already used colors being used first for new tx labels (#2077)

Browse Source 
* Extend list of available tx label colors

* Ensure unknown label colors are given the least priority

closes #2072

* Remove new label colors
This commit is contained in:
Umar Bolatov
2020-12-01 22:38:05 -08:00
committed by GitHub
parent a78c1c8278
commit 6714eb9f7f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BTCPayServer/Controllers/WalletsController.cs
View File

@@ -115,7 +115,7 @@ namespace BTCPayServer.Controllers
"#ff7619", "#ff7619",
"#84b6eb", "#84b6eb",
"#5319e7", "#5319e7",
"#000000", "#cdcdcd",
"#cc317c", "#cc317c",
}; };
@@ -173,7 +173,12 @@ namespace BTCPayServer.Controllers
allColors allColors
.GroupBy(k => k) .GroupBy(k => k)
.OrderBy(k => k.Count()) .OrderBy(k => k.Count())
.ThenBy(k => Array.IndexOf(LabelColorScheme, k.Key)) .ThenBy(k => {
var indexInColorScheme = Array.IndexOf(LabelColorScheme, k.Key);
// Ensures that any label color which may not be in our label color scheme is given the least priority
return indexInColorScheme == -1 ? double.PositiveInfinity : indexInColorScheme;
})
.First().Key; .First().Key;
walletBlobInfo.LabelColors.Add(addlabel, chosenColor); walletBlobInfo.LabelColors.Add(addlabel, chosenColor);
await WalletRepository.SetWalletInfo(walletId, walletBlobInfo); await WalletRepository.SetWalletInfo(walletId, walletBlobInfo);