From 301666cdbb12468b36a0e610dfe52e56bdf44a8a Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 1 Jul 2024 17:48:38 +0200
Subject: [PATCH 01/13] ecosystem instead of native. less padding for get
 started

---
 apps/remix-ide/src/app/tabs/locales/en/home.json              | 2 +-
 apps/remix-ide/src/app/tabs/locales/fr/home.json              | 2 +-
 apps/walletconnect/src/services/constant.ts                   | 2 +-
 .../home-tab/src/lib/components/homeTabGetStarted.tsx         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/locales/en/home.json b/apps/remix-ide/src/app/tabs/locales/en/home.json
index d0e98ee5eb..f1bd8305ce 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/home.json
@@ -49,7 +49,7 @@
   "home.remixLinkedinProfile": "Remix Linkedin Profile",
   "home.remixMediumPosts": "Remix Medium Posts",
   "home.joinUsOnDiscord": "Join us on Discord",
-  "home.nativeIDE": "The Native IDE for Web3 Development.",
+  "home.nativeIDE": "The Ecosystem IDE for Web3 Development.",
   "home.website": "Website",
   "home.documentation": "Documentation",
   "home.remixPlugin": "Remix Plugin",
diff --git a/apps/remix-ide/src/app/tabs/locales/fr/home.json b/apps/remix-ide/src/app/tabs/locales/fr/home.json
index 8d40e51b86..f8d1a97a72 100644
--- a/apps/remix-ide/src/app/tabs/locales/fr/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/fr/home.json
@@ -46,7 +46,7 @@
   "home.remixLinkedinProfile": "Remix Linkedin Profile",
   "home.remixMediumPosts": "Remix Medium Posts",
   "home.remixGitterChannel": "Join us on Discord",
-  "home.nativeIDE": "The Native IDE for Web3 Development.",
+  "home.nativeIDE": "The Ecosystem IDE for Web3 Development.",
   "home.website": "Website",
   "home.documentation": "Documentation",
   "home.remixPlugin": "Remix Plugin",
diff --git a/apps/walletconnect/src/services/constant.ts b/apps/walletconnect/src/services/constant.ts
index 5ffe343405..aa94380c3f 100644
--- a/apps/walletconnect/src/services/constant.ts
+++ b/apps/walletconnect/src/services/constant.ts
@@ -2,7 +2,7 @@
 export const PROJECT_ID = WALLET_CONNECT_PROJECT_ID
 export const METADATA = {
   name: 'Remix IDE',
-  description: 'The Native IDE for Web3 Development.',
+  description: 'The Ecosystem IDE for Web3 Development.',
   url: 'https://remix.ethereum.org/',
   icons: ['https://remix.ethereum.org/favicon.ico'],
 }
