From 1ce72242ffb5661f41fe1d78cd96b05696e9e7c9 Mon Sep 17 00:00:00 2001
From: melanke <gil.bueno@simpli.com.br>
Date: Fri, 7 Jun 2024 12:15:37 -0300
Subject: [PATCH] CU-86dthj1c5 - fix undesired change

---
 packages/neon-dappkit/src/NeonSigner.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/neon-dappkit/src/NeonSigner.ts b/packages/neon-dappkit/src/NeonSigner.ts
index cda9916..b88c83d 100644
--- a/packages/neon-dappkit/src/NeonSigner.ts
+++ b/packages/neon-dappkit/src/NeonSigner.ts
@@ -77,8 +77,12 @@ export class NeonSigner implements Neo3Signer {
   }
 
   async verifyMessage(verifyArgs: SignedMessage): Promise<boolean> {
-    const messageHex = verifyArgs.message ?? u.hexstring2str(verifyArgs.messageHex)
-    return wallet.verify(messageHex, verifyArgs.data, verifyArgs.publicKey) || this.verifyMessageLegacy(verifyArgs)
+    return (await this.verifyMessageSimple(verifyArgs)) || (await this.verifyMessageLegacy(verifyArgs))
+  }
+
+  private async verifyMessageSimple(verifyArgs: SignedMessage): Promise<boolean> {
+    const messageHex = verifyArgs.messageHex ?? u.str2hexstring(verifyArgs.message)
+    return wallet.verify(messageHex, verifyArgs.data, verifyArgs.publicKey)
   }
 
   private async verifyMessageLegacy(verifyArgs: SignedMessage): Promise<boolean> {