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

Remove hasMatchingArbitrator check

Browse source
This commit is contained in:
Manfred Karrer 2018-10-02 22:47:16 -05:00
parent cb17b008a3
commit 6346b14577
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
2 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
View file

@ -416,7 +416,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
private void onShowInfo(Offer offer,
boolean isPaymentAccountValidForOffer,
boolean hasMatchingArbitrator,
boolean hasSameProtocolVersion,
boolean isIgnored,
boolean isOfferBanned,
@ -424,9 +423,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
boolean isPaymentMethodBanned,
boolean isNodeAddressBanned,
boolean isInsufficientTradeLimit) {
if (!hasMatchingArbitrator) {
new Popup<>().warning(Res.get("popup.warning.noArbitratorsAvailable")).show();
} else if (!isPaymentAccountValidForOffer) {
if (!isPaymentAccountValidForOffer) {
openPopupForMissingAccountSetup(Res.get("offerbook.warning.noMatchingAccount.headline"),
Res.get("offerbook.warning.noMatchingAccount.msg"),
FiatAccountsView.class,
@ -796,7 +793,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
return new TableCell<OfferBookListItem, OfferBookListItem>() {
final ImageView iconView = new ImageView();
final Button button = new AutoTooltipButton();
boolean isTradable, isPaymentAccountValidForOffer, hasMatchingArbitrator,
boolean isTradable, isPaymentAccountValidForOffer,
hasSameProtocolVersion, isIgnored, isOfferBanned, isCurrencyBanned,
isPaymentMethodBanned, isNodeAddressBanned, isInsufficientTradeLimit;
@ -817,7 +814,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
boolean myOffer = model.isMyOffer(offer);
if (tableRow != null) {
isPaymentAccountValidForOffer = model.isAnyPaymentAccountValidForOffer(offer);
hasMatchingArbitrator = model.hasMatchingArbitrator(offer);
hasSameProtocolVersion = model.hasSameProtocolVersion(offer);
isIgnored = model.isIgnored(offer);
isOfferBanned = model.isOfferBanned(offer);
@ -826,7 +822,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
isNodeAddressBanned = model.isNodeAddressBanned(offer);
isInsufficientTradeLimit = model.isInsufficientTradeLimit(offer);
isTradable = isPaymentAccountValidForOffer &&
hasMatchingArbitrator &&
hasSameProtocolVersion &&
!isIgnored &&
!isOfferBanned &&
@ -848,7 +843,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
if (!(e.getTarget() instanceof ImageView || e.getTarget() instanceof Canvas))
onShowInfo(offer,
isPaymentAccountValidForOffer,
hasMatchingArbitrator,
hasSameProtocolVersion,
isIgnored,
isOfferBanned,
@ -880,7 +874,6 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
if (!myOffer && !isTradable)
button.setOnAction(e -> onShowInfo(offer,
isPaymentAccountValidForOffer,
hasMatchingArbitrator,
hasSameProtocolVersion,
isIgnored,
isOfferBanned,

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

@ -536,19 +536,6 @@ class OfferBookViewModel extends ActivatableViewModel {
});
}
boolean hasMatchingArbitrator(Offer offer) {
final List<NodeAddress> acceptedArbitratorAddresses = user.getAcceptedArbitratorAddresses();
if (acceptedArbitratorAddresses != null) {
for (NodeAddress offerArbitratorNodeAddress : offer.getArbitratorNodeAddresses()) {
for (NodeAddress acceptedArbitratorNodeAddress : acceptedArbitratorAddresses) {
if (offerArbitratorNodeAddress.equals(acceptedArbitratorNodeAddress))
return true;
}
}
}
return false;
}
boolean isIgnored(Offer offer) {
return preferences.getIgnoreTradersList().stream()
.anyMatch(i -> i.equals(offer.getMakerNodeAddress().getHostNameWithoutPostFix()));