\ No newline at end of file
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
index 645e2f3346..d3da36a9a0 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
@@ -149,12 +149,12 @@ function HomeTabGetStarted({ plugin }: HomeTabGetStartedProps) {
       <div ref={carouselRefDiv} className="w-100 d-flex flex-column pt-1">
         <ThemeContext.Provider value={themeFilter}>
           <div className="pt-3">
-            <div className="d-flex flex-row align-items-center mb-3 flex-wrap">
+            <div className="d-flex flex-row align-items-center flex-wrap">
               {workspaceTemplates.map((template, index) => (
                 <CustomTooltip tooltipText={template.description} tooltipId={template.gsID} tooltipClasses="text-nowrap" tooltipTextClasses="border bg-light text-dark p-1 pr-3" placement="top-start" key={`${template.gsID}-${template.workspaceTitle}-${index}`}>
                   <button
                     key={index}
-                    className={index === 0 ? 'btn btn-primary border p-2 text-nowrap mr-3 mb-3' : index === workspaceTemplates.length - 1 ? 'btn border p-2 text-nowrap mr-2 mb-3' : 'btn border p-2 text-nowrap mr-3 mb-3'}
+                    className={index === 0 ? 'btn btn-primary border p-2 text-nowrap mr-3 mb-2' : index === workspaceTemplates.length - 1 ? 'btn border p-2 text-nowrap mr-2 mb-2' : 'btn border p-2 text-nowrap mr-3 mb-3'}
                     onClick={(e) => {
                       createWorkspace(template.templateName)
                     }}

From d852ceefccdbb210b9fefec22462bc5e79a3faa9 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 1 Jul 2024 18:10:14 +0200
Subject: [PATCH 02/13] sidepanel min width

---
 libs/remix-ui/app/src/lib/remix-app/remix-app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index aa1cc69fc6..3ce5d19343 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -193,7 +193,7 @@ const RemixApp = (props: IRemixAppUi) => {
               <DragBar
                 resetTrigger={resetLeftTrigger}
                 maximiseTrigger={maximiseLeftTrigger}
-                minWidth={285}
+                minWidth={320}
                 refObject={sidePanelRef}
                 hidden={hideSidePanel}
                 setHideStatus={setHideSidePanel}

From 45bcdcf5dfb16f825852201aa915e57cc665f006 Mon Sep 17 00:00:00 2001
From: Liana Husikyan <liana@ethereum.org>
Date: Tue, 2 Jul 2024 09:00:18 +0200
Subject: [PATCH 03/13] Update remix-app.tsx

---
 libs/remix-ui/app/src/lib/remix-app/remix-app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index 3ce5d19343..02f8851900 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -193,7 +193,7 @@ const RemixApp = (props: IRemixAppUi) => {
               <DragBar
                 resetTrigger={resetLeftTrigger}
                 maximiseTrigger={maximiseLeftTrigger}
-                minWidth={320}
+                minWidth={305}
                 refObject={sidePanelRef}
                 hidden={hideSidePanel}
                 setHideStatus={setHideSidePanel}

From 1e02dacf1904b443d64e641a8dbdc9ea26030f9f Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 2 Jul 2024 09:51:19 +0200
Subject: [PATCH 04/13] same icone and label for clone repo

---
 libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx       | 2 +-
 .../workspace/src/lib/components/workspace-hamburger.tsx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
index fbd4190c5d..5da657f271 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
@@ -209,7 +209,7 @@ function HomeTabFile({ plugin }: HomeTabFileProps) {
                 await plugin.call('filePanel', 'clone')
               }}>
                 <i className="fa-brands fa-github-alt pl-1 pr-2"></i>
-                Git Clone
+                Clone
               </button>
             </CustomTooltip>
             <CustomTooltip placement={'top'} tooltipId="overlay-tooltip" tooltipClasses="text-nowrap" tooltipText={<FormattedMessage id="home.connectToLocalhost" />} tooltipTextClasses="border bg-light text-dark p-1 pr-3">
diff --git a/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx b/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx
index 6cb3ef471b..a08dee8028 100644
--- a/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx
@@ -52,7 +52,7 @@ export function HamburgerMenu(props: HamburgerMenuProps) {
       ></HamburgerMenuItem>
       <HamburgerMenuItem
         kind="clone"
-        fa="fab fa-github"
+        fa="fa-brands fa-github-alt"
         hideOption={hideWorkspaceOptions}
         actionOnClick={() => {
           props.cloneGitRepository()

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 05/13] 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 c9f68794e35b3bec376bb9b6f1289f9ca5d1dccd Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Tue, 9 Jul 2024 10:08:02 +0200
Subject: [PATCH 06/13] native

---
 apps/remix-ide/src/app/tabs/locales/en/home.json | 2 +-
 apps/remix-ide/src/app/tabs/locales/fr/home.json | 2 +-
 apps/walletconnect/src/services/constant.ts      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/locales/en/home.json b/apps/remix-ide/src/app/tabs/locales/en/home.json
index f1bd8305ce..d0e98ee5eb 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/home.json
@@ -49,7 +49,7 @@
   "home.remixLinkedinProfile": "Remix Linkedin Profile",
   "home.remixMediumPosts": "Remix Medium Posts",
   "home.joinUsOnDiscord": "Join us on Discord",
-  "home.nativeIDE": "The Ecosystem IDE for Web3 Development.",
+  "home.nativeIDE": "The Native IDE for Web3 Development.",
   "home.website": "Website",
   "home.documentation": "Documentation",
   "home.remixPlugin": "Remix Plugin",
diff --git a/apps/remix-ide/src/app/tabs/locales/fr/home.json b/apps/remix-ide/src/app/tabs/locales/fr/home.json
index f8d1a97a72..8d40e51b86 100644
--- a/apps/remix-ide/src/app/tabs/locales/fr/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/fr/home.json
@@ -46,7 +46,7 @@
   "home.remixLinkedinProfile": "Remix Linkedin Profile",
   "home.remixMediumPosts": "Remix Medium Posts",
   "home.remixGitterChannel": "Join us on Discord",
-  "home.nativeIDE": "The Ecosystem IDE for Web3 Development.",
+  "home.nativeIDE": "The Native IDE for Web3 Development.",
   "home.website": "Website",
   "home.documentation": "Documentation",
   "home.remixPlugin": "Remix Plugin",
diff --git a/apps/walletconnect/src/services/constant.ts b/apps/walletconnect/src/services/constant.ts
index aa94380c3f..5ffe343405 100644
--- a/apps/walletconnect/src/services/constant.ts
+++ b/apps/walletconnect/src/services/constant.ts
@@ -2,7 +2,7 @@
 export const PROJECT_ID = WALLET_CONNECT_PROJECT_ID
 export const METADATA = {
   name: 'Remix IDE',
-  description: 'The Ecosystem IDE for Web3 Development.',
+  description: 'The Native IDE for Web3 Development.',
   url: 'https://remix.ethereum.org/',
   icons: ['https://remix.ethereum.org/favicon.ico'],
 }
\ No newline at end of file

From 691d025f263e39d18c05a7b5c6b15db541aa7620 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 9 Jul 2024 13:07:17 +0530
Subject: [PATCH 07/13] fix account creation

---
 libs/remix-simulator/src/methods/accounts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-simulator/src/methods/accounts.ts b/libs/remix-simulator/src/methods/accounts.ts
index 61766e1631..6c99565455 100644
--- a/libs/remix-simulator/src/methods/accounts.ts
+++ b/libs/remix-simulator/src/methods/accounts.ts
@@ -44,7 +44,7 @@ export class Web3Accounts {
 
   async _addAccount (privateKey, balance) {
     try {
-      privateKey = toBytes('0x' + privateKey)
+      if (typeof privateKey === 'string') privateKey = toBytes('0x' + privateKey)
       const address: Uint8Array = privateToAddress(privateKey)
       const addressStr = toChecksumAddress(bytesToHex(address))
       this.accounts[addressStr] = { privateKey, nonce: 0 }

From 2410d026eac422de700e6c01d39d810ee6ae2355 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Fri, 5 Jul 2024 09:32:55 +0200
Subject: [PATCH 08/13] min width for default buttons

---
 .../remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css
index 62a0dd5987..baed529f74 100644
--- a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css
+++ b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.css
@@ -10,6 +10,12 @@
   max-height: 600px;
   white-space: pre-line;
 }
+.modal-ok {
+  min-width: 4rem;
+}
+.modal-cancel {
+  min-width: 4rem;
+}
 @-webkit-keyframes animatetop {
   from {top: -300px; opacity: 0}
   to {top: 0; opacity: 1}

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 09/13] 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 10/13] 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 11/13] 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",

From 0609a57a1c058b2604b137c49ef9d895e5cf15c5 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Wed, 10 Jul 2024 15:28:31 +0200
Subject: [PATCH 12/13] git name change

---
 apps/remix-ide/src/app/plugins/git.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/remix-ide/src/app/plugins/git.tsx b/apps/remix-ide/src/app/plugins/git.tsx
index 35129dfceb..73331d87ed 100644
--- a/apps/remix-ide/src/app/plugins/git.tsx
+++ b/apps/remix-ide/src/app/plugins/git.tsx
@@ -6,6 +6,7 @@ import * as packageJson from '../../../../../package.json'
 
 const profile = {
   name: 'dgit',
+  displayName: 'Git',
   desciption: 'Git plugin for Remix',
   methods: ['pull', 'track', 'diff', 'clone', 'open'],
   events: [''],

From e23f8c0f784aac2dc8c3eddd61e18f9dc4d33365 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Wed, 10 Jul 2024 20:22:31 +0100
Subject: [PATCH 13/13] Update _paq.push implementation

---
 .../src/app/services/circomPluginClient.ts      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/circuit-compiler/src/app/services/circomPluginClient.ts b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
index 50cb710d68..93a2445861 100644
--- a/apps/circuit-compiler/src/app/services/circomPluginClient.ts
+++ b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
@@ -10,8 +10,6 @@ import * as compilerV215 from 'circom_wasm/v2.1.5'
 import { extractNameFromKey, extractParentFromKey } from '@remix-ui/helper'
 import { CompilationConfig, CompilerReport, PrimeValue, ResolverOutput } from '../types'
 
-// @ts-ignore
-const _paq = (window._paq = window._paq || [])
 export class CircomPluginClient extends PluginClient {
   public internalEvents: EventManager
   private _compilationConfig: CompilationConfig = {
@@ -22,6 +20,11 @@ export class CircomPluginClient extends PluginClient {
   private lastParsedFiles: Record<string, string> = {}
   private lastCompiledFile: string = ''
   private compiler: typeof compilerV215 & typeof compilerV216 & typeof compilerV217 & typeof compilerV218
+  private _paq = {
+    push: (args) => {
+      this.call('matomo' as any, 'track', args)
+    }
+  }
 
   constructor() {
     super()
@@ -164,7 +167,7 @@ export class CircomPluginClient extends PluginClient {
       const circuitErrors = circuitApi.report()
 
       this.logCompilerReport(circuitErrors)
-      _paq.push(['trackEvent', 'circuit-compiler', 'compile', 'Compilation failed'])
+      this._paq.push(['trackEvent', 'circuit-compiler', 'compile', 'Compilation failed'])
       throw new Error(circuitErrors)
     } else {
       this.lastCompiledFile = path
@@ -184,7 +187,7 @@ export class CircomPluginClient extends PluginClient {
       } else {
         this.internalEvents.emit('circuit_compiling_done', [])
       }
-      _paq.push(['trackEvent', 'circuit-compiler', 'compile', 'Compilation successful'])
+      this._paq.push(['trackEvent', 'circuit-compiler', 'compile', 'Compilation successful'])
       circuitApi.log().map(log => {
         log && this.call('terminal', 'log', { type: 'log', value: log })
       })
@@ -226,7 +229,7 @@ export class CircomPluginClient extends PluginClient {
       const r1csErrors = r1csApi.report()
 
       this.logCompilerReport(r1csErrors)
-      _paq.push(['trackEvent', 'circuit-compiler', 'generateR1cs', 'R1CS Generation failed'])
+      this._paq.push(['trackEvent', 'circuit-compiler', 'generateR1cs', 'R1CS Generation failed'])
       throw new Error(r1csErrors)
     } else {
       this.internalEvents.emit('circuit_generating_r1cs_done')
@@ -235,7 +238,7 @@ export class CircomPluginClient extends PluginClient {
 
       // @ts-ignore
       await this.call('fileManager', 'writeFile', writePath, r1csProgram, true)
-      _paq.push(['trackEvent', 'circuit-compiler', 'generateR1cs', 'R1CS Generation successful'])
+      this._paq.push(['trackEvent', 'circuit-compiler', 'generateR1cs', 'R1CS Generation successful'])
       r1csApi.log().map(log => {
         log && this.call('terminal', 'log', { type: 'log', value: log })
       })
@@ -256,7 +259,7 @@ export class CircomPluginClient extends PluginClient {
     const witness = this.compiler ? await this.compiler.generate_witness(dataRead, input) : await generate_witness(dataRead, input)
     // @ts-ignore
     await this.call('fileManager', 'writeFile', wasmPath.replace('.wasm', '.wtn'), witness, true)
-    _paq.push(['trackEvent', 'circuit-compiler', 'computeWitness', 'Witness computing successful'])
+    this._paq.push(['trackEvent', 'circuit-compiler', 'computeWitness', 'Witness computing successful'])
     this.internalEvents.emit('circuit_computing_witness_done')
     this.emit('statusChanged', { key: 'succeed', title: 'witness computed successfully', type: 'success' })
   }