From 0e4933f8d1814a901aafddb4b49df0e536c24f6a Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Thu, 4 Nov 2021 10:55:51 +0100
Subject: [PATCH] Fix rebase merge errors

---
 .../java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java | 2 +-
 .../java/bisq/desktop/main/offer/bisq_v1/OfferViewUtil.java    | 1 +
 .../desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java    | 2 +-
 .../bisq/desktop/main/offer/offerbook/OfferBookViewModel.java  | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
index 1789d58ecb0..244c2f52997 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
@@ -121,7 +121,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import static bisq.core.payment.payload.PaymentMethod.HAL_CASH_ID;
-import static bisq.desktop.main.offer.OfferViewUtil.addPayInfoEntry;
+import static bisq.desktop.main.offer.bisq_v1.OfferViewUtil.addPayInfoEntry;
 import static bisq.desktop.util.FormBuilder.*;
 import static javafx.beans.binding.Bindings.createStringBinding;
 
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/OfferViewUtil.java b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/OfferViewUtil.java
index 816ad8cac81..2558c62a455 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/OfferViewUtil.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/OfferViewUtil.java
@@ -22,6 +22,7 @@
 import bisq.desktop.components.AutoTooltipLabel;
 import bisq.desktop.components.HyperlinkWithIcon;
 import bisq.desktop.main.MainView;
+import bisq.desktop.main.offer.SellOfferView;
 import bisq.desktop.main.offer.offerbook.OfferBookView;
 import bisq.desktop.main.overlays.popups.Popup;
 
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
index f87aa496cdb..520eb9d9f3e 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
@@ -117,7 +117,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import static bisq.desktop.main.offer.OfferViewUtil.addPayInfoEntry;
+import static bisq.desktop.main.offer.bisq_v1.OfferViewUtil.addPayInfoEntry;
 import static bisq.desktop.util.FormBuilder.*;
 import static javafx.beans.binding.Bindings.createStringBinding;
 
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
index 51c0da573a0..6ac643e533e 100644
--- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
+++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
@@ -688,7 +688,8 @@ public PaymentAccount createBsqAccount(Offer offer) {
         return coreApi.createCryptoCurrencyPaymentAccount(DisplayUtils.createAssetsAccountName("BSQ", unusedBsqAddressAsString),
                 "BSQ",
                 unusedBsqAddressAsString,
-                isInstantPaymentMethod(offer));
+                isInstantPaymentMethod(offer),
+                false);
     }
 
     public void setOfferActionHandler(OfferView.OfferActionHandler offerActionHandler) {