From 3ff2b4429ce44e66d062ad1324be3df3fcf05858 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 9 Jun 2023 17:01:41 +0100
Subject: [PATCH 01/20] linter & slither checkbox tooltip updates

---
 .../static-analyser/src/lib/remix-ui-static-analyser.tsx  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index dda3c2c023..639595e8d4 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -633,7 +633,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
           <RemixUiCheckbox
             id="solhintstaticanalysis"
             inputType="checkbox"
-            title="Run solhint static analysis."
+            title="Run SolHint static analysis."
             onClick={handleLinterEnabled}
             checked={solhintEnabled}
             label="Linter"
@@ -647,11 +647,11 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
             inputType="checkbox"
             onClick={handleSlitherEnabled}
             checked={showSlither}
-            disabled={true}
+            disabled={false}
             label="Slither"
             onChange={() => {}}
             optionalClassName="mr-3"
-            title="To run Slither analysis, Remix IDE must be connected to your local filesystem with remixd."
+            title="Run Slither static analysis."
           />
         </div>
           <Button
@@ -677,7 +677,6 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                 id="showLibWarnings"
                 name="showLibWarnings"
                 categoryId="showLibWarnings"
-                title="When checked, the results are also displayed for external contract libraries."
                 inputType="checkbox"
                 checked={showLibsWarning}
                 label="Show warnings for external libraries"
@@ -688,7 +687,6 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               <RemixUiCheckbox
                 id="hideWarnings"
                 name="hideWarnings"
-                title="When checked, general warnings from analysis are hidden."
                 inputType="checkbox"
                 checked={hideWarnings}
                 label="Hide warnings"

From a4b3112113b83666a52f26e88cd5417b23451748 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 12 Jun 2023 13:13:26 +0100
Subject: [PATCH 02/20] fix slither checkbox disabling now reliant on remixd

---
 .../src/lib/remix-ui-static-analyser.tsx      | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 639595e8d4..e0d833aea8 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -69,6 +69,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   const [basicEnabled, setBasicEnabled] = useState(true)
   const [solhintEnabled, setSolhintEnabled] = useState(true) // assuming that solhint is always enabled
   const [showSlither, setShowSlither] = useState(false)
+  const [slitherEnabled, setSlitherEnabled] = useState(false)
   const [isSupportedVersion, setIsSupportedVersion] = useState(false)
   let [showLibsWarning, setShowLibsWarning] = useState(false) // eslint-disable-line prefer-const
   const [categoryIndex, setCategoryIndex] = useState(groupedModuleIndex(groupedModules))
@@ -77,7 +78,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   const [hints, setHints] = useState<SolHintReport[]>([])
   const [slitherWarnings, setSlitherWarnings] = useState([])
   const [ssaWarnings, setSsaWarnings] = useState([])
-  
+
   const warningContainer = useRef(null)
   const allWarnings = useRef({})
   const [state, dispatch] = useReducer(analysisReducer, initialState)
@@ -138,9 +139,13 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
       setSlitherWarnings([])
       setSsaWarnings([])
       // Show 'Enable Slither Analysis' checkbox
-      if (currentWorkspace && currentWorkspace.isLocalhost === true) setShowSlither(true)
+      if (currentWorkspace && currentWorkspace.isLocalhost === true) {
+        setShowSlither(true)
+        setSlitherEnabled(true)
+      }
       else {
         setShowSlither(false)
+        setSlitherEnabled(false)
       }
     })
     props.analysisModule.on('manager', 'pluginDeactivated', (plugin) => {
@@ -150,6 +155,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
         setWarningState([])
         setHints([])
         setSlitherWarnings([])
+        setSlitherEnabled(false)
         setSsaWarnings([])
         // Reset badge
         props.event.trigger('staticAnaysisWarning', [])
@@ -225,7 +231,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
     filterWarnings()
   }
 
-  
+
   const handleCheckAllModules = (groupedModules) => {
     const index = groupedModuleIndex(groupedModules)
     if (index.every(el => categoryIndex.includes(el))) {
@@ -256,7 +262,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
     const checkRemixd = await props.analysisModule.call('manager', 'isActive', 'remixd')
     if (showSlither) {
       setShowSlither(false)
-    } 
+    }
     if(!showSlither) {
       setShowSlither(true)
     }
@@ -495,7 +501,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                   <div key={index}>
                     {element[1]["map"](
                       (x,i) => // eslint-disable-line dot-notation
-                        x.hasWarning && !hideWarnings 
+                        x.hasWarning && !hideWarnings
                         ? ( // eslint-disable-next-line  dot-notation
                           <div
                             data-id={`staticAnalysisModule${x.warningModuleName}${i}`}
@@ -545,7 +551,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
             <div id="solhintlintingresult" className="mb-5">
               <div className="mb-4 pt-2">
                 <Fragment>
-                  {!hideWarnings 
+                  {!hideWarnings
                     ? showLibsWarning ? slitherWarnings.filter(warning => warning.isLibrary).map((warning, index) => (
                       <div
                       data-id={`staticAnalysisModule${warning.warningModuleName}${index}`}
@@ -629,29 +635,29 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
             tooltipPlacement={'bottom-start'}
             optionalClassName="mr-3"
           />
-          
+
           <RemixUiCheckbox
             id="solhintstaticanalysis"
             inputType="checkbox"
             title="Run SolHint static analysis."
             onClick={handleLinterEnabled}
-            checked={solhintEnabled}
+            checked={solhintEnabled }
             label="Linter"
             onChange={() => {}}
             tooltipPlacement={'top-start'}
             optionalClassName="mr-3"
           />
-          
+
           <RemixUiCheckbox
             id="enableSlither"
             inputType="checkbox"
             onClick={handleSlitherEnabled}
-            checked={showSlither}
-            disabled={false}
+            checked={showSlither && slitherEnabled}
+            disabled={slitherEnabled}
             label="Slither"
             onChange={() => {}}
             optionalClassName="mr-3"
-            title="Run Slither static analysis."
+            title={"Run Slither static analysis."}
           />
         </div>
           <Button

From f9d80974ff819ab167b4234b5a988c053174ed04 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 12 Jun 2023 16:05:30 +0100
Subject: [PATCH 03/20] finished fixing comments from @ryestew

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

diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index e0d833aea8..838b723942 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -657,7 +657,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
             label="Slither"
             onChange={() => {}}
             optionalClassName="mr-3"
-            title={"Run Slither static analysis."}
+            title={slitherEnabled ? "Run Slither static analysis." : "To have slither active, you need to have remixd connected to your local filesystem"}
           />
         </div>
           <Button

From 8f0df600710d6f9f8609a1ab2472e97cc869d97d Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 12 Jun 2023 16:17:45 +0100
Subject: [PATCH 04/20] remove redundant linting context action

---
 apps/remix-ide/src/remixAppManager.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index 68906f0016..9c9f365f23 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -228,16 +228,6 @@ export class RemixAppManager extends PluginManager {
       sticky: true,
       group: 7
     })
-    await this.call('filePanel', 'registerContextMenuItem', {
-      id: 'solhint',
-      name: 'lintContractCustomAction',
-      label: 'Lint Contract',
-      type: [],
-      extension: ['.sol'],
-      path: [],
-      pattern: [],
-      sticky: true
-    })
   }
 }
 

From 5cfdc225d67cd59aaeceade293f04042641f76da Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 12 Jun 2023 16:21:13 +0100
Subject: [PATCH 05/20] remove tooltip from badges

---
 .../src/lib/components/Badge.tsx                 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx b/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx
index 6a6c56619a..3408568a59 100644
--- a/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx
+++ b/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx
@@ -48,23 +48,23 @@ function Badge ({ badgeStatus }: BadgeProps) {
     <>
       {
         badgeStatus && checkStatusKeyValue(badgeStatus.key, badgeStatus.type) ? (
-          <CustomTooltip
-            placement={'right'}
-            tooltipClasses="text-nowrap"
-            tooltipId="verticalItemsbadge"
-            tooltipText={badgeStatus.pluginName && badgeStatus.pluginName === 'solidityStaticAnalysis' ? 'There are multiple warnings or errors that might need to be fixed.' :badgeStatus.title}
-          >
+          // <CustomTooltip
+          //   placement={'right'}
+          //   tooltipClasses="text-nowrap"
+          //   tooltipId="verticalItemsbadge"
+          //   tooltipText={badgeStatus.pluginName && badgeStatus.pluginName === 'solidityStaticAnalysis' ? 'There are multiple warnings or errors that might need to be fixed.' :badgeStatus.title}
+          // >
             <i
               className={`${resolveClasses(badgeStatus.key, badgeStatus.type!)}`}
               aria-hidden="true"
             >
                   { badgeStatus.pluginName && badgeStatus.pluginName === 'solidityStaticAnalysis' ? <span>&nbsp;</span> : badgeStatus.text }
             </i>
-          </CustomTooltip>
+          // </CustomTooltip>
         ) : null
       }
     </>
   )
 }
 
-export default Badge
\ No newline at end of file
+export default Badge

From 13f165b9a285e30aaaa75445cd6fe67e40536008 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Mon, 12 Jun 2023 17:12:59 +0100
Subject: [PATCH 06/20] fix matomo issues with solidityumlgen

---
 .../solidity-uml-gen/src/lib/components/UmlDownload.tsx     | 4 ++--
 .../src/lib/components/file-explorer-context-menu.tsx       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/remix-ui/solidity-uml-gen/src/lib/components/UmlDownload.tsx b/libs/remix-ui/solidity-uml-gen/src/lib/components/UmlDownload.tsx
index 9e57337d22..1af9d635b1 100644
--- a/libs/remix-ui/solidity-uml-gen/src/lib/components/UmlDownload.tsx
+++ b/libs/remix-ui/solidity-uml-gen/src/lib/components/UmlDownload.tsx
@@ -86,7 +86,7 @@ export default function UmlDownload(props: UmlDownloadProps) {
               _paq.push([
                 "trackEvent",
                 "solidityumlgen",
-                "download",
+                "umlpngdownload",
                 "downloadAsPng",
               ]);
               props.download("png")
@@ -115,7 +115,7 @@ export default function UmlDownload(props: UmlDownloadProps) {
               _paq.push([
                 "trackEvent",
                 "solUmlgen",
-                "download",
+                "umlpdfdownload",
                 "downloadAsPdf",
               ]);
               props.download("pdf")
diff --git a/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx b/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx
index b5e748a81d..146721b3b4 100644
--- a/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/file-explorer-context-menu.tsx
@@ -40,7 +40,7 @@ export const FileExplorerContextMenu = (props: FileExplorerContextMenuProps) =>
      * for example : 'downloadAsZip' with type ['file','folder'] will work on files and folders when multiple are selected
     **/
     const nonRootFocus = focus.filter((el) => { return !(el.key === '' && el.type === 'folder') })
-    
+
     if(focus[0].key === "contextMenu"){
       return true
     }
@@ -175,7 +175,7 @@ export const FileExplorerContextMenu = (props: FileExplorerContextMenuProps) =>
               publishFolderToGist(path, type)
             break
             default:
-              _paq.push(['trackEvent', 'fileExplorer', 'customAction', `${item.id}/${item.name}`])
+              _paq.push(['trackEvent', 'fileExplorer', 'contextMenu', `${item.id}/${item.name}`])
               emit && emit({ ...item, path: [path] } as customAction)
               break
           }
@@ -183,7 +183,7 @@ export const FileExplorerContextMenu = (props: FileExplorerContextMenuProps) =>
         }}>{intl.formatMessage({id: `filePanel.${item.id}`, defaultMessage: item.label || item.name})}</li>
     }))
   }
