From 10797980dffe0914489451c80d0a6f1a860166c2 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Thu, 1 Sep 2022 19:56:36 +0530
Subject: [PATCH 1/4] fix #2847

---
 .../terminal/src/lib/remix-ui-terminal.tsx    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index 11a3cbd57d..bc3c327390 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -554,17 +554,18 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
                       return (
                         <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ parse(msg.value) } </span></div>
                       )
+                    } else if ((Object.keys(msg).length)) {
+                      let stringified
+                      try {
+                        stringified = JSON.stringify(msg)
+                      } catch (e) {
+                        console.error(e)
+                        stringified = '< value not displayable >'
+                      }
+                      return (
+                        <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ stringified } </span></div>
+                      )
                     }
-                    let stringified
-                    try {
-                      stringified = JSON.stringify(msg)
-                    } catch (e) {
-                      console.error(e)
-                      stringified = '< value not displayable >'
-                    }
-                    return (
-                      <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ stringified } </span></div>
-                    )
                   } else {
                     return (
                       <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{msg ? msg.toString() : null}</span></div>

From c48444fc533b8a94071b83ca523ff6cd5dc18977 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Fri, 2 Sep 2022 14:53:35 +0530
Subject: [PATCH 2/4] filter chainId error

---
 apps/remix-ide/src/app/tabs/web3-provider.js  |  6 +++--
 .../terminal/src/lib/remix-ui-terminal.tsx    | 22 +++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/web3-provider.js b/apps/remix-ide/src/app/tabs/web3-provider.js
index a6690f545e..50991c0208 100644
--- a/apps/remix-ide/src/app/tabs/web3-provider.js
+++ b/apps/remix-ide/src/app/tabs/web3-provider.js
@@ -30,8 +30,10 @@ export class Web3ProviderModule extends Plugin {
             // see https://github.com/ethereum/web3.js/pull/1018/files#diff-d25786686c1053b786cc2626dc6e048675050593c0ebaafbf0814e1996f22022R129
             provider[provider.sendAsync ? 'sendAsync' : 'send'](payload, async (error, message) => {
               if (error) {
-                this.call('terminal', 'log', error.data ? error.data : error, 'error')
-                return reject(error.data ? error.data : error)
+                const errorData = error.data ? error.data : error.message
+                // See: https://github.com/ethers-io/ethers.js/issues/901
+                if (!errorData.includes("unknown method eth_chainId")) this.call('terminal', 'log', error.data ? error.data : error.message)
+                return reject(errorData)
               }
               if (payload.method === 'eth_sendTransaction') {
                 if (payload.params.length && !payload.params[0].to && message.result) {
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index bc3c327390..cab3cb7bc8 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -554,17 +554,17 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
                       return (
                         <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ parse(msg.value) } </span></div>
                       )
-                    } else if ((Object.keys(msg).length)) {
-                      let stringified
-                      try {
-                        stringified = JSON.stringify(msg)
-                      } catch (e) {
-                        console.error(e)
-                        stringified = '< value not displayable >'
-                      }
-                      return (
-                        <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ stringified } </span></div>
-                      )
+                    }
+                    let stringified
+                    try {
+                      stringified = JSON.stringify(msg)
+                    } catch (e) {
+                      console.error(e)
+                      stringified = '< value not displayable >'
+                    
+                    return (
+                      <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ stringified } </span></div>
+                    )
                     }
                   } else {
                     return (

From ea282a123fb72a855233642c2f0c9dd7fe822281 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Fri, 2 Sep 2022 15:07:45 +0530
Subject: [PATCH 3/4] check if it is string

---
 apps/remix-ide/src/app/tabs/web3-provider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/tabs/web3-provider.js b/apps/remix-ide/src/app/tabs/web3-provider.js
index 50991c0208..ab3bf9fc9c 100644
--- a/apps/remix-ide/src/app/tabs/web3-provider.js
+++ b/apps/remix-ide/src/app/tabs/web3-provider.js
@@ -32,7 +32,7 @@ export class Web3ProviderModule extends Plugin {
               if (error) {
                 const errorData = error.data ? error.data : error.message
                 // See: https://github.com/ethers-io/ethers.js/issues/901
-                if (!errorData.includes("unknown method eth_chainId")) this.call('terminal', 'log', error.data ? error.data : error.message)
+                if (!(typeof errorData === 'string' && errorData.includes("unknown method eth_chainId"))) this.call('terminal', 'log', error.data ? error.data : error.message)
                 return reject(errorData)
               }
               if (payload.method === 'eth_sendTransaction') {

From d5e4407bfcfd5c43047cfad2015be2fd5108cff2 Mon Sep 17 00:00:00 2001
From: Aniket-Engg <aniketengg.225@gmail.com>
Date: Fri, 2 Sep 2022 15:09:13 +0530
Subject: [PATCH 4/4] close method

---
 libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index cab3cb7bc8..11a3cbd57d 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -561,11 +561,10 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
                     } catch (e) {
                       console.error(e)
                       stringified = '< value not displayable >'
-                    
+                    }
                     return (
                       <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ stringified } </span></div>
                     )
-                    }
                   } else {
                     return (
                       <div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{msg ? msg.toString() : null}</span></div>