Sync up with changes from voting branch #1601
Conversation
- Add onUiReadyHandler to BisqApp and MainView - Add startApplication and onApplicationStarted to BisqAppMain - Improve MenuItem component - Use TxBroadcaster.Callback() instead of FutureCallback<Transaction>() - Apply startup changes to MainViewModel - Apply changes of data storage
|
ACK - checked out all branches locally and did a test trade. Everything working so far for me. |
|
So the ACK applies to all sub projects? |
| @@ -159,7 +153,8 @@ public void initialize() { | |||
| bsqFormatter.formatCoinWithCode(receiverAmount))) | |||
| .actionButtonText(Res.get("shared.yes")) | |||
| .onAction(() -> { | |||
| walletsManager.publishAndCommitBsqTx(txWithBtcFee, new FutureCallback<Transaction>() { | |||
| // TODO not updated to TxBroadcaster changes because not in sync with voting branch anyway | |||
| /* walletsManager.publishAndCommitBsqTx(txWithBtcFee, new FutureCallback<Transaction>() { | |||
There was a problem hiding this comment.
Should this be fixed now that voting branch is being merged?
There was a problem hiding this comment.
No I did not merge the dao code, just a few parts which was required due the refactoring. So the dao code in master is still the old one from a few months back...
There was a problem hiding this comment.
A main reason why not merge yet is bc of PB changes need to be tested well and if we have it in master it will be harder to change, so better for the WIP state to be more flexible with PB changes....
There was a problem hiding this comment.
Yeah, noticing parts are there but a lot isn't.
There was a problem hiding this comment.
Yes, only technical refactorings (class rename, move) in the dao project got applied.
|
@ManfredKarrer I checked out all PR's and built the client. So my testing involved the other PR's as well. |
|
Same question here as in #1605 (comment). Was it unintentional to merge this as @bisq-github-admin-2? |
|
Yes because I did not had merge rights anymore with my dev account. I merged already the other projects so it would have caused problems to leave desktop with the old version. |
|
@ManfredKarrer and I sorted out the merge permissions issue. See #1605 (comment) for details. |
There have been several changes in the voting branch (and api-integration) which I want to get into master to avoid that those branches run out of sync as well as to apply the improvements.
The main changes are:
Beside that there are many smaller trivial improvements, fixes, refactoring and cleanups.
Changes in that project: