From 9ec195fbc6314ad73b92fd13b3822753e6240ce7 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 14 Oct 2024 09:12:19 +0200
Subject: [PATCH 1/2] placement of folder name on desktop

---
 .../workspace/src/lib/components/electron-menu.tsx    |  2 +-
 .../src/lib/components/electron-workspace-name.tsx    | 11 +++++++++--
 .../remix-ui/workspace/src/lib/remix-ui-workspace.tsx |  4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/libs/remix-ui/workspace/src/lib/components/electron-menu.tsx b/libs/remix-ui/workspace/src/lib/components/electron-menu.tsx
index eee53344f7..51294ccbaf 100644
--- a/libs/remix-ui/workspace/src/lib/components/electron-menu.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/electron-menu.tsx
@@ -44,7 +44,7 @@ export const ElectronMenu = () => {
                     >
                       <div className="recentfolder pb-1">
                         <span onClick={async () => { await openFolderElectron(folder) }} className="pl-2 recentfolder_name pr-2">{lastFolderName(folder)}</span>
-                        <span onClick={async () => { await openFolderElectron(folder) }} data-id={{ folder }} className="recentfolder_path pr-2">{folder}</span>
+                        <span onClick={async () => { await openFolderElectron(folder) }} data-id={`recent_folder_${folder}`} className="recentfolder_path pr-2">{folder}</span>
                         <i
                           onClick={() => {
                             global.dispatchRemoveRecentFolder(folder)
diff --git a/libs/remix-ui/workspace/src/lib/components/electron-workspace-name.tsx b/libs/remix-ui/workspace/src/lib/components/electron-workspace-name.tsx
index 8d7983f094..33f23c5d8d 100644
--- a/libs/remix-ui/workspace/src/lib/components/electron-workspace-name.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/electron-workspace-name.tsx
@@ -23,14 +23,21 @@ export const ElectronWorkspaceName = (props: ElectronWorkspaceNameProps) => {
 
   return (
     (dir === undefined || dir === '') ? <></> :
-      <div className="d-flex align-items-baseline">
+      <div className="d-flex align-items-baseline mt-2">
         <CustomTooltip
           placement="bottom"
           tooltipId="workspace-name"
           tooltipClasses="text-nowrap"
           tooltipText={dir}
         >
-          <div>{parsePath()}</div>
+          <div
+            style={{
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              flexGrow: 1,
+            }}
+          
+          >{parsePath()}</div>
         </CustomTooltip>
         <CustomTooltip
           placement="top"
diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index f7f79dbf72..c544a152eb 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -1060,7 +1060,7 @@ export function Workspace() {
                     <span className="d-flex">
                       <label className="pl-2 form-check-label" style={{ wordBreak: 'keep-all' }}>
                         {(platform == appPlatformTypes.desktop) ? (
-                          <ElectronWorkspaceName plugin={global.plugin} path={global.fs.browser.currentLocalFilePath} />
+                          null
                         ) : <FormattedMessage id='filePanel.workspace' />}
                       </label>
                       {selectedWorkspace && selectedWorkspace.name === 'code-sample' && <CustomTooltip
@@ -1143,7 +1143,7 @@ export function Workspace() {
                         )}
                       </Dropdown.Menu>
                     </Dropdown>
-                  ):null}
+                  ):<ElectronWorkspaceName plugin={global.plugin} path={global.fs.browser.currentLocalFilePath} />}
                 </div>
               </div>
             </header>

From 2ce6a91f9569e83986a62838c0e98cbd34bf8017 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 14 Oct 2024 09:25:51 +0200
Subject: [PATCH 2/2] lint

---
 .../workspace/src/lib/components/electron-workspace-name.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/workspace/src/lib/components/electron-workspace-name.tsx b/libs/remix-ui/workspace/src/lib/components/electron-workspace-name.tsx
index 33f23c5d8d..3251fb77d6 100644
--- a/libs/remix-ui/workspace/src/lib/components/electron-workspace-name.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/electron-workspace-name.tsx
@@ -36,7 +36,7 @@ export const ElectronWorkspaceName = (props: ElectronWorkspaceNameProps) => {
               textOverflow: 'ellipsis',
               flexGrow: 1,
             }}
-          
+
           >{parsePath()}</div>
         </CustomTooltip>
         <CustomTooltip