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

Show info if not in proposal phase #2372

Merged
merged 2 commits into from Feb 5, 2019

Conversation

Projects
None yet
2 participants
@ripcurlx
Copy link
Member

ripcurlx commented Feb 5, 2019

Fixes #2087.

In make-proposal-phase
bildschirmfoto 2019-02-05 um 14 55 25
Not in make-proposal-phase
bildschirmfoto 2019-02-05 um 14 55 17

@ripcurlx ripcurlx requested a review from ManfredKarrer as a code owner Feb 5, 2019

proposalTypeComboBox.getSelectionModel().clearSelection();
updateTimeUntilNextProposalPhase(height);

This comment has been minimized.

@ManfredKarrer

ManfredKarrer Feb 5, 2019

Member

Here u get the current cycle so it will show the past proposal phase.
screen shot 2019-02-05 at 15 07 44
Either we add the duration of a full cycle, or we show just a diff. text and pointing to the dashboard to see when phases start and end (i think thats better as there its easier to understand if u see all phases).

This comment has been minimized.

@ripcurlx

ripcurlx Feb 5, 2019

Author Member

Ah - missed that. Didn't read the content of the proposal phase field properly 😬. I just wanted to give the user directly the information when the next proposal phase will be active, so he/she can make a calendar entry or similar. I'm personally more for adding a full cycle duration and show the correct date (without duration in blocks in the front). I'll give it a quick shot how it would look like.

@ManfredKarrer ManfredKarrer changed the title Improve not in make proposal phase state Show info if not in proposal phase Feb 5, 2019

ripcurlx added some commits Feb 5, 2019

@ripcurlx ripcurlx force-pushed the ripcurlx:add-wait-until-next-proposal-phase-state branch from 7dba112 to 0aa931d Feb 5, 2019

@ripcurlx

This comment has been minimized.

Copy link
Member Author

ripcurlx commented Feb 5, 2019

I've added the current cycle time to calculate the next phase. Of course this might be not always 100% correct if we change the phase duration for the next cycle, but at least the starting block should always be correct.
bildschirmfoto 2019-02-05 um 15 52 46

@ManfredKarrer
Copy link
Member

ManfredKarrer left a comment

ACK

* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/

package bisq.core.dao;

This comment has been minimized.

@ManfredKarrer

ManfredKarrer Feb 5, 2019

Member

Lets move that in a presentation package. We use that aleady in other domains for UI sepefic stuff which is in core only for sharing with API. Actaully in that case its not clear if we will need that for the API so it could be left in the desktop module as well.

This comment has been minimized.

@ripcurlx

ripcurlx Feb 5, 2019

Author Member

I wasn't sure if it will be needed in the API as well. But I'll move it into the desktop module then.

@ManfredKarrer ManfredKarrer merged commit a4428ff into bisq-network:master Feb 5, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ManfredKarrer

This comment has been minimized.

Copy link
Member

ManfredKarrer commented Feb 5, 2019

Pushed a4428ff

@ripcurlx ripcurlx referenced this pull request Feb 26, 2019

Closed

For February 2019 #224

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.