From b35520ba229e97dfa2cb9274457118f5d2d1733e Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Thu, 4 Jul 2024 21:09:58 +0100
Subject: [PATCH 1/4] Add padding to right side panel

---
 libs/remix-ui/app/src/lib/remix-app/style/remix-app.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/remix-ui/app/src/lib/remix-app/style/remix-app.css b/libs/remix-ui/app/src/lib/remix-app/style/remix-app.css
index 8c56059bfb..a1d447e8a5 100644
--- a/libs/remix-ui/app/src/lib/remix-app/style/remix-app.css
+++ b/libs/remix-ui/app/src/lib/remix-app/style/remix-app.css
@@ -43,6 +43,7 @@ pre {
 .pinnedpanel           {
   width              : 320px;
   transition         : width 0.25s;
+  padding-bottom     : 1.4rem;
 }
 .highlightcode       {
   position           : absolute;

From 8d3fdd2055b031f28de3dc49fb09eb56f176c2c8 Mon Sep 17 00:00:00 2001
From: shubhiscoding <mygitcoin@gmail.com>
Date: Sat, 6 Jul 2024 01:18:30 +0530
Subject: [PATCH 2/4] Solved Undeclared EVM Logs aren't shown in receipt UI
 #4929

---
 libs/remix-ui/terminal/src/lib/components/Table.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/components/Table.tsx b/libs/remix-ui/terminal/src/lib/components/Table.tsx
index 5aa3823f00..abfd2055fc 100644
--- a/libs/remix-ui/terminal/src/lib/components/Table.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/Table.tsx
@@ -186,9 +186,9 @@ const showTable = (opts, showTableHash) => {
               <FormattedMessage id="terminal.logs" />
             </td>
             <td className="remix_ui_terminal_td" data-id={`txLoggerTableHash${opts.hash}`} data-shared={`pair_${opts.hash}`}>
-              {JSON.stringify(stringified, null, '\t')}
+              {JSON.stringify(opts.logs.raw, null, 2)?( <pre>{JSON.stringify(opts.logs.raw || '0', null, 2)}</pre>):(JSON.stringify(stringified, null, '\t'))}
               <CopyToClipboard content={JSON.stringify(stringified, null, '\t')} />
-              <CopyToClipboard content={JSON.stringify(opts.logs.raw || '0')} />
+              <CopyToClipboard content={JSON.stringify(opts.logs.raw || '0', null, 2)} />
             </td>
           </tr>
         ) : null}

From 77420ea7a88ae7324d9e669d9468ca88984b9969 Mon Sep 17 00:00:00 2001
From: shubhiscoding <mygitcoin@gmail.com>
Date: Mon, 8 Jul 2024 23:31:11 +0530
Subject: [PATCH 3/4] seperated declared and undeclared logs

---
 .../src/app/tabs/locales/en/terminal.json          |  3 ++-
 .../src/app/tabs/locales/es/terminal.json          |  3 ++-
 .../src/app/tabs/locales/fr/terminal.json          |  3 ++-
 .../src/app/tabs/locales/it/terminal.json          |  3 ++-
 .../src/app/tabs/locales/ko/terminal.json          |  3 ++-
 .../src/app/tabs/locales/ru/terminal.json          |  3 ++-
 .../src/app/tabs/locales/zh/terminal.json          |  3 ++-
 .../remix-ui/terminal/src/lib/components/Table.tsx | 14 ++++++++++++--
 package.json                                       |  5 +++--
 9 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/locales/en/terminal.json b/apps/remix-ide/src/app/tabs/locales/en/terminal.json
index 431f54fbba..da76845fcd 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/terminal.json
@@ -40,5 +40,6 @@
   "terminal.input": "input",
   "terminal.decodedInput": "decoded input",
   "terminal.decodedOutput": "decoded output",
-  "terminal.logs": "logs"
+  "terminal.undeclaredlogs": "undeclared logs",
+  "terminal.declaredlogs": "declared logs"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/es/terminal.json b/apps/remix-ide/src/app/tabs/locales/es/terminal.json
index 9c59e05ada..a916bb1db1 100644
--- a/apps/remix-ide/src/app/tabs/locales/es/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/es/terminal.json
@@ -39,5 +39,6 @@
   "terminal.input": "entrada",
   "terminal.decodedInput": "entrada descodificada",
   "terminal.decodedOutput": "salida descodificada",
-  "terminal.logs": "registros"
+  "terminal.undeclaredlogs": "registros no declarados",
+  "terminal.declaredlogs": "registros declarados"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/fr/terminal.json b/apps/remix-ide/src/app/tabs/locales/fr/terminal.json
index 8183140a97..96c96d9b3d 100644
--- a/apps/remix-ide/src/app/tabs/locales/fr/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/fr/terminal.json
@@ -39,5 +39,6 @@
   "terminal.input": "entrée",
   "terminal.decodedInput": "entrée décodée",
   "terminal.decodedOutput": "sortie décodée",
-  "terminal.logs": "logs"
+  "terminal.undeclaredlogs": "logs non déclarés",
+  "terminal.declaredlogs": "logs déclarés"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/it/terminal.json b/apps/remix-ide/src/app/tabs/locales/it/terminal.json
index 8bdc6c7dc8..c6c050bf86 100644
--- a/apps/remix-ide/src/app/tabs/locales/it/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/it/terminal.json
@@ -39,5 +39,6 @@
   "terminal.input": "input",
   "terminal.decodedInput": "input decodificato",
   "terminal.decodedOutput": "output decodificato",
-  "terminal.logs": "Log"
+  "terminal.undeclaredlogs": "log non dichiarati",
+  "terminal.declaredlogs": "log dichiarati"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/ko/terminal.json b/apps/remix-ide/src/app/tabs/locales/ko/terminal.json
index 171a981094..828edd36fd 100644
--- a/apps/remix-ide/src/app/tabs/locales/ko/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/ko/terminal.json
@@ -39,5 +39,6 @@
   "terminal.input": "입력",
   "terminal.decodedInput": "디코드된 입력",
   "terminal.decodedOutput": "디코드된 출력",
-  "terminal.logs": "로그"
+  "terminal.undeclaredlogs": "선언되지 않은 로그",
+  "terminal.declaredlogs": "선언된 로그"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/ru/terminal.json b/apps/remix-ide/src/app/tabs/locales/ru/terminal.json
index 2778fb35de..0a3f7f744e 100644
--- a/apps/remix-ide/src/app/tabs/locales/ru/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/ru/terminal.json
@@ -39,5 +39,6 @@
   "terminal.input": "ввод",
   "terminal.decodedInput": "декодированный ввод",
   "terminal.decodedOutput": "декодированный вывод",
-  "terminal.logs": "журналы"
+  "terminal.undeclaredlogs": "необъявленные журналы",
+  "terminal.declaredlogs": "объявленные журналы"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/zh/terminal.json b/apps/remix-ide/src/app/tabs/locales/zh/terminal.json
index 40e6d3791c..975a0f601e 100644
--- a/apps/remix-ide/src/app/tabs/locales/zh/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/zh/terminal.json
@@ -39,5 +39,6 @@
   "terminal.input": "输入",
   "terminal.decodedInput": "解码输入",
   "terminal.decodedOutput": "解码输出",
-  "terminal.logs": "日志"
+  "terminal.undeclaredlogs": "未声明的日志",
+  "terminal.declaredlogs": "已声明的日志"
 }
