Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-18 19:28:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

refactor trade state TRADE_COMPLETED to boolean

Browse source
This commit is contained in:
woodser 2023-12-15 09:24:21 -05:00
parent 593bced55a
commit c42471191a
8 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

34
desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferViewModel.java
View file

@ -402,23 +402,23 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
if (errorMessage != null) {
String appendMsg = "";
if (trade != null) {
switch (trade.getState().getPhase()) {
case INIT:
appendMsg = Res.get("takeOffer.error.noFundsLost");
break;
case DEPOSIT_REQUESTED:
appendMsg = Res.get("takeOffer.error.feePaid");
break;
case DEPOSITS_PUBLISHED:
case PAYMENT_SENT:
case PAYMENT_RECEIVED:
appendMsg = Res.get("takeOffer.error.depositPublished");
break;
case COMPLETED:
appendMsg = Res.get("takeOffer.error.payoutPublished");
break;
default:
break;
if (trade.isPayoutPublished()) appendMsg = Res.get("takeOffer.error.payoutPublished");
else {
switch (trade.getState().getPhase()) {
case INIT:
appendMsg = Res.get("takeOffer.error.noFundsLost");
break;
case DEPOSIT_REQUESTED:
appendMsg = Res.get("takeOffer.error.feePaid");
break;
case DEPOSITS_PUBLISHED:
case PAYMENT_SENT:
case PAYMENT_RECEIVED:
appendMsg = Res.get("takeOffer.error.depositPublished");
break;
default:
break;
}
}
}
this.errorMessage.set(errorMessage + appendMsg);

11
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
View file

@ -363,6 +363,12 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
return;
}
if (trade.isCompleted()) {
sellerState.set(UNDEFINED);
buyerState.set(BuyerState.UNDEFINED);
return;
}
switch (tradeState) {
// initialization
@ -425,11 +431,6 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
sellerState.set(trade.isPayoutPublished() ? SellerState.STEP4 : SellerState.STEP3);
break;
case TRADE_COMPLETED:
sellerState.set(UNDEFINED);
buyerState.set(BuyerState.UNDEFINED);
break;
default:
sellerState.set(UNDEFINED);
buyerState.set(BuyerState.UNDEFINED);

11
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View file

@ -111,7 +111,11 @@ public class SellerStep3View extends TradeStepView {
if (trade.isPaymentSent() && !trade.isPaymentReceived()) {
showPopup();
} else if (trade.isPaymentReceived()) {
switch (state) {
if (trade.isCompleted()) {
if (!trade.isPayoutPublished()) log.warn("Payout is expected to be published for {} {} state {}", trade.getClass().getSimpleName(), trade.getId(), trade.getState());
busyAnimation.stop();
statusLabel.setText("");
} else switch (state) {
case SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT:
busyAnimation.play();
statusLabel.setText(Res.get("shared.preparingConfirmation"));
@ -138,11 +142,6 @@ public class SellerStep3View extends TradeStepView {
busyAnimation.stop();
statusLabel.setText("");
break;
case TRADE_COMPLETED:
if (!trade.isPayoutPublished()) log.warn("Payout is expected to be published for {} {} state {}", trade.getClass().getSimpleName(), trade.getId(), trade.getState());
busyAnimation.stop();
statusLabel.setText("");
break;
default:
log.warn("Unexpected case: State={}, tradeId={} " + state.name(), trade.getId());
busyAnimation.stop();