From 554b21f24cad7e04f1302f93bb3fab13a903cb62 Mon Sep 17 00:00:00 2001
From: anim001k <140460766+anim001k@users.noreply.github.com>
Date: Tue, 12 Aug 2025 12:50:10 +0200
Subject: [PATCH 1/2] Update decode-message.ts

---
 packages/utils/src/decode-message.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/utils/src/decode-message.ts b/packages/utils/src/decode-message.ts
index 6ac00f8e1..bc273805b 100644
--- a/packages/utils/src/decode-message.ts
+++ b/packages/utils/src/decode-message.ts
@@ -12,6 +12,12 @@ import { toBeHex } from "ethers/utils"
  * @param message The Semaphore message as a bigint.
  * @returns The Semaphore message as a text.
  */
-export default function decodeMessage(message: BigNumberish) {
-    return decodeBytes32String(toBeHex(message, 32))
+export default function decodeMessage(message: BigNumberish): string {
+    const hex = toBeHex(message, 32)
+
+    try {
+        return decodeBytes32String(hex)
+    } catch {
+        return hex
+    }
 }

From 9614ab12384a6c01467f86180a64c2af5660ac74 Mon Sep 17 00:00:00 2001
From: anim001k <140460766+anim001k@users.noreply.github.com>
Date: Tue, 12 Aug 2025 12:50:58 +0200
Subject: [PATCH 2/2] Update index.test.ts

---
 packages/utils/tests/index.test.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/utils/tests/index.test.ts b/packages/utils/tests/index.test.ts
index 40029920e..0e15b64d6 100644
--- a/packages/utils/tests/index.test.ts
+++ b/packages/utils/tests/index.test.ts
@@ -56,5 +56,11 @@ describe("Utils", () => {
 
             expect(decodedMessage).toBe(message)
         })
+
+        it("Should return hex if message is not a valid bytes32 string", () => {
+            const hex = "0x66fdd5e25ef9ddb305ba3c2aae1856ab9c6f2979000000000000000000000000"
+            const result = decodeMessage(hex)
+            expect(result).toBe(hex)
+        })
     })
 })