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] 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}