-  
+
   return (
     <div
       id="menuItemsContainer"

From 44aed3df41ca59c7f036431eb84c863b066fc43e Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 13 Jun 2023 12:18:48 +0100
Subject: [PATCH 07/20] fix slither tab visibility and label

---
 .../checkbox/src/lib/remix-ui-checkbox.tsx    |  2 +-
 .../src/lib/Button/StaticAnalyserButton.tsx   | 34 +++++++++++++------
 .../src/lib/remix-ui-static-analyser.tsx      | 14 +++++---
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/libs/remix-ui/checkbox/src/lib/remix-ui-checkbox.tsx b/libs/remix-ui/checkbox/src/lib/remix-ui-checkbox.tsx
index 9a0b0d063f..4486292af5 100644
--- a/libs/remix-ui/checkbox/src/lib/remix-ui-checkbox.tsx
+++ b/libs/remix-ui/checkbox/src/lib/remix-ui-checkbox.tsx
@@ -58,7 +58,7 @@ export const RemixUiCheckbox = ({
           checked={checked}
           disabled={disabled}
         />
-        <label className="form-check-label custom-control-label" id={`heading${categoryId}`} style={{ paddingTop: '0.15rem' }}>
+        <label className="form-check-label custom-control-label" id={`heading${categoryId}`} style={{ paddingTop: '0.15rem' }} aria-disabled={disabled}>
           {name ? <div className="font-weight-bold">{itemName}</div> : ''}
           {label}
         </label>
diff --git a/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx b/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
index 06fe5a04e3..136846bb96 100644
--- a/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
@@ -19,20 +19,32 @@ const StaticAnalyserButton = ({
   const defaultStyle = "btn btn-sm w-25 btn-primary"
   const newclassList = disabled && classList.length > 0 ? `${classList} disabled` :
   classList.length === 0 && disabled ? `${defaultStyle} disabled` : classList.length > 0 ? `${classList}` : defaultStyle
-  return (
+
+  const buttonWithoutTooltip = () => (
     <button id="staticAnalysisRunBtn" className={newclassList} disabled={disabled} onClick={onClick}>
-      <CustomTooltip
-        placement="right"
-        tooltipId="ssaRunButtonTooltip"
-        tooltipClasses="text-nowrap"
-        tooltipText={title}
-      >
-        <span className="pl-3 pr-4">
-          {buttonText}
-        </span>
-      </CustomTooltip>
+      <span className="pl-3 pr-4">
+        {buttonText}
+      </span>
     </button>
   )
+
+  const buttonWithTooltip = () => (
+    <button id="staticAnalysisRunBtn" className={newclassList} disabled={disabled} onClick={onClick}>
+    <CustomTooltip
+      placement="right"
+      tooltipId="ssaRunButtonTooltip"
+      tooltipClasses="text-nowrap"
+      tooltipText={title}
+    >
+      <span className="pl-3 pr-4">
+        {buttonText}
+      </span>
+    </CustomTooltip>
+  </button>)
+
+  return (
+      title && title.length > 0 ? buttonWithTooltip() : buttonWithoutTooltip()
+  )
 }
 
 export default StaticAnalyserButton
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 838b723942..710232f390 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -657,17 +657,23 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
             label="Slither"
             onChange={() => {}}
             optionalClassName="mr-3"
-            title={slitherEnabled ? "Run Slither static analysis." : "To have slither active, you need to have remixd connected to your local filesystem"}
+            title={slitherEnabled ? "Run Slither static analysis." : "To run Slither analysis, Remix IDE must be connected to your local filesystem with Remixd."}
           />
         </div>
-          <Button
+          {state.data && state.file.length > 0 && state.source ? <Button
+              buttonText={`Analyse ${state.file}`}
+              classList="btn btn-sm btn-primary btn-block"
+              onClick={async () => await run(state.data, state.source, state.file, state , props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq,
+                message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings)}
+              disabled={(state.data === null || !isSupportedVersion)  || (!solhintEnabled && !basicEnabled) }
+          /> : <Button
               buttonText={`Analyse ${state.file}`}
               title={`${runButtonTitle}`}
               classList="btn btn-sm btn-primary btn-block"
               onClick={async () => await run(state.data, state.source, state.file, state , props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq,
                 message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings)}
               disabled={(state.data === null || !isSupportedVersion)  || (!solhintEnabled && !basicEnabled) }
-          />
+          />}
           {state && state.data !== null && state.source !== null && state.file.length > 0 ? (<div className="d-flex border-top flex-column">
             <div className="mt-4 p-2 d-flex border-top flex-column">
               <span>Last results for:</span>
@@ -719,7 +725,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               >
                 {tabKeys[0].child}
               </Tab> : null}
-              { showSlither ? <Tab
+              { showSlither && slitherEnabled ? <Tab
                 key={tabKeys[2].tabKey}
                 title={tabKeys[2].title}
                 eventKey={tabKeys[2].tabKey}

From 8450d6d36dc6acd71eafb6eaf380b455a5ab470a Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 13 Jun 2023 12:40:29 +0100
Subject: [PATCH 08/20] fix error badge on remix tab

---
 .../static-analyser/src/lib/components/BasicTitle.tsx       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx b/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
index f841d8c4fd..600d629ffd 100644
--- a/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
@@ -32,13 +32,13 @@ export function calculateWarningStateEntries(entries: [string, any][]) {
 export function BasicTitle(props: BasicTitleProps) {
 
   return (
-    <span>Remix{props.warningStateEntries.length > 0 && !props.hideWarnings ? <i data-id="StaticAnalysisErrorCount" className="badge badge-info rounded-circle ml-1">{calculateWarningStateEntries(props.warningStateEntries).length}</i>: (
+    <span>Remix{props.warningStateEntries.length > 0 ?   !props.hideWarnings ? <i data-id="StaticAnalysisErrorCount" className="badge badge-info rounded-circle ml-1">{calculateWarningStateEntries(props.warningStateEntries).length}</i>: (
       <i className="badge badge-info rounded-circle ml-1">
         {
           calculateWarningStateEntries(props.warningStateEntries).errors.length
         }
       </i>
-    )}
+    ) : null}
     </span>
   )
-}
\ No newline at end of file
+}

From c121d23ac3f3c120f9a80902c54d5ce391ff68e1 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 13 Jun 2023 13:00:08 +0100
Subject: [PATCH 09/20] fix possibility where clicking Analyse button might
 attempt to run slither also

---
 .../src/lib/actions/staticAnalysisActions.ts       | 14 ++++++++------
 .../src/lib/remix-ui-static-analyser.tsx           |  8 +++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts b/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts
index 8faddbbda7..30989e5b39 100644
--- a/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts
+++ b/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts
@@ -1,10 +1,11 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { CompilationResult, SourceWithTarget } from '@remixproject/plugin-api'
 import React from 'react' //eslint-disable-line
 import { AnalysisTab, RemixUiStaticAnalyserReducerActionType, RemixUiStaticAnalyserState, SolHintReport, SlitherAnalysisResults } from '../../staticanalyser'
 import { RemixUiStaticAnalyserProps } from '@remix-ui/static-analyser'
 
 /**
- * 
+ *
  * @param analysisModule { AnalysisTab } AnalysisTab ViewPlugin
  * @param dispatch { React.Dispatch<any> } analysisReducer function's dispatch method
  */
@@ -24,8 +25,8 @@ export const compilation = (analysisModule: AnalysisTab,
 
 /**
  * Run the analysis on the currently compiled contract
- * @param lastCompilationResult 
- * @param lastCompilationSource 
+ * @param lastCompilationResult
+ * @param lastCompilationSource
  * @param currentFile {string} current file path
  * @param state { RemixUiStaticAnalyserState}
  * @param props {RemixUiStaticAnalyserProps}
@@ -42,7 +43,8 @@ export const compilation = (analysisModule: AnalysisTab,
  * @returns {Promise<void>}
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export async function run (lastCompilationResult, lastCompilationSource, currentFile: string, state: RemixUiStaticAnalyserState, props: RemixUiStaticAnalyserProps, isSupportedVersion, showSlither, categoryIndex: number[], groupedModules, runner, _paq, message, showWarnings, allWarnings: React.RefObject<any>, warningContainer: React.RefObject<any>, calculateWarningStateEntries: (e:[string, any][]) => {length: number, errors: any[] }, warningState, setHints: React.Dispatch<React.SetStateAction<SolHintReport[]>>, hints: SolHintReport[], setSlitherWarnings: React.Dispatch<React.SetStateAction<any[]>>, setSsaWarnings: React.Dispatch<React.SetStateAction<any[]>>) {
+export async function run (lastCompilationResult, lastCompilationSource, currentFile: string, state: RemixUiStaticAnalyserState, props: RemixUiStaticAnalyserProps, isSupportedVersion, showSlither, categoryIndex: number[], groupedModules, runner, _paq, message, showWarnings, allWarnings: React.RefObject<any>, warningContainer: React.RefObject<any>, calculateWarningStateEntries: (e:[string, any][]) => {length: number, errors: any[] }, warningState, setHints: React.Dispatch<React.SetStateAction<SolHintReport[]>>, hints: SolHintReport[], setSlitherWarnings: React.Dispatch<React.SetStateAction<any[]>>, setSsaWarnings: React.Dispatch<React.SetStateAction<any[]>>,
+slitherEnabled: boolean) {
 
   if (!isSupportedVersion) return
   if (state.data !== null) {
@@ -54,7 +56,7 @@ export async function run (lastCompilationResult, lastCompilationSource, current
         const hintsResult = await props.analysisModule.call('solhint', 'lint', state.file)
         setHints(hintsResult)
       const warningResult = calculateWarningStateEntries(Object.entries(warningState))
-        props.analysisModule.emit('statusChanged', { key: hints.length+warningResult.length, 
+        props.analysisModule.emit('statusChanged', { key: hints.length+warningResult.length,
       title: `${hints.length+warningResult.length} warning${hints.length+warningResult.length === 1 ? '' : 's'}`, type: 'warning'})
 
       // Remix Analysis
@@ -121,7 +123,7 @@ export async function run (lastCompilationResult, lastCompilationSource, current
         }
       }
       // Slither Analysis
-      if (showSlither) {
+      if (showSlither && slitherEnabled) {
         try {
           const compilerState = await props.analysisModule.call('solidity', 'getCompilerState')
           const { currentVersion, optimize, evmVersion } = compilerState
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 710232f390..0b87881c5b 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import React, { useEffect, useState, useReducer, useRef, Fragment } from 'react' // eslint-disable-line
 import Button from './Button/StaticAnalyserButton' // eslint-disable-line
 import { util } from '@remix-project/remix-lib'
@@ -110,7 +112,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   useEffect(() => {
     setWarningState({})
     const runAnalysis = async () => {
-      await run(state.data, state.source, state.file, state, props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq, message, showWarnings, allWarnings, warningContainer,calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings)
+      await run(state.data, state.source, state.file, state, props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq, message, showWarnings, allWarnings, warningContainer,calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled)
     }
     props.event.trigger('staticAnaysisWarning', [])
     // if (basicEnabled) {
@@ -664,14 +666,14 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               buttonText={`Analyse ${state.file}`}
               classList="btn btn-sm btn-primary btn-block"
               onClick={async () => await run(state.data, state.source, state.file, state , props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq,
-                message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings)}
+                message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled)}
               disabled={(state.data === null || !isSupportedVersion)  || (!solhintEnabled && !basicEnabled) }
           /> : <Button
               buttonText={`Analyse ${state.file}`}
               title={`${runButtonTitle}`}
               classList="btn btn-sm btn-primary btn-block"
               onClick={async () => await run(state.data, state.source, state.file, state , props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq,
-                message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings)}
+                message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled)}
               disabled={(state.data === null || !isSupportedVersion)  || (!solhintEnabled && !basicEnabled) }
           />}
           {state && state.data !== null && state.source !== null && state.file.length > 0 ? (<div className="d-flex border-top flex-column">

From 413da86b37f22c7110888faa16b2aa35539c33aa Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 13 Jun 2023 15:16:45 +0100
Subject: [PATCH 10/20] explicitly check slitherEnabled

---
 .../src/lib/remix-ui-static-analyser.tsx      | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 0b87881c5b..30c2bd556a 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -655,7 +655,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
             inputType="checkbox"
             onClick={handleSlitherEnabled}
             checked={showSlither && slitherEnabled}
-            disabled={slitherEnabled}
+            disabled={slitherEnabled === false}
             label="Slither"
             onChange={() => {}}
             optionalClassName="mr-3"
@@ -669,7 +669,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                 message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled)}
               disabled={(state.data === null || !isSupportedVersion)  || (!solhintEnabled && !basicEnabled) }
           /> : <Button
-              buttonText={`Analyse ${state.file}`}
+              buttonText={`Analyze ${state.file}`}
               title={`${runButtonTitle}`}
               classList="btn btn-sm btn-primary btn-block"
               onClick={async () => await run(state.data, state.source, state.file, state , props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq,
@@ -677,14 +677,17 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               disabled={(state.data === null || !isSupportedVersion)  || (!solhintEnabled && !basicEnabled) }
           />}
           {state && state.data !== null && state.source !== null && state.file.length > 0 ? (<div className="d-flex border-top flex-column">
-            <div className="mt-4 p-2 d-flex border-top flex-column">
-              <span>Last results for:</span>
-              <span
-                className="text-break break-word word-break font-weight-bold"
-                id="staticAnalysisCurrentFile"
-              >
-                {state.file}
-              </span>
+            <div className={`mt-4 p-2 d-flex ${slitherWarnings.length > 0 || hints.length > 0 || Object.entries(warningState).length > 0 ? 'border-top' : ''} flex-column`}>
+              {slitherWarnings.length > 0 || hints.length > 0 || Object.entries(warningState).length > 0 ?  (
+              <>
+                <span>Last results for:</span>
+                  <span
+                    className="text-break break-word word-break font-weight-bold"
+                    id="staticAnalysisCurrentFile"
+                  >
+                    {state.file}
+                  </span>
+              </>) : null}
             </div>
             <div className="border-top mt-3 pt-2 mb-2" id="staticanalysisresult">
               <RemixUiCheckbox
@@ -708,13 +711,16 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                 onChange={() => {}}
               />
             </div>
-            <Tabs defaultActiveKey={tabKeys[0].tabKey}>
+            <Tabs
+              defaultActiveKey={tabKeys[0].tabKey}
+              className="px-1"
+            >
               {
                 checkBasicStatus() ? <Tab
                   key={tabKeys[1].tabKey}
                   title={tabKeys[1].title}
                   eventKey={tabKeys[1].tabKey}
-                  tabClassName="text-decoration-none font-weight-bold"
+                  tabClassName="text-decoration-none font-weight-bold px-2"
                 >
                   {tabKeys[1].child}
                 </Tab> : null
@@ -723,7 +729,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                 key={tabKeys[0].tabKey}
                 title={tabKeys[0].title}
                 eventKey={tabKeys[0].tabKey}
-                tabClassName="text-decoration-none font-weight-bold"
+                tabClassName="text-decoration-none font-weight-bold px-2"
               >
                 {tabKeys[0].child}
               </Tab> : null}
@@ -731,7 +737,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                 key={tabKeys[2].tabKey}
                 title={tabKeys[2].title}
                 eventKey={tabKeys[2].tabKey}
-                tabClassName="text-decoration-none font-weight-bold"
+                tabClassName="text-decoration-none font-weight-bold px-2"
               >
                 {tabKeys[2].child}
               </Tab> : null }

From 534ffaa271d5550dc53274452829ffb52791ce5d Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 13 Jun 2023 15:17:39 +0100
Subject: [PATCH 11/20] remove default disabled value

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

diff --git a/libs/remix-ui/checkbox/src/lib/remix-ui-checkbox.tsx b/libs/remix-ui/checkbox/src/lib/remix-ui-checkbox.tsx
index 4486292af5..a70892796f 100644
--- a/libs/remix-ui/checkbox/src/lib/remix-ui-checkbox.tsx
+++ b/libs/remix-ui/checkbox/src/lib/remix-ui-checkbox.tsx
@@ -37,7 +37,7 @@ export const RemixUiCheckbox = ({
   visibility,
   optionalClassName = '',
   display = 'flex',
-  disabled = false,
+  disabled,
   tooltipPlacement = 'right',
 }: RemixUiCheckboxProps) => {
 

From dad9bb0198010de27c3d2808c7bb003797b51b62 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 13 Jun 2023 15:18:13 +0100
Subject: [PATCH 12/20] add exclamation icon to ssa badge

---
 .../vertical-icons-panel/src/lib/components/Badge.tsx        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx b/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx
index 3408568a59..ece9c3610e 100644
--- a/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx
+++ b/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import React from 'react'
 import { BadgeStatus } from './Icon'
 import { CustomTooltip } from '@remix-ui/helper'
@@ -58,7 +59,9 @@ function Badge ({ badgeStatus }: BadgeProps) {
               className={`${resolveClasses(badgeStatus.key, badgeStatus.type!)}`}
               aria-hidden="true"
             >
-                  { badgeStatus.pluginName && badgeStatus.pluginName === 'solidityStaticAnalysis' ? <span>&nbsp;</span> : badgeStatus.text }
+                  { badgeStatus.pluginName && badgeStatus.pluginName === 'solidityStaticAnalysis' ? badgeStatus.type === 'warning' || badgeStatus.type === 'error' ? <span>
+                    <i className="far fa-exclamation-triangle"></i></span>
+                    : <span>:nbsp;</span> : badgeStatus.text }
             </i>
           // </CustomTooltip>
         ) : null

From 5747ae5945c3fc11e035ce3e94c639f407696448 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 13 Jun 2023 16:50:23 +0100
Subject: [PATCH 13/20] change the text of tooltip for Remix and Linter

---
 .../static-analyser/src/lib/remix-ui-static-analyser.tsx   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 30c2bd556a..e2e0e738fc 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -623,7 +623,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
         <RemixUiCheckbox
             id="checkAllEntries"
             inputType="checkbox"
-            title="Remix analysis is a basic analysis tool for Remix Ide."
+            title="Remix analysis runs a basic analysis."
             checked={Object.values(groupedModules).map((value: any) => {
               return (value.map(x => {
                 return x._index.toString()
@@ -641,12 +641,12 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
           <RemixUiCheckbox
             id="solhintstaticanalysis"
             inputType="checkbox"
-            title="Run SolHint static analysis."
+            title="Linter uses SolHint static analysis."
             onClick={handleLinterEnabled}
             checked={solhintEnabled }
             label="Linter"
             onChange={() => {}}
-            tooltipPlacement={'top-start'}
+            tooltipPlacement={'bottom-start'}
             optionalClassName="mr-3"
           />
 
@@ -656,6 +656,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
             onClick={handleSlitherEnabled}
             checked={showSlither && slitherEnabled}
             disabled={slitherEnabled === false}
+            tooltipPlacement="bottom-start"
             label="Slither"
             onChange={() => {}}
             optionalClassName="mr-3"

From 9b30843e686177371148b822d3e51a19a4ec10ea Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 13 Jun 2023 21:45:45 +0100
Subject: [PATCH 14/20] finished fixes from liana and rob

---
 .../src/lib/components/BasicTitle.tsx         |   4 +-
 .../src/lib/remix-ui-static-analyser.tsx      | 110 +++++++++---------
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx b/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
index 600d629ffd..51a539418d 100644
--- a/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/components/BasicTitle.tsx
@@ -32,8 +32,8 @@ export function calculateWarningStateEntries(entries: [string, any][]) {
 export function BasicTitle(props: BasicTitleProps) {
 
   return (
-    <span>Remix{props.warningStateEntries.length > 0 ?   !props.hideWarnings ? <i data-id="StaticAnalysisErrorCount" className="badge badge-info rounded-circle ml-1">{calculateWarningStateEntries(props.warningStateEntries).length}</i>: (
-      <i className="badge badge-info rounded-circle ml-1">
+    <span>Remix{props.warningStateEntries.length > 0 ?   !props.hideWarnings ? <i data-id="StaticAnalysisErrorCount" className={`badge ${calculateWarningStateEntries(props.warningStateEntries).length > 0 ? 'badge-warning' : 'badge-danger'} rounded-circle ml-1 text-center`}>{calculateWarningStateEntries(props.warningStateEntries).length}</i>: (
+      <i className="badge badge-warning rounded-circle ml-1 text-center">
         {
           calculateWarningStateEntries(props.warningStateEntries).errors.length
         }
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index e2e0e738fc..1f6efe95f6 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -388,32 +388,31 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                               : "alert alert-danger"
                           }`}
                           style={{ cursor: "pointer" }}
-                        >
-                          <div
-                            onClick={async () => {
-                              await props.analysisModule.call(
-                                "editor",
-                                "discardHighlight"
-                              );
-                              await props.analysisModule.call(
-                                "editor",
-                                "highlight",
-                                {
-                                  end: {
-                                    line: hint.line,
-                                    column: hint.column + 1,
-                                  },
-                                  start: {
-                                    line: hint.line,
-                                    column: hint.column,
-                                  },
+                          onClick={async () => {
+                            await props.analysisModule.call(
+                              "editor",
+                              "discardHighlight"
+                            )
+                            await props.analysisModule.call(
+                              "editor",
+                              "highlight",
+                              {
+                                end: {
+                                  line: hint.line,
+                                  column: hint.column + 1,
                                 },
-                                state.file,
-                                "",
-                                { focus: true }
-                              );
-                            }}
-                          >
+                                start: {
+                                  line: hint.line,
+                                  column: hint.column,
+                                },
+                              },
+                              state.file,
+                              "",
+                              { focus: true }
+                            );
+                          }}
+                        >
+                          <div>
                             <span className="text-wrap">
                               {hint.formattedMessage}
                             </span>
@@ -428,32 +427,31 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                           key={index}
                           className="alert alert-danger"
                           style={{ cursor: "pointer" }}
-                        >
-                          <div
-                            onClick={async () => {
-                              await props.analysisModule.call(
-                                "editor",
-                                "discardHighlight"
-                              );
-                              await props.analysisModule.call(
-                                "editor",
-                                "highlight",
-                                {
-                                  end: {
-                                    line: hint.line,
-                                    column: hint.column + 1,
-                                  },
-                                  start: {
-                                    line: hint.line,
-                                    column: hint.column,
-                                  },
+                          onClick={async () => {
+                            await props.analysisModule.call(
+                              "editor",
+                              "discardHighlight"
+                            );
+                            await props.analysisModule.call(
+                              "editor",
+                              "highlight",
+                              {
+                                end: {
+                                  line: hint.line,
+                                  column: hint.column + 1,
                                 },
-                                state.file,
-                                "",
-                                { focus: true }
-                              );
-                            }}
-                          >
+                                start: {
+                                  line: hint.line,
+                                  column: hint.column,
+                                },
+                              },
+                              state.file,
+                              "",
+                              { focus: true }
+                            );
+                          }}
+                        >
+                          <div>
                             <span className="text-wrap">
                               {hint.formattedMessage}
                             </span>
@@ -474,11 +472,13 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
           Linter
           {hints.length > 0 ? (
             hideWarnings ? (
-              <i className="badge badge-info rounded-circle ml-1">
+              <i className={`badge ${hints.filter(x => x.type === 'error').length > 0
+                ? `badge-danger` : 'badge-warning'} rounded-circle ml-1 text-center`}>
                 {hintErrors.length}
               </i>
             ) : (
-              <i className="badge badge-info rounded-circle ml-1">
+              <i className={`badge ${hints.filter(x => x.type === 'error').length > 0
+              ? `badge-danger` : 'badge-warning'} rounded-circle ml-1 text-center`}>
                 {hints.length}
               </i>
             )
@@ -536,11 +536,11 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
           Slither
           {slitherWarnings.length > 0 ? (
             hideWarnings ? (
-              <i className="badge badge-info rounded-circle ml-1">
+              <i className="badge badge-warning rounded-circle ml-1">
                 {slitherErrors.length}
               </i>
             ) : (
-              <i className="badge badge-info rounded-circle ml-1">
+              <i className={`badge ${slitherErrors.length > 0 ? `badge-danger` : 'badge-warning'} rounded-circle ml-1 text-center`}>
                 {slitherWarnings.length}
               </i>
             )
@@ -588,7 +588,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                       data-id={`staticAnalysisModule${warning.warningModuleName}${index}`}
                       id={`staticAnalysisModule${warning.warningModuleName}${index}`}
                       key={index}
-                    >
+                      >
                       <ErrorRenderer
                         name={`staticAnalysisModule${warning.warningModuleName}${index}`}
                         message={warning.msg}

From c6b1d8067dbd57e8300c377000875af7e985f81f Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 13 Jun 2023 23:32:06 +0100
Subject: [PATCH 15/20] fix overflow of text in alert card with warnings

---
 libs/remix-ui/static-analyser/src/lib/ErrorRenderer.tsx    | 4 ++--
 .../static-analyser/src/lib/remix-ui-static-analyser.tsx   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/ErrorRenderer.tsx b/libs/remix-ui/static-analyser/src/lib/ErrorRenderer.tsx
index 6d31911895..5d008958ec 100644
--- a/libs/remix-ui/static-analyser/src/lib/ErrorRenderer.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/ErrorRenderer.tsx
@@ -47,9 +47,9 @@ const ErrorRenderer = ({ message, opt, editor, name }: ErrorRendererProps) => {
   return (
     <div>
       <div className={`sol ${opt.type} ${classList}`}>
-        <span className='d-flex flex-column' data-id={`${name}Button`} onClick={async () => await handlePointToErrorOnClick(opt.location, opt.fileName)}>
+        <span className='d-flex flex-column' data-id={`${name}Button`} onClick={async () => await handlePointToErrorOnClick(opt.location, opt.fileName)} style={{ cursor: "pointer", overflow: 'hidden', textOverflow: 'ellipsis' }}>
           <span className='h6 font-weight-bold'>{opt.name}</span>
-          { opt.item.warning }
+          <span>{ opt.item.warning }</span>
           {opt.item.more
             ? <span><a href={opt.item.more} target='_blank'>more</a></span>
             : <span> </span>
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 1f6efe95f6..d41ae55d22 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -387,7 +387,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                               ? "alert alert-warning"
                               : "alert alert-danger"
                           }`}
-                          style={{ cursor: "pointer" }}
+                          style={{ cursor: "pointer", overflow: 'hidden', textOverflow: 'ellipsis' }}
                           onClick={async () => {
                             await props.analysisModule.call(
                               "editor",
@@ -426,7 +426,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                         <div
                           key={index}
                           className="alert alert-danger"
-                          style={{ cursor: "pointer" }}
+                          style={{ cursor: "pointer", overflow: 'hidden', textOverflow: 'ellipsis' }}
                           onClick={async () => {
                             await props.analysisModule.call(
                               "editor",
@@ -452,9 +452,10 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                           }}
                         >
                           <div>
-                            <span className="text-wrap">
+                            <span className="text-wrap" style={{ overflow: 'hidden', textOverflow: 'ellipsis' }}>
                               {hint.formattedMessage}
                             </span>
+                            <br />
                             <span>{hint.type}</span>
                             <br />
                             <span>{`${hint.column}:${hint.line}`}</span>

From ddbac184427619d90315526180361f6b8e871e50 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 14 Jun 2023 10:40:11 +0100
Subject: [PATCH 16/20] finish final changes requested by @ryestew

---
 .../src/lib/actions/staticAnalysisActions.ts  |  5 ++--
 .../src/lib/remix-ui-static-analyser.tsx      | 26 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts b/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts
index 30989e5b39..aa9ce0e3bb 100644
--- a/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts
+++ b/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts
@@ -44,8 +44,8 @@ export const compilation = (analysisModule: AnalysisTab,
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function run (lastCompilationResult, lastCompilationSource, currentFile: string, state: RemixUiStaticAnalyserState, props: RemixUiStaticAnalyserProps, isSupportedVersion, showSlither, categoryIndex: number[], groupedModules, runner, _paq, message, showWarnings, allWarnings: React.RefObject<any>, warningContainer: React.RefObject<any>, calculateWarningStateEntries: (e:[string, any][]) => {length: number, errors: any[] }, warningState, setHints: React.Dispatch<React.SetStateAction<SolHintReport[]>>, hints: SolHintReport[], setSlitherWarnings: React.Dispatch<React.SetStateAction<any[]>>, setSsaWarnings: React.Dispatch<React.SetStateAction<any[]>>,
-slitherEnabled: boolean) {
-
+slitherEnabled: boolean, setStartAnalysis: React.Dispatch<React.SetStateAction<boolean>>) {
+  setStartAnalysis(true)
   if (!isSupportedVersion) return
   if (state.data !== null) {
     if (lastCompilationResult && (categoryIndex.length > 0 || showSlither)) {
@@ -199,6 +199,7 @@ slitherEnabled: boolean) {
           showWarnings(warningMessage, 'warningModuleName')
         }
       } else showWarnings(warningMessage, 'warningModuleName')
+      setStartAnalysis(false)
     } else {
       if (categoryIndex.length) {
         warningContainer.current.innerText = 'No compiled AST available'
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index d41ae55d22..3ef8d5ed7b 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -72,6 +72,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   const [solhintEnabled, setSolhintEnabled] = useState(true) // assuming that solhint is always enabled
   const [showSlither, setShowSlither] = useState(false)
   const [slitherEnabled, setSlitherEnabled] = useState(false)
+  const [startAnalysis, setStartAnalysis] = useState(false)
   const [isSupportedVersion, setIsSupportedVersion] = useState(false)
   let [showLibsWarning, setShowLibsWarning] = useState(false) // eslint-disable-line prefer-const
   const [categoryIndex, setCategoryIndex] = useState(groupedModuleIndex(groupedModules))
@@ -112,7 +113,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   useEffect(() => {
     setWarningState({})
     const runAnalysis = async () => {
-      await run(state.data, state.source, state.file, state, props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq, message, showWarnings, allWarnings, warningContainer,calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled)
+      await run(state.data, state.source, state.file, state, props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq, message, showWarnings, allWarnings, warningContainer,calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled, setStartAnalysis)
     }
     props.event.trigger('staticAnaysisWarning', [])
     // if (basicEnabled) {
@@ -465,7 +466,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                 </Fragment>
               </div>
             </div>
-          ) : <span className="display-6">No Results.</span>}
+          ) : state.data && state.file.length > 0 && state.source && startAnalysis && hints.length > 0 ? <span className="ml-4 spinner-grow-sm d-flex justify-content-center">Loading...</span> : <span className="display-6 text-center">Nothing to report</span>}
         </>
       ),
       title: (
@@ -526,7 +527,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                 ))}
               </div>
             </div>
-          ) : <span className="display-6">No Results.</span>}
+          ) : state.data && state.file.length > 0 && state.source && startAnalysis && Object.entries(warningState).length > 0 ? <span className="ml-4 spinner-grow-sm d-flex justify-content-center">Loading...</span> : <span className="display-6 text-center">Nothing to report</span>}
         </>
       ),
     },
@@ -602,7 +603,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                 </Fragment>
               </div>
             </div>
-          ) : <span className="display-6">No Result</span>}
+          ) : state.data && state.file.length > 0 && state.source && startAnalysis && slitherWarnings.length > 0 ? <span className="ml-4 spinner-grow-sm d-flex justify-content-center">Loading...</span> : <span className="display-6 text-center">Nothing to report</span>}
         </>
       ),
     },
@@ -642,7 +643,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
           <RemixUiCheckbox
             id="solhintstaticanalysis"
             inputType="checkbox"
-            title="Linter uses SolHint static analysis."
+            title="Linter runs SolHint static analysis."
             onClick={handleLinterEnabled}
             checked={solhintEnabled }
             label="Linter"
@@ -661,27 +662,26 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
             label="Slither"
             onChange={() => {}}
             optionalClassName="mr-3"
-            title={slitherEnabled ? "Run Slither static analysis." : "To run Slither analysis, Remix IDE must be connected to your local filesystem with Remixd."}
+            title={slitherEnabled ? "Slither runs Slither static analysis." : "To run Slither analysis, Remix IDE must be connected to your local filesystem with Remixd."}
           />
         </div>
           {state.data && state.file.length > 0 && state.source ? <Button
               buttonText={`Analyse ${state.file}`}
               classList="btn btn-sm btn-primary btn-block"
               onClick={async () => await run(state.data, state.source, state.file, state , props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq,
-                message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled)}
+                message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled, setStartAnalysis)}
               disabled={(state.data === null || !isSupportedVersion)  || (!solhintEnabled && !basicEnabled) }
           /> : <Button
               buttonText={`Analyze ${state.file}`}
               title={`${runButtonTitle}`}
               classList="btn btn-sm btn-primary btn-block"
               onClick={async () => await run(state.data, state.source, state.file, state , props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq,
-                message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled)}
+                message, showWarnings, allWarnings, warningContainer, calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled, setStartAnalysis)}
               disabled={(state.data === null || !isSupportedVersion)  || (!solhintEnabled && !basicEnabled) }
           />}
           {state && state.data !== null && state.source !== null && state.file.length > 0 ? (<div className="d-flex border-top flex-column">
-            <div className={`mt-4 p-2 d-flex ${slitherWarnings.length > 0 || hints.length > 0 || Object.entries(warningState).length > 0 ? 'border-top' : ''} flex-column`}>
-              {slitherWarnings.length > 0 || hints.length > 0 || Object.entries(warningState).length > 0 ?  (
-              <>
+            {slitherWarnings.length > 0 || hints.length > 0 || Object.entries(warningState).length > 0 ?  (
+              <div className={`mt-4 p-2 d-flex ${slitherWarnings.length > 0 || hints.length > 0 || Object.entries(warningState).length > 0 ? 'border-top' : ''} flex-column`}>
                 <span>Last results for:</span>
                   <span
                     className="text-break break-word word-break font-weight-bold"
@@ -689,9 +689,9 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                   >
                     {state.file}
                   </span>
-              </>) : null}
             </div>
-            <div className="border-top mt-3 pt-2 mb-2" id="staticanalysisresult">
+            ) : null}
+            <div className="border-top mt-2 pt-2 mb-2" id="staticanalysisresult">
               <RemixUiCheckbox
                 id="showLibWarnings"
                 name="showLibWarnings"

From 7f09314e45c237fc485734b86abbec6e55f0c366 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 14 Jun 2023 11:54:35 +0100
Subject: [PATCH 17/20] add effect to autocheck for already established remixd
 session

---
 .../static-analyser/src/lib/remix-ui-static-analyser.tsx      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 3ef8d5ed7b..d1c07e19d7 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -130,6 +130,10 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
     props.analysisModule.call('solidity', 'getCompilerState').then((compilerState) => setDisableForRun(compilerState.currentVersion))
   }, [])
 
+  useEffect(() => {
+    
+  }, [])
+
   useEffect(() => {
     props.analysisModule.on('filePanel', 'setWorkspace', (currentWorkspace) => {
       // Reset warning state

From e73b673a2bb4571a0fd2a0f8a9424f1e5e692ecd Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 14 Jun 2023 12:18:47 +0100
Subject: [PATCH 18/20] flesh out detection of remixd session to enable slither

---
 .../src/lib/remix-ui-static-analyser.tsx              | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index d1c07e19d7..79b30b6923 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -131,8 +131,15 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   }, [])
 
   useEffect(() => {
-    
-  }, [])
+    const checkRemixdActive = async () => {
+      const remixdActive = await props.analysisModule.call('manager', 'isActive', 'remixd')
+      if (remixdActive) {
+        setSlitherEnabled(true)
+        setShowSlither(true)
+      }
+    }
+    checkRemixdActive()
+  }, [props])
 
   useEffect(() => {
     props.analysisModule.on('filePanel', 'setWorkspace', (currentWorkspace) => {

From 2f5e762d99e0016f835814f6b1ed89d4dbcf7346 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 14 Jun 2023 16:52:23 +0100
Subject: [PATCH 19/20] clean up comments, console logs and count errorsby
 triggering staticAnalysiswarning

---
 apps/remix-ide/src/app/tabs/analysis-tab.js   |  3 +-
 apps/solhint/src/app/SolhintPluginClient.ts   | 13 ++---
 .../src/lib/actions/staticAnalysisActions.ts  | 14 ++---
 .../src/lib/remix-ui-static-analyser.tsx      | 52 ++++++++++++++++---
 .../src/lib/components/Badge.tsx              | 12 ++---
 5 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/analysis-tab.js b/apps/remix-ide/src/app/tabs/analysis-tab.js
index dc12651991..e5d9086253 100644
--- a/apps/remix-ide/src/app/tabs/analysis-tab.js
+++ b/apps/remix-ide/src/app/tabs/analysis-tab.js
@@ -30,6 +30,7 @@ class AnalysisTab extends ViewPlugin {
     this.registry = Registry.getInstance()
     this.element = document.createElement('div')
     this.element.setAttribute('id', 'staticAnalyserView')
+    this.errorCount = 0
     this._components = {}
     this._components.registry = this.registry
     this._deps = {
@@ -57,7 +58,7 @@ class AnalysisTab extends ViewPlugin {
       }
     })
   }
-  
+
   setDispatch (dispatch) {
     this.dispatch = dispatch
     this.renderComponent()
diff --git a/apps/solhint/src/app/SolhintPluginClient.ts b/apps/solhint/src/app/SolhintPluginClient.ts
index b38d6bbdc8..8cfef7fbe2 100644
--- a/apps/solhint/src/app/SolhintPluginClient.ts
+++ b/apps/solhint/src/app/SolhintPluginClient.ts
@@ -11,7 +11,7 @@ import deprecations from 'solhint/lib/rules/deprecations'
 import miscellaneous from 'solhint/lib/rules/miscellaneous'
 import { customAction } from '@remixproject/plugin-api'
 
-type Report = { 
+type Report = {
   line: number,
   column: number,
   severity: string,
@@ -53,7 +53,7 @@ export class SolHint extends PluginClient {
     this.triggerLinter = false
   }
   /**
-   * method to handle context menu action in file explorer for 
+   * method to handle context menu action in file explorer for
    * solhint plugin
    * @param action interface CustomAction
    */
@@ -65,7 +65,6 @@ export class SolHint extends PluginClient {
 
   async lintContract(file: string) {
     const hints = await this.lint(file)
-    console.log({ hints })
     this.emit('lintingFinished', hints)
   }
 
@@ -92,6 +91,8 @@ export class SolHint extends PluginClient {
         line: report.line - 1
       }
     })
+
+    this.emit('lintingFinished', hints)
     return hints
   }
 
@@ -99,7 +100,7 @@ export class SolHint extends PluginClient {
     2: 'error',
     3: 'warning'
   }
-  
+
   rules = {
     'solhint:recommended': () => {
       const enabledRules = {}
@@ -129,7 +130,7 @@ export class SolHint extends PluginClient {
       return enabledRules
     }
   }
-  
+
   coreRules() {
     return [
       ...bestPractises(),
@@ -140,6 +141,6 @@ export class SolHint extends PluginClient {
       ...security()
     ]
   }
-  
+
 }
 
diff --git a/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts b/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts
index aa9ce0e3bb..bf2bdfb8f0 100644
--- a/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts
+++ b/libs/remix-ui/static-analyser/src/lib/actions/staticAnalysisActions.ts
@@ -46,6 +46,9 @@ export const compilation = (analysisModule: AnalysisTab,
 export async function run (lastCompilationResult, lastCompilationSource, currentFile: string, state: RemixUiStaticAnalyserState, props: RemixUiStaticAnalyserProps, isSupportedVersion, showSlither, categoryIndex: number[], groupedModules, runner, _paq, message, showWarnings, allWarnings: React.RefObject<any>, warningContainer: React.RefObject<any>, calculateWarningStateEntries: (e:[string, any][]) => {length: number, errors: any[] }, warningState, setHints: React.Dispatch<React.SetStateAction<SolHintReport[]>>, hints: SolHintReport[], setSlitherWarnings: React.Dispatch<React.SetStateAction<any[]>>, setSsaWarnings: React.Dispatch<React.SetStateAction<any[]>>,
 slitherEnabled: boolean, setStartAnalysis: React.Dispatch<React.SetStateAction<boolean>>) {
   setStartAnalysis(true)
+  setHints([])
+  setSsaWarnings([])
+  setSlitherWarnings([])
   if (!isSupportedVersion) return
   if (state.data !== null) {
     if (lastCompilationResult && (categoryIndex.length > 0 || showSlither)) {
@@ -119,11 +122,12 @@ slitherEnabled: boolean, setStartAnalysis: React.Dispatch<React.SetStateAction<b
           }
           warningErrors.push(options)
           warningMessage.push({ msg, options, hasWarning: true, warningModuleName: moduleName })
-          setSsaWarnings(warningErrors)
+          setSsaWarnings(warningMessage)
         }
       }
       // Slither Analysis
       if (showSlither && slitherEnabled) {
+        setSlitherWarnings([])
         try {
           const compilerState = await props.analysisModule.call('solidity', 'getCompilerState')
           const { currentVersion, optimize, evmVersion } = compilerState
@@ -171,7 +175,7 @@ slitherEnabled: boolean, setStartAnalysis: React.Dispatch<React.SetStateAction<b
               }
               const msg = message(item.title, item.description, item.more ?? '', fileName, locationString)
               const options = {
-                type: item.sourceMap[0].type,
+                type: item.sourceMap && item.sourceMap.length > 0 ? item.sourceMap[0].type : '',
                 useSpan: true,
                 errFile: fileName,
                 fileName,
@@ -185,11 +189,9 @@ slitherEnabled: boolean, setStartAnalysis: React.Dispatch<React.SetStateAction<b
                 location: location
               }
 
-              const slitherwarnings = []
               setSlitherWarnings((prev) => {
-                slitherwarnings.push(...prev)
-                slitherwarnings.push({ msg, options, hasWarning: true, warningModuleName: 'Slither Analysis' })
-                return slitherwarnings
+                prev.push({ msg, options, hasWarning: true, warningModuleName: 'Slither Analysis' })
+                return prev
               })
             }
             showWarnings(warningMessage, 'warningModuleName')
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 79b30b6923..0769df4f60 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -223,6 +223,12 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
     setWarningState(newWarningState)
   }
 
+  useEffect(() => {
+    if(hints.length > 0) {
+      props.event.trigger('staticAnaysisWarning', [hints.length])
+    }
+  },[hints.length, state])
+
   const showWarnings = (warningMessage, groupByKey) => {
     const resultArray = []
     warningMessage.map(x => {
@@ -379,7 +385,15 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   }
 
   const hintErrors = hints.filter(hint => hint.type === 'error')
-  const slitherErrors = slitherWarnings.filter(slitherError => slitherError.options.type === 'error')
+  const noLibSlitherWarnings = slitherWarnings.filter(w => !w.options.isLibrary)
+  const slitherErrors = noLibSlitherWarnings.filter(slitherError => slitherError.options.type === 'error')
+  // const noLibsRemixWarnings = ssaWarnings.filter(w => !w.options.isLibrary)
+  // const groupedWarnings = ssaWarnings.reduce((resultingObject, warning) => {
+  //   if (!resultingObject[warning.warningModuleName]) resultingObject[warning.warningModuleName] = []
+  //   resultingObject[warning.warningModuleName].push(warning)
+  //   return resultingObject
+  // }, {})
+  // console.log({ slitherWarnings, noLibsRemixWarnings, ssaWarnings, groupedWarnings })
 
   const tabKeys = [
     {
@@ -514,9 +528,10 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               <div className="mb-4 pt-2">
                 {Object.entries(warningState).map((element, index) => (
                   <div key={index}>
-                    {element[1]["map"](
+                    { !hideWarnings && element[1]['length'] > 0 ? <span className="text-dark h6">{element[0]}</span> : null}
+                    {!hideWarnings ? element[1]["map"](
                       (x,i) => // eslint-disable-line dot-notation
-                        x.hasWarning && !hideWarnings
+                        x.hasWarning
                         ? ( // eslint-disable-next-line  dot-notation
                           <div
                             data-id={`staticAnalysisModule${x.warningModuleName}${i}`}
@@ -532,7 +547,24 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                             />
                           </div>
                         ) : null
-                    )}
+                    ) : element[1]["map"](
+                      (x,i) => // eslint-disable-line dot-notation
+                        !x.hasWarning
+                        ? ( // eslint-disable-next-line  dot-notation
+                          <div
+                            data-id={`staticAnalysisModule${x.warningModuleName}${i}`}
+                            id={`staticAnalysisModule${x.warningModuleName}${i}`}
+                            key={i}
+                          >
+                            <ErrorRenderer
+                              name={`staticAnalysisModule${x.warningModuleName}${i}`}
+                              message={x.msg}
+                              opt={x.options}
+                              warningErrors={x.warningErrors}
+                              editor={props.analysisModule}
+                            />
+                          </div>
+                        ) : null)}
                     {}
                   </div>
                 ))}
@@ -552,9 +584,13 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               <i className="badge badge-warning rounded-circle ml-1">
                 {slitherErrors.length}
               </i>
-            ) : (
+            ) : showLibsWarning === true && hideWarnings === false ? (
+              <i className={`badge ${slitherErrors.length > 0 ? `badge-danger` : 'badge-warning'} rounded-circle ml-1 text-center`}>
+                  {slitherWarnings.length}
+                </i>
+            )  : (
               <i className={`badge ${slitherErrors.length > 0 ? `badge-danger` : 'badge-warning'} rounded-circle ml-1 text-center`}>
-                {slitherWarnings.length}
+                {noLibSlitherWarnings.length}
               </i>
             )
           ) : null}
@@ -567,7 +603,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
               <div className="mb-4 pt-2">
                 <Fragment>
                   {!hideWarnings
-                    ? showLibsWarning ? slitherWarnings.filter(warning => warning.isLibrary).map((warning, index) => (
+                    ? showLibsWarning ? slitherWarnings.map((warning, index) => (
                       <div
                       data-id={`staticAnalysisModule${warning.warningModuleName}${index}`}
                       id={`staticAnalysisModule${warning.warningModuleName}${index}`}
@@ -581,7 +617,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                         editor={props.analysisModule}
                       />
                     </div>
-                      )) : slitherWarnings.map((warning, index) => (
+                      )) : noLibSlitherWarnings.map((warning, index) => (
                       <div
                       data-id={`staticAnalysisModule${warning.warningModuleName}${index}`}
                       id={`staticAnalysisModule${warning.warningModuleName}${index}`}
diff --git a/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx b/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx
index ece9c3610e..1a7d19052d 100644
--- a/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx
+++ b/libs/remix-ui/vertical-icons-panel/src/lib/components/Badge.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import React from 'react'
+import React, { useEffect } from 'react'
 import { BadgeStatus } from './Icon'
 import { CustomTooltip } from '@remix-ui/helper'
 import { FormattedMessage } from 'react-intl'
@@ -49,21 +50,14 @@ function Badge ({ badgeStatus }: BadgeProps) {
     <>
       {
         badgeStatus && checkStatusKeyValue(badgeStatus.key, badgeStatus.type) ? (
-          // <CustomTooltip
-          //   placement={'right'}
-          //   tooltipClasses="text-nowrap"
-          //   tooltipId="verticalItemsbadge"
-          //   tooltipText={badgeStatus.pluginName && badgeStatus.pluginName === 'solidityStaticAnalysis' ? 'There are multiple warnings or errors that might need to be fixed.' :badgeStatus.title}
-          // >
             <i
               className={`${resolveClasses(badgeStatus.key, badgeStatus.type!)}`}
               aria-hidden="true"
             >
                   { badgeStatus.pluginName && badgeStatus.pluginName === 'solidityStaticAnalysis' ? badgeStatus.type === 'warning' || badgeStatus.type === 'error' ? <span>
                     <i className="far fa-exclamation-triangle"></i></span>
-                    : <span>:nbsp;</span> : badgeStatus.text }
+                    : <span>&nbsp;</span> : badgeStatus.text }
             </i>
-          // </CustomTooltip>
         ) : null
       }
     </>

From 9ac9e44f734efae94b6d793e64136f42176cefe7 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 14 Jun 2023 17:12:15 +0100
Subject: [PATCH 20/20] clean up commented out code and dead code as well

---
 apps/remix-ide/src/app/tabs/analysis-tab.js        |  1 -
 .../src/lib/remix-ui-static-analyser.tsx           | 14 --------------
 2 files changed, 15 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/analysis-tab.js b/apps/remix-ide/src/app/tabs/analysis-tab.js
index e5d9086253..a15c15a779 100644
--- a/apps/remix-ide/src/app/tabs/analysis-tab.js
+++ b/apps/remix-ide/src/app/tabs/analysis-tab.js
@@ -30,7 +30,6 @@ class AnalysisTab extends ViewPlugin {
     this.registry = Registry.getInstance()
     this.element = document.createElement('div')
     this.element.setAttribute('id', 'staticAnalyserView')
-    this.errorCount = 0
     this._components = {}
     this._components.registry = this.registry
     this._deps = {
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 0769df4f60..603b87ad08 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -116,13 +116,6 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
       await run(state.data, state.source, state.file, state, props, isSupportedVersion, showSlither, categoryIndex, groupedModules, runner,_paq, message, showWarnings, allWarnings, warningContainer,calculateWarningStateEntries, warningState, setHints, hints, setSlitherWarnings, setSsaWarnings, slitherEnabled, setStartAnalysis)
     }
     props.event.trigger('staticAnaysisWarning', [])
-    // if (basicEnabled) {
-    //   if (state.data !== null) {
-    //     runAnalysis().catch(console.error);
-    //   }
-    // } else {
-    //   props.event.trigger('staticAnaysisWarning', [])
-    // }
     return () => { }
   }, [state])
 
@@ -387,13 +380,6 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
   const hintErrors = hints.filter(hint => hint.type === 'error')
   const noLibSlitherWarnings = slitherWarnings.filter(w => !w.options.isLibrary)
   const slitherErrors = noLibSlitherWarnings.filter(slitherError => slitherError.options.type === 'error')
-  // const noLibsRemixWarnings = ssaWarnings.filter(w => !w.options.isLibrary)
-  // const groupedWarnings = ssaWarnings.reduce((resultingObject, warning) => {
-  //   if (!resultingObject[warning.warningModuleName]) resultingObject[warning.warningModuleName] = []
-  //   resultingObject[warning.warningModuleName].push(warning)
-  //   return resultingObject
-  // }, {})
-  // console.log({ slitherWarnings, noLibsRemixWarnings, ssaWarnings, groupedWarnings })
 
   const tabKeys = [
     {