From aa942660415a15b0d611322cef0b87ec91825ce9 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 30 Jun 2023 11:46:47 +0100
Subject: [PATCH 1/9] add div to capture tooltip. mute pointerevents

---
 .../src/lib/Button/StaticAnalyserButton.tsx   | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

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 136846bb96..b0f967e10d 100644
--- a/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
@@ -1,5 +1,6 @@
 import { CustomTooltip } from '@remix-ui/helper'
 import React from 'react'  //eslint-disable-line
+import '../ssa.css'
 
 interface StaticAnalyserButtonProps {
   onClick: (event) => void
@@ -21,7 +22,12 @@ const StaticAnalyserButton = ({
   classList.length === 0 && disabled ? `${defaultStyle} disabled` : classList.length > 0 ? `${classList}` : defaultStyle
 
   const buttonWithoutTooltip = () => (
-    <button id="staticAnalysisRunBtn" className={newclassList} disabled={disabled} onClick={onClick}>
+    <button
+      id="staticAnalysisRunBtn"
+      className={newclassList}
+      disabled={disabled}
+      onClick={onClick}
+    >
       <span className="pl-3 pr-4">
         {buttonText}
       </span>
@@ -29,18 +35,27 @@ const StaticAnalyserButton = ({
   )
 
   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>
+      <div id="staticAnalysisWrapper" className={newclassList}>
+        <button
+          id="staticAnalysisRunBtn"
+          className={newclassList}
+          disabled={disabled}
+          onClick={onClick}
+          style={{ pointerEvents: 'none', color: 'white' }}
+        >
+          <span className="pl-3 pr-4">
+            {buttonText}
+          </span>
+          </button>
+      </div>
     </CustomTooltip>
-  </button>)
+  )
 
   return (
       title && title.length > 0 ? buttonWithTooltip() : buttonWithoutTooltip()

From 3de93f2a4eba1d79d7de24dc482c447087d398a7 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 30 Jun 2023 11:48:16 +0100
Subject: [PATCH 2/9] increase specificity of css selector for e2e

---
 apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
index 446ea13622..428e50e9b6 100644
--- a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
+++ b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
@@ -40,7 +40,7 @@ module.exports = {
     .click('*[id="compileBtn"]')
     .pause(10000)
     .clickLaunchIcon('solidityStaticAnalysis')
-    .click('*[id="staticAnalysisRunBtn"]')
+    .click('div#staticAnalysisWrapper > *[id="staticAnalysisRunBtn"]')
     .waitForElementPresent('#staticanalysisresult .warning', 5000)
     // Check warning count
     .click('*[data-rb-event-key="remix"]')

From 6827fa8f396b4bc6fed6727c31d684b43c97d029 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 30 Jun 2023 11:48:48 +0100
Subject: [PATCH 3/9] remove redundant import

---
 .../static-analyser/src/lib/Button/StaticAnalyserButton.tsx      | 1 -
 1 file changed, 1 deletion(-)

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 b0f967e10d..f72366b7d3 100644
--- a/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
@@ -1,6 +1,5 @@
 import { CustomTooltip } from '@remix-ui/helper'
 import React from 'react'  //eslint-disable-line
-import '../ssa.css'
 
 interface StaticAnalyserButtonProps {
   onClick: (event) => void

From ed0e12d123abf10ec93444449c37d67c62a0c2a9 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 30 Jun 2023 11:52:30 +0100
Subject: [PATCH 4/9] remove extra padding from wrapping div

---
 .../static-analyser/src/lib/Button/StaticAnalyserButton.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 f72366b7d3..2e34884fe2 100644
--- a/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
@@ -16,7 +16,7 @@ const StaticAnalyserButton = ({
   title,
   classList
 }: StaticAnalyserButtonProps) => {
-  const defaultStyle = "btn btn-sm w-25 btn-primary"
+  const defaultStyle = "btn btn-sm btn-block btn-primary"
   const newclassList = disabled && classList.length > 0 ? `${classList} disabled` :
   classList.length === 0 && disabled ? `${defaultStyle} disabled` : classList.length > 0 ? `${classList}` : defaultStyle
 
@@ -40,7 +40,7 @@ const StaticAnalyserButton = ({
       tooltipClasses="text-nowrap"
       tooltipText={title}
     >
-      <div id="staticAnalysisWrapper" className={newclassList}>
+      <div id="staticAnalysisWrapper" className={`${newclassList} p-0`}>
         <button
           id="staticAnalysisRunBtn"
           className={newclassList}

From e1ed6772d24c43c2b6b330c1f6f78b6e681a6998 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 30 Jun 2023 14:32:08 +0100
Subject: [PATCH 5/9] fix e2e

---
 apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
index 428e50e9b6..d32db0c5d1 100644
--- a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
+++ b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
@@ -41,7 +41,7 @@ module.exports = {
     .pause(10000)
     .clickLaunchIcon('solidityStaticAnalysis')
     .click('div#staticAnalysisWrapper > *[id="staticAnalysisRunBtn"]')
-    .waitForElementPresent('#staticanalysisresult .warning', 5000)
+    .waitForElementPresent('div#staticanalysisresult .warning', 5000)
     // Check warning count
     .click('*[data-rb-event-key="remix"]')
     .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount"]', '1')

From 2213d55db2001fe6f17bc1c42b1b6e2bea659c2e Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Fri, 30 Jun 2023 14:45:17 +0100
Subject: [PATCH 6/9] fix not found in e2e

---
 apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
index d32db0c5d1..37f1a87ef2 100644
--- a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
+++ b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
@@ -41,7 +41,10 @@ module.exports = {
     .pause(10000)
     .clickLaunchIcon('solidityStaticAnalysis')
     .click('div#staticAnalysisWrapper > *[id="staticAnalysisRunBtn"]')
-    .waitForElementPresent('div#staticanalysisresult .warning', 5000)
+    .useXpath()
+    // .waitForElementPresent('div#staticanalysisresult .warning', 5000)
+    .waitForElementPresent('//*[@id="staticanalysisresult"]', 5000)
+    .useCss()
     // Check warning count
     .click('*[data-rb-event-key="remix"]')
     .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount"]', '1')

From 3ad359d73c11eed46ceacd90b1cd2c5c2c9ec421 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 5 Jul 2023 10:43:04 +0100
Subject: [PATCH 7/9] replace css selector with xpath in e2e

---
 .../src/tests/staticAnalysis.test.ts          | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
index 37f1a87ef2..41c26c6a78 100644
--- a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
+++ b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
@@ -33,36 +33,36 @@ module.exports = {
   },
   'run analysis and filter results': function (browser: NightwatchBrowser) {
     browser
-    .clickLaunchIcon('filePanel')
-    .click('*[data-id="treeViewLitreeViewItemcontracts"]')
-    .click('*[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]')
-    .clickLaunchIcon('solidity')
-    .click('*[id="compileBtn"]')
-    .pause(10000)
-    .clickLaunchIcon('solidityStaticAnalysis')
-    .click('div#staticAnalysisWrapper > *[id="staticAnalysisRunBtn"]')
-    .useXpath()
-    // .waitForElementPresent('div#staticanalysisresult .warning', 5000)
-    .waitForElementPresent('//*[@id="staticanalysisresult"]', 5000)
-    .useCss()
-    // Check warning count
-    .click('*[data-rb-event-key="remix"]')
-    .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount"]', '1')
-    .verify.elementPresent('input[name="showLibWarnings"]')
-    .verify.not.elementPresent('input[name="showLibWarnings"]:checked')
-    .verify.elementPresent('label[id="headingshowLibWarnings"]')
-    .click('label[id="headingshowLibWarnings"]')
-    .pause(1000)
-    .click('*[data-rb-event-key="remix"]')
-    .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '382')
-    .click('label[id="headingshowLibWarnings"]')
-    .pause(1000)
-    .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '1')
-    .end()
+      .clickLaunchIcon('filePanel')
+      .click('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .click('*[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]')
+      .clickLaunchIcon('solidity')
+      .click('*[id="compileBtn"]')
+      .pause(10000)
+      .clickLaunchIcon('solidityStaticAnalysis')
+      .useXpath()
+      .click('//*[@id="staticAnalysisRunBtn"]')
+      // .waitForElementPresent('div#staticanalysisresult .warning', 5000)
+      .waitForElementPresent('//*[@id="staticanalysisresult"]', 5000)
+      .useCss()
+      // Check warning count
+      .click('*[data-rb-event-key="remix"]')
+      .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount"]', '1')
+      .verify.elementPresent('input[name="showLibWarnings"]')
+      .verify.not.elementPresent('input[name="showLibWarnings"]:checked')
+      .verify.elementPresent('label[id="headingshowLibWarnings"]')
+      .click('label[id="headingshowLibWarnings"]')
+      .pause(1000)
+      .click('*[data-rb-event-key="remix"]')
+      .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '382')
+      .click('label[id="headingshowLibWarnings"]')
+      .pause(1000)
+      .assert.containsText('span#ssaRemixtab > *[data-id="RemixStaticAnalysisErrorCount', '1')
+      .end()
   }
 }
 
-function runTests (browser: NightwatchBrowser) {
+function runTests(browser: NightwatchBrowser) {
   browser
     .waitForElementVisible('#icon-panel', 10000)
     .clickLaunchIcon('solidity')
@@ -75,13 +75,13 @@ function runTests (browser: NightwatchBrowser) {
         'Fallback function of contract TooMuchGas requires too much gas',
         'TooMuchGas.() : Variables have very similar names "test" and "test1".',
         'TooMuchGas.() : Variables have very similar names "test" and "test1".'],
-      '#staticanalysisresult .warning',
-      browser
+        '#staticanalysisresult .warning',
+        browser
       )
     })
 }
 
-function listSelectorContains (textsToFind: string[], selector: string, browser: NightwatchBrowser) {
+function listSelectorContains(textsToFind: string[], selector: string, browser: NightwatchBrowser) {
   browser.execute(function (selector) {
     const items = document.querySelectorAll(selector)
     const ret = []

From c2dabfdc06ddb0db94646b5c68fa249b6e32452a Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 5 Jul 2023 11:54:00 +0100
Subject: [PATCH 8/9] fix style issues from @LianaHus

---
 apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts           | 4 ++--
 .../static-analyser/src/lib/Button/StaticAnalyserButton.tsx   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
index 41c26c6a78..c455d1ec32 100644
--- a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
+++ b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
@@ -62,7 +62,7 @@ module.exports = {
   }
 }
 
-function runTests(browser: NightwatchBrowser) {
+function runTests (browser: NightwatchBrowser) {
   browser
     .waitForElementVisible('#icon-panel', 10000)
     .clickLaunchIcon('solidity')
@@ -81,7 +81,7 @@ function runTests(browser: NightwatchBrowser) {
     })
 }
 
-function listSelectorContains(textsToFind: string[], selector: string, browser: NightwatchBrowser) {
+function listSelectorContains (textsToFind: string[], selector: string, browser: NightwatchBrowser) {
   browser.execute(function (selector) {
     const items = document.querySelectorAll(selector)
     const ret = []
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 2e34884fe2..cc38e0b3d0 100644
--- a/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/Button/StaticAnalyserButton.tsx
@@ -51,7 +51,7 @@ const StaticAnalyserButton = ({
           <span className="pl-3 pr-4">
             {buttonText}
           </span>
-          </button>
+        </button>
       </div>
     </CustomTooltip>
   )

From c027acc003dd1bbca3dd1490af8f46145db2db13 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Wed, 5 Jul 2023 14:16:52 +0100
Subject: [PATCH 9/9] fix text for tooltip

---
 .../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 f4332fb58b..5ad011d24a 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,7 +130,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
         `${
           state && state.data && state.file.length > 0
             ? "Run analysis"
-            : "To run analysis tools, first compile a contract."
+            : "To run analysis for selected tools, first compile a contract"
         }`
       );
     }