Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dao UI improvements #1795

Merged
merged 9 commits into from
Oct 23, 2018

Conversation

ManfredKarrer
Copy link
Member

Too much small changed to list all....

- Change FULL_DAO_NODE option from boolean to string to be able to detect not set values
- isFullDaoNode, rpcUser and rpcPw can be set in the UI. If prog ars are
available they will overwrite the UI data.
Copy link
Member

@sqrrm sqrrm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm generally ok with this. utACK after tending to the comments (especially on display of phase length)

case PROPOSAL:
break;
case BREAK1:
firstBlock++;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like the opposite of what the comment says. This will show the second block of the break as the first block.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, should rename the var or refactor it so its less hacky...

// block of the technical 3601 blocks is displayed as part of the break1 phase.
/* PHASE_UNDEFINED(0),
PHASE_PROPOSAL(3601), // 24 days
PHASE_BREAK1(149), // 1 day
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about 299?

Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK - besides some minor changes

return firstBlock;
}

// Because last block in request and voting phases must not be used fo making a tx as it will get confirmed in the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo:

fo --> for

isDaoFullNodeCheckBox.setOnAction(e -> {
String key = "daoFullModeInfoShown";
if (isDaoFullNodeCheckBox.isSelected() && preferences.showAgain(key)) {
String url = "https://bisq.network/docs/dao-full-node";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could think about moving all URLs into one place so they get easier to maintain when the structure in the docs is changed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes good idea. I use forwarders so we are independent from real url.

@ripcurlx
Copy link
Contributor

@ManfredKarrer Also please merge master into the PR so the travis build can run.

@Christoph Can you have a look why JMockit is not working anymore
in that module? TradesChartsViewModel is null and creates a nullpointer.
Adding RunWith("JMockit") as it was earlier does not work with changed gradle file
with newer JMockit version.
@ManfredKarrer ManfredKarrer merged commit fd6681b into bisq-network:master Oct 23, 2018
@ManfredKarrer ManfredKarrer deleted the DAO-UI-hide-details branch October 23, 2018 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants