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

Add null check. Improve text

Browse source
This commit is contained in:
chimp1984 2020-09-03 21:14:06 -05:00 • committed by Christoph Atteneder
parent 044d23f933
commit 63444b1f77
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/resources/i18n/displayStrings.properties
View file

@ -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"

9
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View file

@ -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: