mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-22 06:41:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix rebase merge errors

Browse source
This commit is contained in:
Christoph Atteneder 2021-11-04 10:55:51 +01:00
parent e17fd9ef54
commit 0e4933f8d1
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
View file

@ -121,7 +121,7 @@ import lombok.Setter;
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;

1
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/OfferViewUtil.java
View file

@ -22,6 +22,7 @@ import bisq.desktop.components.AutoTooltipButton;
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;

2
desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
View file

@ -117,7 +117,7 @@ import java.util.concurrent.TimeUnit;
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;

3
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
View file

@ -688,7 +688,8 @@ class OfferBookViewModel extends ActivatableViewModel {
return coreApi.createCryptoCurrencyPaymentAccount(DisplayUtils.createAssetsAccountName("BSQ", unusedBsqAddressAsString),
"BSQ",
unusedBsqAddressAsString,
isInstantPaymentMethod(offer));
isInstantPaymentMethod(offer),
false);
}
public void setOfferActionHandler(OfferView.OfferActionHandler offerActionHandler) {