From f62ec99cfd3f44180c4944227f14221e8db45020 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Fri, 7 Nov 2025 10:24:48 +0100 Subject: [PATCH 1/4] hide topbar and pinned pannel for browser wallet mode --- apps/remix-ide/src/app.ts | 2 +- apps/remix-ide/src/app/components/top-bar.tsx | 4 +++- .../app/src/lib/remix-app/remix-app.tsx | 24 +++++++++++-------- .../top-bar/src/context/topbarContext.tsx | 3 ++- .../top-bar/src/context/topbarProvider.tsx | 3 ++- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/apps/remix-ide/src/app.ts b/apps/remix-ide/src/app.ts index 724397cec7e..ba81e89962a 100644 --- a/apps/remix-ide/src/app.ts +++ b/apps/remix-ide/src/app.ts @@ -520,7 +520,7 @@ class AppComponent { const pluginManagerComponent = new PluginManagerComponent(appManager, this.engine) const filePanel = new Filepanel(appManager, contentImport) this.statusBar = new StatusBar(filePanel, this.menuicons) - this.topBar = new Topbar(filePanel, git) + this.topBar = new Topbar(filePanel, git, this.desktopClientMode) const landingPage = new LandingPage(appManager, this.menuicons, fileManager, filePanel, contentImport) this.settings = new SettingsTab(Registry.getInstance().get('config').api, editor)//, appManager) diff --git a/apps/remix-ide/src/app/components/top-bar.tsx b/apps/remix-ide/src/app/components/top-bar.tsx index ed4068a1f75..b489a47fd46 100644 --- a/apps/remix-ide/src/app/components/top-bar.tsx +++ b/apps/remix-ide/src/app/components/top-bar.tsx @@ -39,8 +39,9 @@ export class Topbar extends Plugin { registry: Registry fileProviders: any fileManager: any + desktopClientMode: boolean - constructor(filePanel: FilePanel, git: GitPlugin) { + constructor(filePanel: FilePanel, git: GitPlugin, desktopClientMode = false) { super(TopBarProfile) this.filePanel = filePanel this.registry = Registry.getInstance() @@ -50,6 +51,7 @@ export class Topbar extends Plugin { this.git = git this.workspaces = [] this.currentWorkspaceMetadata = null + this.desktopClientMode = desktopClientMode } onActivation(): void { 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 47416e46e6e..790c6d66bc5 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 @@ -22,7 +22,7 @@ const RemixApp = (props: IRemixAppUi) => { const [appReady, setAppReady] = useState(false) const [showManagePreferencesDialog, setShowManagePreferencesDialog] = useState(false) const [hideSidePanel, setHideSidePanel] = useState(false) - const [hidePinnedPanel, setHidePinnedPanel] = useState(true) + const [hidePinnedPanel, setHidePinnedPanel] = useState(props.app.desktopClientMode || true) const [maximiseLeftTrigger, setMaximiseLeftTrigger] = useState(0) const [enhanceLeftTrigger, setEnhanceLeftTrigger] = useState(0) const [resetLeftTrigger, setResetLeftTrigger] = useState(0) @@ -125,13 +125,15 @@ const RemixApp = (props: IRemixAppUi) => { setLocale(nextLocale) }) - props.app.pinnedPanel.events.on('pinnedPlugin', () => { - setHidePinnedPanel(false) - }) + if (!props.app.desktopClientMode) { + props.app.pinnedPanel.events.on('pinnedPlugin', () => { + setHidePinnedPanel(false) + }) - props.app.pinnedPanel.events.on('unPinnedPlugin', () => { - setHidePinnedPanel(true) - }) + props.app.pinnedPanel.events.on('unPinnedPlugin', () => { + setHidePinnedPanel(true) + }) + } setInterval(() => { setOnline(window.navigator.onLine) @@ -158,9 +160,11 @@ const RemixApp = (props: IRemixAppUi) => { setShowManagePreferencesDialog(true)}> {showManagePreferencesDialog && }
-
- {props.app.topBar.render()} -
+ {!props.app.desktopClientMode && ( +
+ {props.app.topBar.render()} +
+ )}
{props.app.menuicons.render()} diff --git a/libs/remix-ui/top-bar/src/context/topbarContext.tsx b/libs/remix-ui/top-bar/src/context/topbarContext.tsx index 52eac90abc5..b14d08edc08 100644 --- a/libs/remix-ui/top-bar/src/context/topbarContext.tsx +++ b/libs/remix-ui/top-bar/src/context/topbarContext.tsx @@ -11,6 +11,7 @@ export const TopbarContext = createContext<{ openRecentFolder: (path: string) => Promise, openRecentFolderInNewWindow: (path: string) => Promise, removeRecentFolder: (path: string) => Promise, - revealRecentFolderInExplorer: (path: string) => Promise + revealRecentFolderInExplorer: (path: string) => Promise, + desktopClientMode?: boolean }>(null) diff --git a/libs/remix-ui/top-bar/src/context/topbarProvider.tsx b/libs/remix-ui/top-bar/src/context/topbarProvider.tsx index 2949ca9c81b..c9903b86b79 100644 --- a/libs/remix-ui/top-bar/src/context/topbarProvider.tsx +++ b/libs/remix-ui/top-bar/src/context/topbarProvider.tsx @@ -214,7 +214,8 @@ export const TopbarProvider = (props: TopbarProviderProps) => { openRecentFolder, openRecentFolderInNewWindow, removeRecentFolder, - revealRecentFolderInExplorer + revealRecentFolderInExplorer, + desktopClientMode: plugin.desktopClientMode } return ( From de2860e9dbde756752d8d43615d34536db91c86f Mon Sep 17 00:00:00 2001 From: ci-bot Date: Mon, 10 Nov 2025 12:22:20 +0100 Subject: [PATCH 2/4] merge --- libs/remix-ui/app/src/lib/remix-app/remix-app.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 a000386232b..0e1a9580771 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 @@ -124,21 +124,23 @@ const RemixApp = (props: IRemixAppUi) => { props.app.localeModule.events.on('localeChanged', (nextLocale) => { setLocale(nextLocale) }) + if (!props.app.desktopClientMode) { props.app.pinnedPanel.events.on('pinnedPlugin', () => { setHidePinnedPanel(false) - }) - } else { - props.app.pinnedPanel.events.on('pinnedPlugin', (profile, isClosed) => { - if (!isClosed) setHidePinnedPanel(false) }) - } - props.app.pinnedPanel.events.on('unPinnedPlugin', () => { + + props.app.pinnedPanel.events.on('unPinnedPlugin', () => { setHidePinnedPanel(true) }) + + props.app.pinnedPanel.events.on('pinnedPlugin', (profile, isClosed) => { + if (!isClosed) setHidePinnedPanel(false) + }) } + setInterval(() => { setOnline(window.navigator.onLine) }, 1000) From 3441fb638ad4a2424fa506fe327b6617df29ca9c Mon Sep 17 00:00:00 2001 From: ci-bot Date: Mon, 10 Nov 2025 14:35:40 +0100 Subject: [PATCH 3/4] add test --- apps/remix-ide-e2e/src/tests/pinned_plugin.test.ts | 6 ++++++ libs/remix-ui/app/src/lib/remix-app/remix-app.tsx | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/pinned_plugin.test.ts b/apps/remix-ide-e2e/src/tests/pinned_plugin.test.ts index 153ef9650c8..bb4e1de0191 100644 --- a/apps/remix-ide-e2e/src/tests/pinned_plugin.test.ts +++ b/apps/remix-ide-e2e/src/tests/pinned_plugin.test.ts @@ -60,5 +60,11 @@ module.exports = { .waitForElementVisible('*[data-id="movePluginToRight"]') .click('*[data-pinnedplugin="movePluginToLeft-udapp"]') .end() + }, + 'Check if pannel is gone when the app is in destop client mode #group1': function (browser: NightwatchBrowser) { + browser + .url('http://127.0.0.1:8080/?#activate=udapp,desktopClient') + .waitForElementNotPresent('#pinned-panel') + .end() } } 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 0e1a9580771..b06075b6554 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 @@ -127,9 +127,6 @@ const RemixApp = (props: IRemixAppUi) => { if (!props.app.desktopClientMode) { - props.app.pinnedPanel.events.on('pinnedPlugin', () => { - setHidePinnedPanel(false) - }) props.app.pinnedPanel.events.on('unPinnedPlugin', () => { setHidePinnedPanel(true) From f21e3b85f2c8ead3cdb169949da8f76043623e7b Mon Sep 17 00:00:00 2001 From: ci-bot Date: Mon, 10 Nov 2025 14:36:03 +0100 Subject: [PATCH 4/4] lint --- libs/remix-ui/app/src/lib/remix-app/remix-app.tsx | 2 -- 1 file changed, 2 deletions(-) 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 b06075b6554..8829ef0d8c0 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 @@ -124,7 +124,6 @@ const RemixApp = (props: IRemixAppUi) => { props.app.localeModule.events.on('localeChanged', (nextLocale) => { setLocale(nextLocale) }) - if (!props.app.desktopClientMode) { @@ -137,7 +136,6 @@ const RemixApp = (props: IRemixAppUi) => { }) } - setInterval(() => { setOnline(window.navigator.onLine) }, 1000)