diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index c5181e56b8..94d4495f9f 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -588,11 +588,11 @@ portfolio.pending.autoConf.state.INVALID_DATA=Peer provided invalid data. {0} # suppress inspection "UnusedProperty" portfolio.pending.autoConf.state.PAYOUT_TX_ALREADY_PUBLISHED=Payout transaction was already published. # suppress inspection "UnusedProperty" -portfolio.pending.autoConf.state.DISPUTE_OPENED=Dispute was opened. Service stopped. +portfolio.pending.autoConf.state.DISPUTE_OPENED=Dispute was opened. Auto-confirm is deactivated for that trade. # suppress inspection "UnusedProperty" -portfolio.pending.autoConf.state.REQUESTS_STARTED=Proof requests started +portfolio.pending.autoConf.state.REQUESTS_STARTED=Transaction proof requests started # suppress inspection "UnusedProperty" -portfolio.pending.autoConf.state.PENDING=Service results: {0}/{1}; {2} +portfolio.pending.autoConf.state.PENDING=Success results: {0}/{1}; {2} # suppress inspection "UnusedProperty" portfolio.pending.autoConf.state.COMPLETED=Proof at all services succeeded # suppress inspection "UnusedProperty" diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java index 5f25baaa09..b0e0fa57c2 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java @@ -71,6 +71,8 @@ import javafx.beans.value.ChangeListener; import java.util.Optional; +import javax.annotation.Nullable; + import static bisq.desktop.util.FormBuilder.*; public class SellerStep3View extends TradeStepView { @@ -465,9 +467,14 @@ public class SellerStep3View extends TradeStepView { } } - private void applyAssetTxProofResult(AssetTxProofResult result) { + private void applyAssetTxProofResult(@Nullable AssetTxProofResult result) { String txt = GUIUtil.getProofResultAsString(result); assetTxProofResultField.setText(txt); + if (result == null) { + assetTxConfidenceIndicator.setProgress(0); + return; + } + switch (result) { case PENDING: case COMPLETED: