Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug with maker fee tx at create offer #4947

Merged
merged 2 commits into from
Dec 14, 2020
Merged

Fix bug with maker fee tx at create offer #4947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b4690
Add null checks for txId
chimp1984 Dec 14, 2020
6dc64fb
Don't show maker fee tx field at create offer window
chimp1984 Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/src/main/java/bisq/core/btc/wallet/WalletService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,9 @@ public Transaction getTransaction(Sha256Hash hash) {

@Nullable
public Transaction getTransaction(String txId) {
if (txId == null) {
return null;
}
return getTransaction(Sha256Hash.wrap(txId));
}

Expand Down
7 changes: 6 additions & 1 deletion core/src/main/java/bisq/core/offer/OfferUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,12 @@ private Optional<Volume> getFeeInUserFiatCurrency(Coin makerFee,
}

public static Optional<String> getInvalidMakerFeeTxErrorMessage(Offer offer, BtcWalletService btcWalletService) {
Transaction makerFeeTx = btcWalletService.getTransaction(offer.getOfferFeePaymentTxId());
String offerFeePaymentTxId = offer.getOfferFeePaymentTxId();
if (offerFeePaymentTxId == null) {
return Optional.empty();
}

Transaction makerFeeTx = btcWalletService.getTransaction(offerFeePaymentTxId);
if (makerFeeTx == null) {
return Optional.empty();
}
Expand Down
32 changes: 20 additions & 12 deletions desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,17 @@ else if (BankUtil.isBankNameRequired(countryCode))
textArea.setEditable(false);
}

rows = 4;
rows = 3;
if (countryCode != null)
rows++;
if (!isF2F)
rows++;

// At create offer we do not show the makerFeeTxId
if (!placeOfferHandlerOptional.isPresent()) {
rows++;
}

TitledGroupBg titledGroupBg = addTitledGroupBg(gridPane, ++rowIndex, rows, Res.get("shared.details"), Layout.GROUP_DISTANCE);
addConfirmationLabelTextFieldWithCopyIcon(gridPane, rowIndex, Res.get("shared.offerId"), offer.getId(),
Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE);
Expand All @@ -342,17 +347,20 @@ else if (BankUtil.isBankNameRequired(countryCode))
formatter.formatCoinWithCode(offer.getSellerSecurityDeposit());
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.securityDeposit"), value);

TxIdTextField makerFeeTxIdTextField = addLabelTxIdTextField(gridPane, ++rowIndex,
Res.get("shared.makerFeeTxId"), offer.getOfferFeePaymentTxId()).second;

int finalRows = rows;
OfferUtil.getInvalidMakerFeeTxErrorMessage(offer, btcWalletService)
.ifPresent(errorMsg -> {
makerFeeTxIdTextField.getTextField().setId("address-text-field-error");
GridPane.setRowSpan(titledGroupBg, finalRows + 1);
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.errorMessage"),
errorMsg.replace("\n\n", "\n"));
});
// At create offer we do not show the makerFeeTxId
if (!placeOfferHandlerOptional.isPresent()) {
TxIdTextField makerFeeTxIdTextField = addLabelTxIdTextField(gridPane, ++rowIndex,
Res.get("shared.makerFeeTxId"), offer.getOfferFeePaymentTxId()).second;

int finalRows = rows;
OfferUtil.getInvalidMakerFeeTxErrorMessage(offer, btcWalletService)
.ifPresent(errorMsg -> {
makerFeeTxIdTextField.getTextField().setId("address-text-field-error");
GridPane.setRowSpan(titledGroupBg, finalRows + 1);
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.errorMessage"),
errorMsg.replace("\n\n", "\n"));
});
}

if (countryCode != null && !isF2F)
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("offerDetailsWindow.countryBank"),
Expand Down