diff --git a/libs/remix-ui/terminal/src/lib/components/Table.tsx b/libs/remix-ui/terminal/src/lib/components/Table.tsx
index abfd2055fc..da90540cbc 100644
--- a/libs/remix-ui/terminal/src/lib/components/Table.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/Table.tsx
@@ -183,11 +183,21 @@ const showTable = (opts, showTableHash) => {
         {opts.logs ? (
           <tr className="remix_ui_terminal_tr">
             <td className="remix_ui_terminal_td" data-shared={`key_${opts.hash}`}>
-              <FormattedMessage id="terminal.logs" />
+              <FormattedMessage id="terminal.declaredlogs" />
             </td>
             <td className="remix_ui_terminal_td" data-id={`txLoggerTableHash${opts.hash}`} data-shared={`pair_${opts.hash}`}>
-              {JSON.stringify(opts.logs.raw, null, 2)?( <pre>{JSON.stringify(opts.logs.raw || '0', null, 2)}</pre>):(JSON.stringify(stringified, null, '\t'))}
+              {JSON.stringify(stringified, null, '\t')}
               <CopyToClipboard content={JSON.stringify(stringified, null, '\t')} />
+            </td>
+          </tr>
+        ) : null}
+        {opts.logs ? (
+          <tr className="remix_ui_terminal_tr">
+            <td className="remix_ui_terminal_td" data-shared={`key_${opts.hash}`}>
+              <FormattedMessage id="terminal.undeclaredlogs" />
+            </td>
+            <td className="remix_ui_terminal_td" data-id={`txLoggerTableHash${opts.hash}`} data-shared={`pair_${opts.hash}`}>
+              <pre>{JSON.stringify(opts.logs.raw || '0', null, 2)}</pre>
               <CopyToClipboard content={JSON.stringify(opts.logs.raw || '0', null, 2)} />
             </td>
           </tr>
diff --git a/package.json b/package.json
index bec82a4009..ca75f30147 100644
--- a/package.json
+++ b/package.json
@@ -98,10 +98,10 @@
     "@ethereumjs/util": "9.0.3",
     "@ethereumjs/vm": "8.0.0",
     "@ethersphere/bee-js": "^3.2.0",
+    "@floating-ui/react": "^0.26.15",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@floating-ui/react": "^0.26.15",
     "@gradio/client": "^0.10.1",
     "@isomorphic-git/lightning-fs": "^4.4.1",
     "@metamask/eth-sig-util": "^7.0.2",
@@ -211,6 +211,7 @@
     "tree-kill": "^1.2.2",
     "ts-loader": "^9.2.6",
     "tslib": "^2.3.0",
+    "util": "^0.12.5",
     "web3": "^4.1.0",
     "winston": "^3.3.3",
     "ws": "^7.3.0",
@@ -317,7 +318,7 @@
     "eslint-plugin-react": "7.31.8",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-standard": "4.0.1",
-    "events": "^3.0.0",
+    "events": "^3.3.0",
     "execr": "^1.0.1",
     "exorcist": "^0.4.0",
     "exports-loader": "^1.1.0",

From 3e6867f20ad2d1ff2b261d3c0d7a357cddb7a60f Mon Sep 17 00:00:00 2001
From: shubhiscoding <mygitcoin@gmail.com>
Date: Tue, 9 Jul 2024 01:49:06 +0530
Subject: [PATCH 4/4] reverted changes in package.json and made undeclared,
 declared logs as raw logs and logs

---
 apps/remix-ide/src/app/tabs/locales/en/terminal.json | 4 ++--
 apps/remix-ide/src/app/tabs/locales/es/terminal.json | 4 ++--
 apps/remix-ide/src/app/tabs/locales/fr/terminal.json | 4 ++--
 apps/remix-ide/src/app/tabs/locales/it/terminal.json | 4 ++--
 apps/remix-ide/src/app/tabs/locales/ko/terminal.json | 4 ++--
 apps/remix-ide/src/app/tabs/locales/ru/terminal.json | 4 ++--
 apps/remix-ide/src/app/tabs/locales/zh/terminal.json | 4 ++--
 libs/remix-lib/package.json                          | 2 +-
 libs/remix-ui/terminal/src/lib/components/Table.tsx  | 5 +++--
 package.json                                         | 5 ++---
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/locales/en/terminal.json b/apps/remix-ide/src/app/tabs/locales/en/terminal.json
index da76845fcd..9ce7d78d6f 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/terminal.json
@@ -40,6 +40,6 @@
   "terminal.input": "input",
   "terminal.decodedInput": "decoded input",
   "terminal.decodedOutput": "decoded output",
-  "terminal.undeclaredlogs": "undeclared logs",
-  "terminal.declaredlogs": "declared logs"
+  "terminal.rawlogs": "raw logs",
+  "terminal.logs": "logs"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/es/terminal.json b/apps/remix-ide/src/app/tabs/locales/es/terminal.json
index a916bb1db1..17eb3d6a40 100644
--- a/apps/remix-ide/src/app/tabs/locales/es/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/es/terminal.json
@@ -39,6 +39,6 @@
   "terminal.input": "entrada",
   "terminal.decodedInput": "entrada descodificada",
   "terminal.decodedOutput": "salida descodificada",
-  "terminal.undeclaredlogs": "registros no declarados",
-  "terminal.declaredlogs": "registros declarados"
+  "terminal.rawlogs": "registros sin procesar",
+  "terminal.logs": "registros"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/fr/terminal.json b/apps/remix-ide/src/app/tabs/locales/fr/terminal.json
index 96c96d9b3d..e67a0c7b4f 100644
--- a/apps/remix-ide/src/app/tabs/locales/fr/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/fr/terminal.json
@@ -39,6 +39,6 @@
   "terminal.input": "entrée",
   "terminal.decodedInput": "entrée décodée",
   "terminal.decodedOutput": "sortie décodée",
-  "terminal.undeclaredlogs": "logs non déclarés",
-  "terminal.declaredlogs": "logs déclarés"
+  "terminal.rawlogs": "logs bruts",
+  "terminal.logs": "Log"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/it/terminal.json b/apps/remix-ide/src/app/tabs/locales/it/terminal.json
index c6c050bf86..19653883b1 100644
--- a/apps/remix-ide/src/app/tabs/locales/it/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/it/terminal.json
@@ -39,6 +39,6 @@
   "terminal.input": "input",
   "terminal.decodedInput": "input decodificato",
   "terminal.decodedOutput": "output decodificato",
-  "terminal.undeclaredlogs": "log non dichiarati",
-  "terminal.declaredlogs": "log dichiarati"
+  "terminal.rawlogs": "log grezzi",
+  "terminal.logs": "Log"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/ko/terminal.json b/apps/remix-ide/src/app/tabs/locales/ko/terminal.json
index 828edd36fd..23db143c61 100644
--- a/apps/remix-ide/src/app/tabs/locales/ko/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/ko/terminal.json
@@ -39,6 +39,6 @@
   "terminal.input": "입력",
   "terminal.decodedInput": "디코드된 입력",
   "terminal.decodedOutput": "디코드된 출력",
-  "terminal.undeclaredlogs": "선언되지 않은 로그",
-  "terminal.declaredlogs": "선언된 로그"
+  "terminal.rawlogs": "원시 로그",
+  "terminal.logs": "로그"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/ru/terminal.json b/apps/remix-ide/src/app/tabs/locales/ru/terminal.json
index 0a3f7f744e..6d10549196 100644
--- a/apps/remix-ide/src/app/tabs/locales/ru/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/ru/terminal.json
@@ -39,6 +39,6 @@
   "terminal.input": "ввод",
   "terminal.decodedInput": "декодированный ввод",
   "terminal.decodedOutput": "декодированный вывод",
-  "terminal.undeclaredlogs": "необъявленные журналы",
-  "terminal.declaredlogs": "объявленные журналы"
+  "terminal.rawlogs": "необработанные журналы",
+  "terminal.logs": "журналы"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/zh/terminal.json b/apps/remix-ide/src/app/tabs/locales/zh/terminal.json
index 975a0f601e..eac8de2d0b 100644
--- a/apps/remix-ide/src/app/tabs/locales/zh/terminal.json
+++ b/apps/remix-ide/src/app/tabs/locales/zh/terminal.json
@@ -39,6 +39,6 @@
   "terminal.input": "输入",
   "terminal.decodedInput": "解码输入",
   "terminal.decodedOutput": "解码输出",
-  "terminal.undeclaredlogs": "未声明的日志",
-  "terminal.declaredlogs": "已声明的日志"
+  "terminal.rawlogs": "原始日志",
+  "terminal.logs": "日志"
 }
diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index fac86e3732..dffc187d0a 100644
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
@@ -57,4 +57,4 @@
   "typings": "src/index.d.ts",
   "gitHead": "35e1469e94bb370f5427d4ab230fcbd47c665e55",
   "types": "./src/index.d.ts"
-}
\ No newline at end of file
+}
diff --git a/libs/remix-ui/terminal/src/lib/components/Table.tsx b/libs/remix-ui/terminal/src/lib/components/Table.tsx
index da90540cbc..90a2b40032 100644
--- a/libs/remix-ui/terminal/src/lib/components/Table.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/Table.tsx
@@ -183,18 +183,19 @@ const showTable = (opts, showTableHash) => {
         {opts.logs ? (
           <tr className="remix_ui_terminal_tr">
             <td className="remix_ui_terminal_td" data-shared={`key_${opts.hash}`}>
-              <FormattedMessage id="terminal.declaredlogs" />
+              <FormattedMessage id="terminal.logs" />
             </td>
             <td className="remix_ui_terminal_td" data-id={`txLoggerTableHash${opts.hash}`} data-shared={`pair_${opts.hash}`}>
               {JSON.stringify(stringified, null, '\t')}
               <CopyToClipboard content={JSON.stringify(stringified, null, '\t')} />
+              <CopyToClipboard content={JSON.stringify(opts.logs.raw || '0', null, 2)} />
             </td>
           </tr>
         ) : null}
         {opts.logs ? (
           <tr className="remix_ui_terminal_tr">
             <td className="remix_ui_terminal_td" data-shared={`key_${opts.hash}`}>
-              <FormattedMessage id="terminal.undeclaredlogs" />
+              <FormattedMessage id="terminal.rawlogs" />
             </td>
             <td className="remix_ui_terminal_td" data-id={`txLoggerTableHash${opts.hash}`} data-shared={`pair_${opts.hash}`}>
               <pre>{JSON.stringify(opts.logs.raw || '0', null, 2)}</pre>
diff --git a/package.json b/package.json
index ca75f30147..bec82a4009 100644
--- a/package.json
+++ b/package.json
@@ -98,10 +98,10 @@
     "@ethereumjs/util": "9.0.3",
     "@ethereumjs/vm": "8.0.0",
     "@ethersphere/bee-js": "^3.2.0",
-    "@floating-ui/react": "^0.26.15",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
+    "@floating-ui/react": "^0.26.15",
     "@gradio/client": "^0.10.1",
     "@isomorphic-git/lightning-fs": "^4.4.1",
     "@metamask/eth-sig-util": "^7.0.2",
@@ -211,7 +211,6 @@
     "tree-kill": "^1.2.2",
     "ts-loader": "^9.2.6",
     "tslib": "^2.3.0",
-    "util": "^0.12.5",
     "web3": "^4.1.0",
     "winston": "^3.3.3",
     "ws": "^7.3.0",
@@ -318,7 +317,7 @@
     "eslint-plugin-react": "7.31.8",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-standard": "4.0.1",
-    "events": "^3.3.0",
+    "events": "^3.0.0",
     "execr": "^1.0.1",
     "exorcist": "^0.4.0",
     "exports-loader": "^1.1.0",