Merge pull request #824

3adb29b Remove unnecessary synchronous call to useForkRules (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-08-23 21:23:33 +02:00
commit 4ca5e82fca
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -686,14 +686,9 @@ Rectangle {
} }
function updatePriorityDropdown() { function updatePriorityDropdown() {
// Use new fee multipliers after v5 fork priorityDropdown.dataModel = priorityModelV5;
if (typeof currentWallet != "undefined" && currentWallet.useForkRules(5)) { priorityDropdown.currentIndex = 1
priorityDropdown.dataModel = priorityModelV5; priorityDropdown.update()
priorityDropdown.currentIndex = 1
} else {
priorityDropdown.dataModel = priorityModel;
priorityDropdown.currentIndex = 0
}
} }
//TODO: Add daemon sync status //TODO: Add daemon sync status