Add option key daoActivated to enable all dao features for dev

This commit is contained in:
Manfred Karrer 2018-04-19 20:51:03 -05:00
parent 006e682249
commit 41b6155273
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
3 changed files with 3 additions and 3 deletions

View file

@ -73,7 +73,7 @@ public class DaoView extends ActivatableViewAndModel<TabPane, Activatable> {
votingTab.setClosable(false);
root.getTabs().addAll(compensationTab, votingTab);
if (!BisqEnvironment.isDAOActivatedAndBaseCurrencySupportingBsq() || !DevEnv.DAO_PHASE2_ACTIVATED) {
if (!BisqEnvironment.isDAOActivatedAndBaseCurrencySupportingBsq() || !DevEnv.isDaoPhase2Activated()) {
votingTab.setDisable(true);
compensationTab.setDisable(true);
}

View file

@ -952,7 +952,7 @@ public abstract class EditableOfferView<M extends EditableOfferViewModel> extend
GridPane.setMargin(nextButton, new Insets(-35, 0, 0, 0));
nextButton.setOnAction(e -> {
if (model.isPriceInRange()) {
if (DevEnv.DAO_TRADING_ACTIVATED)
if (DevEnv.isDaoTradingActivated())
showFeeOption();
else
onShowPayFundsScreen();

View file

@ -763,7 +763,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
}
private void showNextStepAfterAmountIsSet() {
if (DevEnv.DAO_TRADING_ACTIVATED)
if (DevEnv.isDaoTradingActivated())
showFeeOption();
else
onShowPayFundsScreen();