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

rename proto type from CONFIRMED_IN_UI* to CONFIRMED*

Browse source
This commit is contained in:
woodser 2024-01-09 07:02:39 -05:00
parent 6c83fc4cf8
commit d26ddac5c0
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -401,7 +401,7 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
break;
// buyer step 3
case BUYER_CONFIRMED_IN_UI_PAYMENT_SENT: // UI action
case BUYER_CONFIRMED_PAYMENT_SENT: // UI action
case BUYER_SENT_PAYMENT_SENT_MSG: // PAYMENT_SENT_MSG sent
case BUYER_SAW_ARRIVED_PAYMENT_SENT_MSG: // PAYMENT_SENT_MSG arrived
// We don't switch the UI before we got the feedback of the msg delivery
@ -424,7 +424,7 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
break;
// seller step 3
case SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT:
case SELLER_CONFIRMED_PAYMENT_RECEIPT:
case SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG:
case SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG:
case SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG:

2
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
View file

@ -150,7 +150,7 @@ public class BuyerStep2View extends TradeStepView {
showPopup();
} else if (state.ordinal() <= Trade.State.SELLER_RECEIVED_PAYMENT_SENT_MSG.ordinal()) {
switch (state) {
case BUYER_CONFIRMED_IN_UI_PAYMENT_SENT:
case BUYER_CONFIRMED_PAYMENT_SENT:
busyAnimation.play();
statusLabel.setText(Res.get("shared.preparingConfirmation"));
break;

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

@ -116,7 +116,7 @@ public class SellerStep3View extends TradeStepView {
busyAnimation.stop();
statusLabel.setText("");
} else switch (state) {
case SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT:
case SELLER_CONFIRMED_PAYMENT_RECEIPT:
busyAnimation.play();
statusLabel.setText(Res.get("shared.preparingConfirmation"));
break;