mirror of
https://github.com/boldsuck/haveno.git
synced 2025-01-09 09:39:23 +00:00
update buyer seller step view even if error
This commit is contained in:
parent
fd69f4250b
commit
a03941817e
2 changed files with 66 additions and 76 deletions
|
@ -150,7 +150,6 @@ public class BuyerStep2View extends TradeStepView {
|
||||||
if (trade.isDepositsUnlocked() && !trade.isPaymentSent()) {
|
if (trade.isDepositsUnlocked() && !trade.isPaymentSent()) {
|
||||||
showPopup();
|
showPopup();
|
||||||
} else if (state.ordinal() <= Trade.State.BUYER_SEND_FAILED_PAYMENT_SENT_MSG.ordinal()) {
|
} else if (state.ordinal() <= Trade.State.BUYER_SEND_FAILED_PAYMENT_SENT_MSG.ordinal()) {
|
||||||
if (!trade.hasFailed()) {
|
|
||||||
switch (state) {
|
switch (state) {
|
||||||
case BUYER_CONFIRMED_IN_UI_PAYMENT_SENT:
|
case BUYER_CONFIRMED_IN_UI_PAYMENT_SENT:
|
||||||
busyAnimation.play();
|
busyAnimation.play();
|
||||||
|
@ -187,10 +186,6 @@ public class BuyerStep2View extends TradeStepView {
|
||||||
statusLabel.setText(Res.get("shared.sendingConfirmationAgain"));
|
statusLabel.setText(Res.get("shared.sendingConfirmationAgain"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
log.warn("Trade contains error message {}", trade.getErrorMessage());
|
|
||||||
statusLabel.setText("");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -114,7 +114,6 @@ public class SellerStep3View extends TradeStepView {
|
||||||
if (trade.isPaymentSent() && !trade.isPaymentReceived()) {
|
if (trade.isPaymentSent() && !trade.isPaymentReceived()) {
|
||||||
showPopup();
|
showPopup();
|
||||||
} else if (trade.isPaymentReceived()) {
|
} else if (trade.isPaymentReceived()) {
|
||||||
if (!trade.hasFailed()) {
|
|
||||||
switch (state) {
|
switch (state) {
|
||||||
case SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT:
|
case SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT:
|
||||||
busyAnimation.play();
|
busyAnimation.play();
|
||||||
|
@ -153,10 +152,6 @@ public class SellerStep3View extends TradeStepView {
|
||||||
statusLabel.setText(Res.get("shared.sendingConfirmationAgain"));
|
statusLabel.setText(Res.get("shared.sendingConfirmationAgain"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
log.warn("Trade contains error message {}", trade.getErrorMessage());
|
|
||||||
statusLabel.setText("");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue