mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Display changed param value at proposal time, fix #2692

Browse Source
This commit is contained in:
sqrrm 2019-06-16 15:49:30 +02:00
parent abc0909ffe
commit 29c48e9548
No known key found for this signature in database
GPG Key ID: 45235F9EF87089EC
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/bisq/core/dao/DaoFacade.java
View File

@ -689,7 +689,11 @@ public class DaoFacade implements DaoSetupService {
}
public String getParamValue(Param param) {
return daoStateService.getParamValue(param, periodService.getChainHeight());
return getParamValue(param, periodService.getChainHeight());
}
public String getParamValue(Param param, int blockHeight) {
return daoStateService.getParamValue(param, blockHeight);
}
public void resyncDao(Runnable resultHandler) {

1
core/src/main/resources/i18n/displayStrings.properties
View File

@ -1473,6 +1473,7 @@ dao.param.BONDED_ROLE_FACTOR=Bonded role unit factor in BSQ
dao.param.ISSUANCE_LIMIT=Issuance limit per cycle in BSQ
dao.param.currentValue=Current value: {0}
dao.param.currentAndPastValue=Current value: {0} (Value when proposal was made: {1})
dao.param.blocks={0} blocks
dao.results.cycle.duration.label=Duration of {0}

9
desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
View File

@ -39,6 +39,7 @@ import bisq.core.dao.governance.param.Param;
import bisq.core.dao.governance.proposal.ProposalType;
import bisq.core.dao.governance.proposal.param.ChangeParamInputValidator;
import bisq.core.dao.governance.proposal.param.ChangeParamValidator;
import bisq.core.dao.state.model.blockchain.BaseTx;
import bisq.core.dao.state.model.blockchain.Tx;
import bisq.core.dao.state.model.governance.Ballot;
import bisq.core.dao.state.model.governance.BondedRoleType;
@ -542,6 +543,14 @@ public class ProposalDisplay {
comboBoxValueTextField.setText(paramComboBox.getConverter().toString(changeParamProposal.getParam()));
checkNotNull(paramValueTextField, "paramValueTextField must not be null");
paramValueTextField.setText(bsqFormatter.formatParamValue(changeParamProposal.getParam(), changeParamProposal.getParamValue()));
String currentValue = bsqFormatter.formatParamValue(changeParamProposal.getParam(),
daoFacade.getParamValue(changeParamProposal.getParam()));
int height = daoFacade.getTx(changeParamProposal.getTxId())
.map(BaseTx::getBlockHeight)
.orElse(1);
String valueAtProposal = bsqFormatter.formatParamValue(changeParamProposal.getParam(),
daoFacade.getParamValue(changeParamProposal.getParam(), height));
paramValueTextField.setPromptText(Res.get("dao.param.currentAndPastValue", currentValue, valueAtProposal));
} else if (proposal instanceof RoleProposal) {
RoleProposal roleProposal = (RoleProposal) proposal;
checkNotNull(bondedRoleTypeComboBox, "bondedRoleComboBox must not be null");