From d26ddac5c02322ff35f6ec05184a0b815e915d00 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Tue, 9 Jan 2024 07:02:39 -0500
Subject: [PATCH] rename proto type from CONFIRMED_IN_UI* to CONFIRMED*

---
 core/src/main/java/haveno/core/trade/Trade.java           | 8 ++++----
 .../java/haveno/core/trade/protocol/BuyerProtocol.java    | 2 +-
 .../java/haveno/core/trade/protocol/SellerProtocol.java   | 2 +-
 .../portfolio/pendingtrades/PendingTradesViewModel.java   | 4 ++--
 .../pendingtrades/steps/buyer/BuyerStep2View.java         | 2 +-
 .../pendingtrades/steps/seller/SellerStep3View.java       | 2 +-
 proto/src/main/proto/pb.proto                             | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
index c54e012b33..7473245e56 100644
--- a/core/src/main/java/haveno/core/trade/Trade.java
+++ b/core/src/main/java/haveno/core/trade/Trade.java
@@ -156,7 +156,7 @@ public abstract class Trade implements Tradable, Model {
         DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN(Phase.DEPOSITS_UNLOCKED),
 
         // payment sent
-        BUYER_CONFIRMED_IN_UI_PAYMENT_SENT(Phase.PAYMENT_SENT),
+        BUYER_CONFIRMED_PAYMENT_SENT(Phase.PAYMENT_SENT),
         BUYER_SENT_PAYMENT_SENT_MSG(Phase.PAYMENT_SENT),
         BUYER_SEND_FAILED_PAYMENT_SENT_MSG(Phase.PAYMENT_SENT),
         BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG(Phase.PAYMENT_SENT),
@@ -164,7 +164,7 @@ public abstract class Trade implements Tradable, Model {
         SELLER_RECEIVED_PAYMENT_SENT_MSG(Phase.PAYMENT_SENT),
 
         // payment received
-        SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT(Phase.PAYMENT_RECEIVED),
+        SELLER_CONFIRMED_PAYMENT_RECEIPT(Phase.PAYMENT_RECEIVED),
         SELLER_SENT_PAYMENT_RECEIVED_MSG(Phase.PAYMENT_RECEIVED),
         SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG(Phase.PAYMENT_RECEIVED),
         SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG(Phase.PAYMENT_RECEIVED),
@@ -610,13 +610,13 @@ public abstract class Trade implements Tradable, Model {
             });
 
             // reset buyer's payment sent state if no ack receive
-            if (this instanceof BuyerTrade && getState().ordinal() >= Trade.State.BUYER_CONFIRMED_IN_UI_PAYMENT_SENT.ordinal() && getState().ordinal() < Trade.State.BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG.ordinal()) {
+            if (this instanceof BuyerTrade && getState().ordinal() >= Trade.State.BUYER_CONFIRMED_PAYMENT_SENT.ordinal() && getState().ordinal() < Trade.State.BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG.ordinal()) {
                 log.warn("Resetting state of {} {} from {} to {} because no ack was received", getClass().getSimpleName(), getId(), getState(), Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
                 setState(Trade.State.DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN);
             }
 
             // reset seller's payment received state if no ack receive
-            if (this instanceof SellerTrade && getState().ordinal() >= Trade.State.SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT.ordinal() && getState().ordinal() < Trade.State.SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG.ordinal()) {
+            if (this instanceof SellerTrade && getState().ordinal() >= Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT.ordinal() && getState().ordinal() < Trade.State.SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG.ordinal()) {
                 log.warn("Resetting state of {} {} from {} to {} because no ack was received", getClass().getSimpleName(), getId(), getState(), Trade.State.BUYER_SENT_PAYMENT_SENT_MSG);
                 setState(Trade.State.BUYER_SENT_PAYMENT_SENT_MSG);
             }
diff --git a/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java
index 6aca54c415..888e168b86 100644
--- a/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java
+++ b/core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java
@@ -123,7 +123,7 @@ public class BuyerProtocol extends DisputeProtocol {
                                     (errorMessage) -> {
                                         handleTaskRunnerFault(event, errorMessage);
                                     })))
-                            .run(() -> trade.setState(Trade.State.BUYER_CONFIRMED_IN_UI_PAYMENT_SENT))
+                            .run(() -> trade.setState(Trade.State.BUYER_CONFIRMED_PAYMENT_SENT))
                             .executeTasks(true);
                 } catch (Exception e) {
                     errorMessageHandler.handleErrorMessage("Error confirming payment sent: " + e.getMessage());
diff --git a/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java b/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java
index 11a4d91def..01eda95e5e 100644
--- a/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java
+++ b/core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java
@@ -119,7 +119,7 @@ public class SellerProtocol extends DisputeProtocol {
                             }, (errorMessage) -> {
                                 handleTaskRunnerFault(event, errorMessage);
                             })))
-                            .run(() -> trade.setState(Trade.State.SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT))
+                            .run(() -> trade.setState(Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT))
                             .executeTasks(true);
                 } catch (Exception e) {
                     errorMessageHandler.handleErrorMessage("Error confirming payment received: " + e.getMessage());
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
index 050018c5ed..1cddb827d4 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
@@ -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:
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
index 37aaca27f6..85a74d1518 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
@@ -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;
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
index b579b524e0..dce9c0f87c 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
@@ -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;
diff --git a/proto/src/main/proto/pb.proto b/proto/src/main/proto/pb.proto
index e14716852f..62c6e5d56d 100644
--- a/proto/src/main/proto/pb.proto
+++ b/proto/src/main/proto/pb.proto
@@ -1423,13 +1423,13 @@ message Trade {
         DEPOSIT_TXS_SEEN_IN_NETWORK = 13;
         DEPOSIT_TXS_CONFIRMED_IN_BLOCKCHAIN = 14;
         DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN = 15;
-        BUYER_CONFIRMED_IN_UI_PAYMENT_SENT = 16;
+        BUYER_CONFIRMED_PAYMENT_SENT = 16;
         BUYER_SENT_PAYMENT_SENT_MSG = 17;
         BUYER_SEND_FAILED_PAYMENT_SENT_MSG = 18;
         BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG = 19;
         BUYER_SAW_ARRIVED_PAYMENT_SENT_MSG = 20;
         SELLER_RECEIVED_PAYMENT_SENT_MSG = 21;
-        SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT = 22;
+        SELLER_CONFIRMED_PAYMENT_RECEIPT = 22;
         SELLER_SENT_PAYMENT_RECEIVED_MSG = 23;
         SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG = 24;
         SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG = 25;