[bisq-network/bisq-desktop] Sync up with changes from voting branch (#1601)

[Manfred Karrer]

ManfredKarrer commented on this pull request.



> @@ -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>() {

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...

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq-desktop/pull/1601#discussion_r201177724
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20180709/5309a73e/attachment.html>