From d244c909be59381867d4ae89c56dc68e90a9bc69 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Mon, 4 Nov 2024 15:16:14 +0100
Subject: [PATCH] fix bugs

---
 .../src/app/components/popup-panel.tsx        |  6 +--
 .../src/lib/components/PluginViewWrapper.tsx  | 37 +++++++++++--------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index 363d89d2cf..b85c3eb8a8 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -80,14 +80,14 @@ export class PopupPanel extends AbstractPanel {
 
   render() {
     return (
-      <PluginViewWrapper plugin={this} />
+      <PluginViewWrapper useAppContext={true} plugin={this} />
     )
   }
 
-  updateComponent(state: popupPanelState & Partial<AppState>) {
+  updateComponent(state: popupPanelState, appState: Partial<AppState>) {
     return (
       <div
-        className={'px-0 bg-light border-info ' + (!state.showPopupPanel ? 'd-none' : 'd-flex')}
+        className={`px-0 bg-light border-info ${appState?.showPopupPanel ? 'd-flex' : 'd-none'}`}
         style={{
           maxHeight: '40rem',
           maxWidth: '25rem',
diff --git a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
index c29f58d4dc..e5e7700eac 100644
--- a/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
+++ b/libs/remix-ui/helper/src/lib/components/PluginViewWrapper.tsx
@@ -1,28 +1,35 @@
 import { AppContext } from '@remix-ui/app'
-import React, { useContext } from 'react'
-import { useEffect, useState } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 
 interface IPluginViewWrapperProps {
   plugin: any
+  useAppContext?: boolean // Optional flag to decide whether to use AppContext
 }
 
-export const PluginViewWrapper = (props: IPluginViewWrapperProps) => {
+export const PluginViewWrapper = ({ plugin, useAppContext = false }: IPluginViewWrapperProps) => {
   const [state, setState] = useState<any>(null)
-  const appContext = useContext(AppContext)
+  const appContext = useAppContext ? useContext(AppContext) : null
 
   useEffect(() => {
-    if (props.plugin.setDispatch) {
-      props.plugin.setDispatch(setState)
+    if (plugin.setDispatch) {
+      plugin.setDispatch(setState)
     }
-    if (props.plugin.setAppStateDispatch) {
-      props.plugin.setAppStateDispatch(appContext.appStateDispatch)
+    if (useAppContext && appContext.appStateDispatch && plugin.setAppStateDispatch) {
+      plugin.setAppStateDispatch(appContext.appStateDispatch)
     }
-  }, [])
+  }, [plugin])
 
-  return <>{state ? <>{props.plugin.updateComponent(
-    {
-      ...state,
-      ...appContext['appState']
-    })}
-  </> : <></>}</>
+  if (useAppContext && appContext && appContext.appState) {
+    return (
+      <>
+        {state ? <>{plugin.updateComponent(state, appContext.appState)}</> : <></>}
+      </>
+    )
+  }
+
+  return (
+    <>
+      {state ? <>{plugin.updateComponent(state)}</> : <></>}
+    </>
+  )
 }