From 6c84341094099d5160ea501473f4b6bcc6b8a18c Mon Sep 17 00:00:00 2001
From: Azzurriii <vtthanh04.qb@gmail.com>
Date: Wed, 30 Jul 2025 20:11:38 +0700
Subject: [PATCH 1/2] Fix error message when signing with duplicate tx id

---
 pkg/event/types.go                  | 2 ++
 pkg/eventconsumer/event_consumer.go | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/pkg/event/types.go b/pkg/event/types.go
index 0344bf63..36856f37 100644
--- a/pkg/event/types.go
+++ b/pkg/event/types.go
@@ -137,6 +137,8 @@ func GetErrorCodeFromError(err error) ErrorCode {
 		return ErrorCodeContextCancelled
 	case contains(errStr, "invalid signature from initiator"):
 		return ErrorCodeInvalidInitiatorSignature
+	case contains(errStr, "duplicate"):
+		return ErrorCodeSessionDuplicate
 	default:
 		return ErrorCodeUnknown
 	}
diff --git a/pkg/eventconsumer/event_consumer.go b/pkg/eventconsumer/event_consumer.go
index 855c16cf..db0c707c 100644
--- a/pkg/eventconsumer/event_consumer.go
+++ b/pkg/eventconsumer/event_consumer.go
@@ -323,6 +323,15 @@ func (ec *eventConsumer) consumeTxSigningEvent() error {
 
 		// Check for duplicate session and track if new
 		if ec.checkDuplicateSession(msg.WalletID, msg.TxID) {
+			duplicateErr := fmt.Errorf("duplicate signing request detected for walletID=%s txID=%s", msg.WalletID, msg.TxID)
+			ec.handleSigningSessionError(
+				msg.WalletID,
+				msg.TxID,
+				msg.NetworkInternalCode,
+				duplicateErr,
+				"Duplicate signing request detected",
+				natMsg,
+			)
 			return
 		}
 

From 4e27bea480ac62c2c6ee25f034c98bef564086fb Mon Sep 17 00:00:00 2001
From: Azzurriii <vtthanh04.qb@gmail.com>
Date: Wed, 30 Jul 2025 21:36:24 +0700
Subject: [PATCH 2/2] Update error message for duplicate signing requests to be
 more concise

---
 pkg/eventconsumer/event_consumer.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/eventconsumer/event_consumer.go b/pkg/eventconsumer/event_consumer.go
index db0c707c..6f810260 100644
--- a/pkg/eventconsumer/event_consumer.go
+++ b/pkg/eventconsumer/event_consumer.go
@@ -329,7 +329,7 @@ func (ec *eventConsumer) consumeTxSigningEvent() error {
 				msg.TxID,
 				msg.NetworkInternalCode,
 				duplicateErr,
-				"Duplicate signing request detected",
+				"Duplicate session",
 				natMsg,
 			)
 			return