Commit dcca04fa authored by aniket-engg's avatar aniket-engg Committed by Aniket

handled checkbox display on switching from localhost

parent 24a433b2
...@@ -92,7 +92,7 @@ class CompileTab extends ViewPlugin { ...@@ -92,7 +92,7 @@ class CompileTab extends ViewPlugin {
listenToEvents () { listenToEvents () {
this.on('filePanel', 'setWorkspace', (workspace) => { this.on('filePanel', 'setWorkspace', (workspace) => {
this.compileTabLogic.isHardhatProject().then((result) => { this.compileTabLogic.isHardhatProject().then((result) => {
if (result) this.compilerContainer.hardhatCompilation.style.display = 'flex' if (result && workspace.isLocalhost) this.compilerContainer.hardhatCompilation.style.display = 'flex'
else this.compilerContainer.hardhatCompilation.style.display = 'none' else this.compilerContainer.hardhatCompilation.style.display = 'none'
}) })
}) })
......
...@@ -91,7 +91,11 @@ export const Workspace = (props: WorkspaceProps) => { ...@@ -91,7 +91,11 @@ export const Workspace = (props: WorkspaceProps) => {
const localhostDisconnect = () => { const localhostDisconnect = () => {
if (state.currentWorkspace === LOCALHOST) setWorkspace(props.workspaces.length > 0 ? props.workspaces[0] : NO_WORKSPACE) if (state.currentWorkspace === LOCALHOST) setWorkspace(props.workspaces.length > 0 ? props.workspaces[0] : NO_WORKSPACE)
else setWorkspace(state.currentWorkspace) // Useful to switch to last selcted workspace when remixd is disconnected // This should be removed some time after refactoring: https://github.com/ethereum/remix-project/issues/1197
else {
setWorkspace(state.currentWorkspace) // Useful to switch to last selcted workspace when remixd is disconnected
props.fileManager.setMode('browser')
}
} }
props.localhost.event.unregister('disconnected', localhostDisconnect) props.localhost.event.unregister('disconnected', localhostDisconnect)
props.localhost.event.register('disconnected', localhostDisconnect) props.localhost.event.register('disconnected', localhostDisconnect)
...@@ -251,6 +255,7 @@ export const Workspace = (props: WorkspaceProps) => { ...@@ -251,6 +255,7 @@ export const Workspace = (props: WorkspaceProps) => {
// If 'connect to localhost' is clicked from home tab, mode is not 'localhost' // If 'connect to localhost' is clicked from home tab, mode is not 'localhost'
if (props.fileManager.mode === 'localhost') { if (props.fileManager.mode === 'localhost') {
await setWorkspace(NO_WORKSPACE) await setWorkspace(NO_WORKSPACE)
console.log('remixdExplorer.hide')
props.fileManager.setMode('browser') props.fileManager.setMode('browser')
setState(prevState => { setState(prevState => {
return { ...prevState, hideRemixdExplorer: true, loadingLocalhost: false } return { ...prevState, hideRemixdExplorer: true, loadingLocalhost: false }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment