Skip to content

Commit

Permalink
Merge branch 'master' into 08-handle-extradata-in-editoffer
Browse files Browse the repository at this point in the history
Resolve file conflicts resulting from merging PRs
    bisq-network#5577
    bisq-network#5651
  • Loading branch information
ghubstan committed Aug 16, 2021
2 parents 71a61c6 + 1509372 commit 1c096d0
Show file tree
Hide file tree
Showing 17 changed files with 934 additions and 357 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ public String getDisplayString() {
return String.format(displayString, daysUntilLimitLifted);
}

public boolean isLimitLifted() {
return this == PEER_LIMIT_LIFTED || this == PEER_SIGNER || this == ARBITRATOR;
}

}

private final KeyRing keyRing;
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/bisq/core/api/CoreOffersService.java
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@ private OfferPayload getMergedOfferPayload(OpenOffer openOffer,
offer.getOfferPayload().getCountryCode(),
offer.getOfferPayload().getAcceptedCountryCodes(),
offer.getOfferPayload().getBankId(),
offer.getOfferPayload().getAcceptedBankIds());
offer.getOfferPayload().getAcceptedBankIds(),
offer.getOfferPayload().getExtraDataMap());
log.info("Merging OfferPayload with {}", mutableOfferPayloadFields);
return offerUtil.getMergedOfferPayload(openOffer, mutableOfferPayloadFields);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package bisq.core.offer;

import java.util.List;
import java.util.Map;

import lombok.Getter;
import lombok.Setter;
Expand Down Expand Up @@ -48,6 +49,8 @@ public final class MutableOfferPayloadFields {
private final String bankId;
@Nullable
private final List<String> acceptedBankIds;
@Nullable
private final Map<String, String> extraDataMap;

public MutableOfferPayloadFields(OfferPayload offerPayload) {
this(offerPayload.getPrice(),
Expand All @@ -60,7 +63,8 @@ public MutableOfferPayloadFields(OfferPayload offerPayload) {
offerPayload.getCountryCode(),
offerPayload.getAcceptedCountryCodes(),
offerPayload.getBankId(),
offerPayload.getAcceptedBankIds());
offerPayload.getAcceptedBankIds(),
offerPayload.getExtraDataMap());
}

public MutableOfferPayloadFields(long price,
Expand All @@ -73,7 +77,8 @@ public MutableOfferPayloadFields(long price,
@Nullable String countryCode,
@Nullable List<String> acceptedCountryCodes,
@Nullable String bankId,
@Nullable List<String> acceptedBankIds) {
@Nullable List<String> acceptedBankIds,
@Nullable Map<String, String> extraDataMap) {
this.price = price;
this.marketPriceMargin = marketPriceMargin;
this.useMarketBasedPrice = useMarketBasedPrice;
Expand All @@ -85,5 +90,6 @@ public MutableOfferPayloadFields(long price,
this.acceptedCountryCodes = acceptedCountryCodes;
this.bankId = bankId;
this.acceptedBankIds = acceptedBankIds;
this.extraDataMap = extraDataMap;
}
}
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/offer/OfferUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ public OfferPayload getMergedOfferPayload(OpenOffer openOffer,
originalOfferPayload.getUpperClosePrice(),
originalOfferPayload.isPrivateOffer(),
originalOfferPayload.getHashOfChallenge(),
originalOfferPayload.getExtraDataMap(),
mutableOfferPayloadFields.getExtraDataMap(),
originalOfferPayload.getProtocolVersion());
}

Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/bisq/core/support/dispute/Dispute.java
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ public static protobuf.Dispute.State toProtoMessage(Dispute.State state) {
private transient String uid;
@Setter
private transient long payoutTxConfirms = -1;
@Setter
private transient boolean payoutDone = false;

private transient final BooleanProperty isClosedProperty = new SimpleBooleanProperty();
private transient final IntegerProperty badgeCountProperty = new SimpleIntegerProperty();
Expand Down
11 changes: 11 additions & 0 deletions core/src/main/resources/i18n/displayStrings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,14 @@ offerbook.timeSinceSigning.info.signer=signed by peer and can sign peer accounts
offerbook.timeSinceSigning.info.banned=account was banned
offerbook.timeSinceSigning.daysSinceSigning={0} days
offerbook.timeSinceSigning.daysSinceSigning.long={0} since signing
offerbook.timeSinceSigning.tooltip.accountLimit=Account limit: {0}
offerbook.timeSinceSigning.tooltip.accountLimitLifted=Account limit lifted
offerbook.timeSinceSigning.tooltip.info.unsigned=This account hasn't been signed yet
offerbook.timeSinceSigning.tooltip.info.signed=This account has been signed
offerbook.timeSinceSigning.tooltip.info.signedAndLifted=This account has been signed and can sign peer accounts
offerbook.timeSinceSigning.tooltip.checkmark.buyBtc=buy BTC from a signed account
offerbook.timeSinceSigning.tooltip.checkmark.wait=wait a minimum of {0} days
offerbook.timeSinceSigning.tooltip.learnMore=Learn more
offerbook.xmrAutoConf=Is auto-confirm enabled

offerbook.timeSinceSigning.help=When you successfully complete a trade with a peer who has a signed payment account, your payment account is signed.\n\
Expand Down Expand Up @@ -2626,6 +2634,9 @@ disputeSummaryWindow.close.txDetails=Spending: {0}\n\
disputeSummaryWindow.close.noPayout.headline=Close without any payout
disputeSummaryWindow.close.noPayout.text=Do you want to close without doing any payout?

disputeSummaryWindow.close.alreadyPaid.headline=Payout already done
disputeSummaryWindow.close.alreadyPaid.text=Restart the client to do another payout for this dispute

emptyWalletWindow.headline={0} emergency wallet tool
emptyWalletWindow.info=Please use that only in emergency case if you cannot access your fund from the UI.\n\n\
Please note that all open offers will be closed automatically when using this tool.\n\n\
Expand Down
132 changes: 96 additions & 36 deletions desktop/package/29CDFD3B.asc
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,100 @@ 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
NYeOG8Xnm4CxuWqUu0FDMv6BhkMCTz2X4xcnbtI=
=9LRS
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
Bt9fU4wDD1lOCBjI1JG+aQ==
=SPaw
-----END PGP PUBLIC KEY BLOCK-----
20 changes: 20 additions & 0 deletions desktop/src/main/java/bisq/desktop/bisq.css
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,11 @@ tree-table-view:focused {
-fx-font-size: 13;
}

.bold-text,
.bold-text .text {
-fx-font-weight: bold;
}

/* Splash */
#splash {
-fx-background-color: -bs-background-color;
Expand Down Expand Up @@ -1916,6 +1921,21 @@ textfield */
-fx-effect: dropshadow(gaussian, -bs-text-color-transparent-dark, 44, 0, -1, 3);
}

.account-status-title {
-fx-font-size: 0.769em;
-fx-font-family: "IBM Plex Sans Medium";
}

.account-status-inactive-info-item {
-fx-text-fill: -bs-color-gray-dim;
-fx-fill: -bs-color-gray-dim;
}

.account-status-active-info-item {
-fx-text-fill: -fx-accent;
-fx-fill: -fx-accent;
}

#price-feed-combo {
-fx-background-color: none;
}
Expand Down
Loading

0 comments on commit 1c096d0

Please sign in to comment.