From 876f3819265a03afe2d158731b4841cd260c380e Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 28 Oct 2024 20:22:26 +0100
Subject: [PATCH] messages

---
 .../src/app/providers/abstract-provider.tsx   | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/remix-ide/src/app/providers/abstract-provider.tsx b/apps/remix-ide/src/app/providers/abstract-provider.tsx
index e41c331217..5e645ffe81 100644
--- a/apps/remix-ide/src/app/providers/abstract-provider.tsx
+++ b/apps/remix-ide/src/app/providers/abstract-provider.tsx
@@ -26,8 +26,8 @@ export type RejectRequest = (error: JsonDataResult) => void
 export type SuccessRequest = (data: JsonDataResult) => void
 
 export interface IProvider {
-  options: {[id: string]: any}
-  init(): Promise<{[id: string]: any}>
+  options: { [id: string]: any }
+  init(): Promise<{ [id: string]: any }>
   body(): JSX.Element
   sendAsync(data: JsonDataRequest): Promise<JsonDataResult>
 }
@@ -38,7 +38,7 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
   defaultUrl: string
   connected: boolean
   nodeUrl: string
-  options: {[id: string]: any} = {}
+  options: { [id: string]: any } = {}
 
   constructor(profile, blockchain, defaultUrl) {
     super(profile)
@@ -124,7 +124,21 @@ export abstract class AbstractProvider extends Plugin implements IProvider {
         resolve({ jsonrpc: '2.0', result, id: data.id })
       } catch (error) {
         if (error && error.message && error.message.includes('SERVER_ERROR')) {
-          this.switchAway(true, error.message)
+          try {
+            // replace escaped quotes with normal quotes
+            const errorString = String(error.message).replace(/\\"/g, '"');
+            const messageMatches = Array.from(errorString.matchAll(/"message":"(.*?)"/g));
+            // Extract the message values
+            const messages = messageMatches.map(match => match[1]);
+            if (messages && messages.length > 0) {
+              this.switchAway(true, messages[0])
+            } else {
+              this.switchAway(true, error.message ? error.message : error.error ? error.error : error)
+            }
+          } catch (error) {
+            this.switchAway(true, error.message ? error.message : error.error ? error.error : error)
+          }
+
         }
         error.code = -32603
         reject({ jsonrpc: '2.0', error, id: data.id })