From 57a87a83371137ef12c493c0b4079ee4ad1d3a2b Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 8 Jul 2024 14:07:10 +0200
Subject: [PATCH 1/6] matomo in learneth

---
 .../src/components/BackButton/index.tsx       | 11 +++--
 .../src/components/RepoImporter/index.tsx     |  6 ++-
 apps/learneth/src/pages/Home/index.tsx        |  2 +-
 apps/learneth/src/pages/StepDetail/index.tsx  |  6 ++-
 apps/learneth/src/pages/StepList/index.tsx    |  2 +-
 apps/learneth/src/redux/models/remixide.ts    | 41 +++++++++++++------
 apps/learneth/src/redux/models/workshop.ts    |  4 +-
 7 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/apps/learneth/src/components/BackButton/index.tsx b/apps/learneth/src/components/BackButton/index.tsx
index 14f8112d4f..63b8c39975 100644
--- a/apps/learneth/src/components/BackButton/index.tsx
+++ b/apps/learneth/src/components/BackButton/index.tsx
@@ -10,6 +10,8 @@ function BackButton({entity}: any) {
   const isDetailPage = location.pathname === '/detail'
   const queryParams = new URLSearchParams(location.search)
   const stepId = Number(queryParams.get('stepId'))
+  const nextStep = entity && entity.steps[stepId + 1]
+  const previousStep = entity && entity.steps[stepId - 1]
 
   return (
     <nav className="navbar navbar-light bg-light justify-content-between pt-1 pb-1 pl-1">
@@ -29,7 +31,7 @@ function BackButton({entity}: any) {
         </li>
         {isDetailPage && (
           <li className="nav-item">
-            <Link className="btn" to={`/list?id=${entity.id}`} title="Tutorial menu">
+            <Link className="btn" to={`/list?id=${entity.id}`} title="Tutorial menu" onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'back_to_menu_step', entity && entity.name])}>
               <i className="fas fa-bars" />
             </Link>
           </li>
@@ -38,13 +40,13 @@ function BackButton({entity}: any) {
       {isDetailPage && (
         <form className="form-inline">
           {stepId > 0 && (
-            <Link to={`/detail?id=${entity.id}&stepId=${stepId - 1}`}>
+            <Link to={`/detail?id=${entity.id}&stepId=${stepId - 1}`} onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'previous_step', `${entity.name}/${previousStep && previousStep.name}`])}>
               <i className="fas fa-chevron-left pr-1" />
             </Link>
           )}
           {stepId + 1}/{entity && <div className="">{entity.steps.length}</div>}
           {stepId < entity.steps.length - 1 && (
-            <Link to={`/detail?id=${entity.id}&stepId=${stepId + 1}`}>
+            <Link to={`/detail?id=${entity.id}&stepId=${stepId + 1}`} onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'next_step', `${entity.name}/${nextStep && nextStep.name}`])} >
               <i className="fas fa-chevron-right pl-1" />
             </Link>
           )}
@@ -73,7 +75,8 @@ function BackButton({entity}: any) {
             variant="success"
             onClick={() => {
               setShow(false)
-              navigate('/home')
+              navigate('/home');
+              (window as any)._paq.push(['trackEvent', 'learneth', 'leave_tutorial', entity && entity.name])
             }}
           >
             Yes
diff --git a/apps/learneth/src/components/RepoImporter/index.tsx b/apps/learneth/src/components/RepoImporter/index.tsx
index 47c1f73705..c13d25381a 100644
--- a/apps/learneth/src/components/RepoImporter/index.tsx
+++ b/apps/learneth/src/components/RepoImporter/index.tsx
@@ -19,12 +19,14 @@ function RepoImporter({list, selectedRepo}: any): JSX.Element {
   }
 
   const selectRepo = (repo: {name: string; branch: string}) => {
-    dispatch({type: 'workshop/loadRepo', payload: repo})
+    dispatch({type: 'workshop/loadRepo', payload: repo});
+    (window as any)._paq.push(['trackEvent', 'learneth', 'select_repo', `${name}/${branch}`])
   }
 
   const importRepo = (event: {preventDefault: () => void}) => {
     event.preventDefault()
-    dispatch({type: 'workshop/loadRepo', payload: {name, branch}})
+    dispatch({type: 'workshop/loadRepo', payload: {name, branch}});
+    (window as any)._paq.push(['trackEvent', 'learneth', 'import_repo', `${name}/${branch}`])
   }
 
   const resetAll = () => {
diff --git a/apps/learneth/src/pages/Home/index.tsx b/apps/learneth/src/pages/Home/index.tsx
index 6835901900..1b40bc84d2 100644
--- a/apps/learneth/src/pages/Home/index.tsx
+++ b/apps/learneth/src/pages/Home/index.tsx
@@ -59,7 +59,7 @@ function HomePage(): JSX.Element {
                     >
                       {selectedRepo.entities[item.id].name}
                     </span>
-                    <Link to={`/list?id=${item.id}`} className="text-decoration-none float-right">
+                    <Link onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'start_workshop', selectedRepo.entities[item.id].name])} to={`/list?id=${item.id}`} className="text-decoration-none float-right">
                       <i className="fas fa-play-circle fa-lg" />
                     </Link>
                   </div>
diff --git a/apps/learneth/src/pages/StepDetail/index.tsx b/apps/learneth/src/pages/StepDetail/index.tsx
index 2df3b9efe6..c689add02d 100644
--- a/apps/learneth/src/pages/StepDetail/index.tsx
+++ b/apps/learneth/src/pages/StepDetail/index.tsx
@@ -203,7 +203,8 @@ function StepDetailPage() {
             <button
               className="w-100 btn btn-success"
               onClick={() => {
-                navigate(`/detail?id=${id}&stepId=${stepId + 1}`)
+                navigate(`/detail?id=${id}&stepId=${stepId + 1}`);
+                (window as any)._paq.push(['trackEvent', 'learneth', 'navigate_next', `${id}/${stepId + 1}`])
               }}
             >
               Next
@@ -213,7 +214,8 @@ function StepDetailPage() {
             <button
               className="w-100 btn btn-success"
               onClick={() => {
-                navigate(`/list?id=${id}`)
+                navigate(`/list?id=${id}`);
+                (window as any)._paq.push(['trackEvent', 'learneth', 'navigate_finish', id])
               }}
             >
               Finish tutorial
diff --git a/apps/learneth/src/pages/StepList/index.tsx b/apps/learneth/src/pages/StepList/index.tsx
index 1c05930e24..4aae0de39e 100644
--- a/apps/learneth/src/pages/StepList/index.tsx
+++ b/apps/learneth/src/pages/StepList/index.tsx
@@ -28,7 +28,7 @@ function StepListPage(): JSX.Element {
       <SlideIn>
         <article className="list-group m-3">
           {entity.steps.map((step: any, i: number) => (
-            <Link key={i} to={`/detail?id=${id}&stepId=${i}`} className="rounded-0 btn btn-light border-bottom text-left steplink">
+            <Link key={i} to={`/detail?id=${id}&stepId=${i}`} className="rounded-0 btn btn-light border-bottom text-left steplink" onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'step_slide_in', `${id}/${i}/${step.name}`])}>
               {step.name} »
             </Link>
           ))}
diff --git a/apps/learneth/src/redux/models/remixide.ts b/apps/learneth/src/redux/models/remixide.ts
index 01575201d9..6cefc9e84e 100644
--- a/apps/learneth/src/redux/models/remixide.ts
+++ b/apps/learneth/src/redux/models/remixide.ts
@@ -41,7 +41,13 @@ const Model: ModelType = {
         payload: {
           screen: false,
         },
-      })
+      });
+
+      (window as any)._paq = {
+        push: (args) => {
+          remixClient.call('matomo' as any, 'track', args)
+        }
+      } 
 
       yield router.navigate('/home')
     },
@@ -65,6 +71,8 @@ const Model: ModelType = {
         return
       }
 
+      (<any>window)._paq.push(['trackEvent', 'learneth', 'display_file', `${(step && step.name)}/${path}`])
+
       toast.info(`loading ${path} into IDE`)
       yield put({
         type: 'loading/save',
@@ -91,6 +99,7 @@ const Model: ModelType = {
         })
         toast.dismiss()
       } catch (error) {
+        (<any>window)._paq.push(['trackEvent', 'learneth', 'display_file_error', error.message])
         toast.dismiss()
         toast.error('File could not be loaded. Please try again.')
         yield put({
@@ -136,16 +145,17 @@ const Model: ModelType = {
         yield remixClient.call('fileManager', 'setFile', path, step.test.content)
 
         const result = yield remixClient.call('solidityUnitTesting', 'testFromPath', path)
-        console.log('result ', result)
+        console.log('result ', result);
 
         if (!result) {
           yield put({
             type: 'remixide/save',
             payload: { errors: ['Compiler failed to test this file']},
-          })
+          });
+          (<any>window)._paq.push(['trackEvent', 'learneth', 'test_step_error', 'Compiler failed to test this file'])
         } else {
-          const success = result.totalFailing === 0
-
+          const success = result.totalFailing === 0;
+          
           if (success) {
             yield put({
               type: 'remixide/save',
@@ -159,13 +169,15 @@ const Model: ModelType = {
               },
             })
           }
+          (<any>window)._paq.push(['trackEvent', 'learneth', 'test_step', success])
         }
       } catch (err) {
         console.log('TESTING ERROR', err)
         yield put({
           type: 'remixide/save',
           payload: { errors: [String(err)]},
-        })
+        });
+        (<any>window)._paq.push(['trackEvent', 'learneth', 'test_step_error', err])
       }
       yield put({
         type: 'loading/save',
@@ -194,12 +206,15 @@ const Model: ModelType = {
         const workshop = detail[selectedId]
         path = `.learneth/${workshop.name}/${step.name}/${path}`
         yield remixClient.call('fileManager', 'setFile', path, content)
-        yield remixClient.call('fileManager', 'switchFile', `${path}`)
+        yield remixClient.call('fileManager', 'switchFile', `${path}`);
+
+        (<any>window)._paq.push(['trackEvent', 'learneth', 'show_answer', path])
       } catch (err) {
         yield put({
           type: 'remixide/save',
           payload: { errors: [String(err)]},
-        })
+        });
+        (<any>window)._paq.push(['trackEvent', 'learneth', 'show_answer_error', err.message])
       }
 
       toast.dismiss()
@@ -212,17 +227,19 @@ const Model: ModelType = {
     },
     *testSolidityCompiler(_, { put, select }) {
       try {
-        yield remixClient.call('solidity', 'getCompilationResult')
-      } catch (err) {
+        yield remixClient.call('solidity', 'getCompilationResult');
+        (<any>window)._paq.push(['trackEvent', 'learneth', 'test_solidity_compiler'])
+      } catch (err) {        
         const errors = yield select((state) => state.remixide.errors)
         yield put({
           type: 'remixide/save',
           payload: {
             errors: [...errors, "The `Solidity Compiler` is not yet activated.<br>Please activate it using the `SOLIDITY` button in the `Featured Plugins` section of the homepage.<img class='img-thumbnail mt-3' src='assets/activatesolidity.png'>"],
           },
-        })
+        });
+        (<any>window)._paq.push(['trackEvent', 'learneth', 'test_solidity_compiler_error', err.message])
       }
-    },
+    }
   },
 }
 
diff --git a/apps/learneth/src/redux/models/workshop.ts b/apps/learneth/src/redux/models/workshop.ts
index d2ef96bd6a..087d1e89e0 100644
--- a/apps/learneth/src/redux/models/workshop.ts
+++ b/apps/learneth/src/redux/models/workshop.ts
@@ -140,6 +140,7 @@ const Model: ModelType = {
           }
         }
       }
+      (<any>window)._paq.push(['trackEvent', 'learneth', 'load_repo', payload.name])
     },
     *resetAll(_, { put }) {
       yield put({
@@ -155,7 +156,8 @@ const Model: ModelType = {
 
       yield put({
         type: 'workshop/init',
-      })
+      });
+      (<any>window)._paq.push(['trackEvent', 'learneth', 'reset_all'])
     },
   },
 }

From 43ddc6248dbec473e11e2a6faa1ac6ed9e8283d6 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 8 Jul 2024 14:18:44 +0200
Subject: [PATCH 2/6] linting

---
 apps/learneth/src/redux/models/remixide.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/learneth/src/redux/models/remixide.ts b/apps/learneth/src/redux/models/remixide.ts
index 6cefc9e84e..c16fd163e0 100644
--- a/apps/learneth/src/redux/models/remixide.ts
+++ b/apps/learneth/src/redux/models/remixide.ts
@@ -47,7 +47,7 @@ const Model: ModelType = {
         push: (args) => {
           remixClient.call('matomo' as any, 'track', args)
         }
-      } 
+      }
 
       yield router.navigate('/home')
     },
@@ -155,7 +155,6 @@ const Model: ModelType = {
           (<any>window)._paq.push(['trackEvent', 'learneth', 'test_step_error', 'Compiler failed to test this file'])
         } else {
           const success = result.totalFailing === 0;
-          
           if (success) {
             yield put({
               type: 'remixide/save',
@@ -229,7 +228,7 @@ const Model: ModelType = {
       try {
         yield remixClient.call('solidity', 'getCompilationResult');
         (<any>window)._paq.push(['trackEvent', 'learneth', 'test_solidity_compiler'])
-      } catch (err) {        
+      } catch (err) {
         const errors = yield select((state) => state.remixide.errors)
         yield put({
           type: 'remixide/save',

From a6e380be94d842ee35027bbc80bf7de4d9c6bf12 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 8 Jul 2024 16:54:24 +0530
Subject: [PATCH 3/6] Show Solidity Scan Summary

---
 .../src/lib/contract-selection.tsx            |  9 ++---
 .../src/lib/solScanTable.tsx                  | 22 ++++++------
 .../solidity-compiler/src/lib/types/index.ts  | 34 +++++++++++++++++++
 3 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
index 312ee0e475..c7f694bc33 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
@@ -1,6 +1,6 @@
 import React, {useState, useEffect} from 'react' // eslint-disable-line
 import { FormattedMessage, useIntl } from 'react-intl'
-import { ContractPropertyName, ContractSelectionProps } from './types'
+import { ContractPropertyName, ContractSelectionProps, ScanReport } from './types'
 import {PublishToStorage} from '@remix-ui/publish-to-storage' // eslint-disable-line
 import {TreeView, TreeViewItem} from '@remix-ui/tree-view' // eslint-disable-line
 import {CopyToClipboard} from '@remix-ui/clipboard' // eslint-disable-line
@@ -312,10 +312,11 @@ export const ContractSelection = (props: ContractSelectionProps) => {
           const url = data.payload.scan_details.link
 
           const { data: scanData } = await axios.post('https://solidityscan.remixproject.org/downloadResult', { url })
-          const scanDetails: Record<string, any>[] = scanData.scan_report.multi_file_scan_details
+          console.log('scan data--->', scanData)
+          const scanReport: ScanReport = scanData.scan_report
 
-          if (scanDetails && scanDetails.length) {
-            await plugin.call('terminal', 'logHtml', <SolScanTable scanDetails={scanDetails} fileName={fileName}/>)
+          if (scanReport?.multi_file_scan_details?.length) {
+            await plugin.call('terminal', 'logHtml', <SolScanTable scanReport={scanReport} fileName={fileName}/>)
           } else {
             const modal: AppModal = {
               id: 'SolidityScanError',
diff --git a/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx b/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
index 5e7a3b4838..81801d9957 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
@@ -1,27 +1,22 @@
 // eslint-disable-next-line no-use-before-define
 import React from 'react'
 import parse from 'html-react-parser'
+import { ScanReport } from './types'
 const _paq = (window._paq = window._paq || [])
 
 interface SolScanTableProps {
-  scanDetails: Record<string, any>[],
+  scanReport: ScanReport
   fileName: string
 }
 
 export function SolScanTable(props: SolScanTableProps) {
-  const { scanDetails, fileName } = props
+  const { scanReport, fileName } = props
+  const { multi_file_scan_details, multi_file_scan_summary } = scanReport
 
   return (
     <>
       <br/>
       <h6>SolidityScan result for <b>{fileName}</b>:</h6>
-      <p className='text-success'><b>{scanDetails.length} warnings </b> found. See the warning details below. For more details,&nbsp;
-        <a href="https://solidityscan.com/signup"
-          target='_blank'
-          onClick={() => _paq.push(['trackEvent', 'solidityCompiler', 'solidityScan', 'goToSolidityScan'])}>
-            go to SolidityScan.
-        </a>
-      </p>
       <table className="table table-bordered table-hover">
         <thead>
           <tr>
@@ -35,7 +30,7 @@ export function SolScanTable(props: SolScanTableProps) {
         </thead>
         <tbody>
           {
-            Array.from(scanDetails, (template, index) => {
+            Array.from(multi_file_scan_details, (template, index) => {
               return (
                 <tr key={template.template_details.issue_id}>
                   <td scope="col">{index + 1}.</td>
@@ -51,6 +46,13 @@ export function SolScanTable(props: SolScanTableProps) {
 
         </tbody>
       </table>
+      <p className='text-success'><b> warnings </b> found. See the warning details below. For more details,&nbsp;
+        <a href="https://solidityscan.com/signup"
+          target='_blank'
+          onClick={() => _paq.push(['trackEvent', 'solidityCompiler', 'solidityScan', 'goToSolidityScan'])}>
+            go to SolidityScan.
+        </a>
+      </p>
     </>
   )
 }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
index 0fddf47892..12bca721b8 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@@ -2,6 +2,40 @@ import { ICompilerApi, ConfigurationSettings, iSolJsonBinData } from '@remix-pro
 import { CompileTabLogic } from '../logic/compileTabLogic'
 export type onCurrentFileChanged = (fileName: string) => void
 
+//// SolidityScan Types 
+
+export interface ScanTemplate {
+  issue_id: string
+  issue_name: string
+  issue_remediation?: string
+  issue_severity: string
+  issue_status: string
+  static_issue_description: string
+  issue_description?: string
+  issue_confidence: string
+  metric_wise_aggregated_findings?: Record<string, any>[]
+}
+
+export interface ScanDetails {
+  issue_id: string
+  no_of_findings: string
+  template_details: ScanTemplate
+}
+
+export interface ScanReport {
+  details_enabled: boolean
+  file_url_list: string[]
+  multi_file_scan_details: ScanDetails[]
+  multi_file_scan_summary: Record<string, any>
+  multi_file_scan_status: string
+  scan_id: string
+  scan_status: string
+  scan_type: string
+  // others
+}
+
+//// SolidityScan Types 
+
 export interface SolidityCompilerProps {
   api: ICompilerApi
 }

From 2322399ea68697fbaa207a82a2c55b2f4804d63c Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 8 Jul 2024 20:41:41 +0530
Subject: [PATCH 4/6] show summary

---
 .../src/lib/solScanTable.tsx                  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx b/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
index 81801d9957..89c56f0d7c 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
@@ -46,13 +46,22 @@ export function SolScanTable(props: SolScanTableProps) {
 
         </tbody>
       </table>
-      <p className='text-success'><b> warnings </b> found. See the warning details below. For more details,&nbsp;
-        <a href="https://solidityscan.com/signup"
-          target='_blank'
-          onClick={() => _paq.push(['trackEvent', 'solidityCompiler', 'solidityScan', 'goToSolidityScan'])}>
-            go to SolidityScan.
-        </a>
-      </p>
+
+      { multi_file_scan_summary ? (
+        <>
+        <p className='text-success'><b>Scan Summary: </b></p>
+        <p>&emsp; Lines Analyzed: {multi_file_scan_summary.lines_analyzed_count}</p>
+        <p>&emsp; Scan Score: {multi_file_scan_summary.score_v2}</p>
+        <p>&emsp; Issue Distribution: { JSON.stringify(multi_file_scan_summary.issue_severity_distribution, null, 1)} </p>
+        <p>For more details,&nbsp;
+          <a href="https://solidityscan.com/signup"
+            target='_blank'
+            onClick={() => _paq.push(['trackEvent', 'solidityCompiler', 'solidityScan', 'goToSolidityScan'])}>
+              go to SolidityScan.
+          </a>
+        </p>
+        </>
+      ): null}
     </>
   )
 }

From 4f1ac2e0958e075d3f71ea67fb1c38bb6f323d36 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 8 Jul 2024 20:52:18 +0530
Subject: [PATCH 5/6] fix linting

---
 .../src/lib/solScanTable.tsx                  | 20 +++++++++----------
 .../solidity-compiler/src/lib/types/index.ts  |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx b/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
index 89c56f0d7c..7c64cb4203 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
@@ -49,17 +49,17 @@ export function SolScanTable(props: SolScanTableProps) {
 
       { multi_file_scan_summary ? (
         <>
-        <p className='text-success'><b>Scan Summary: </b></p>
-        <p>&emsp; Lines Analyzed: {multi_file_scan_summary.lines_analyzed_count}</p>
-        <p>&emsp; Scan Score: {multi_file_scan_summary.score_v2}</p>
-        <p>&emsp; Issue Distribution: { JSON.stringify(multi_file_scan_summary.issue_severity_distribution, null, 1)} </p>
-        <p>For more details,&nbsp;
-          <a href="https://solidityscan.com/signup"
-            target='_blank'
-            onClick={() => _paq.push(['trackEvent', 'solidityCompiler', 'solidityScan', 'goToSolidityScan'])}>
+          <p className='text-success'><b>Scan Summary: </b></p>
+          <p>&emsp; Lines Analyzed: {multi_file_scan_summary.lines_analyzed_count}</p>
+          <p>&emsp; Scan Score: {multi_file_scan_summary.score_v2}</p>
+          <p>&emsp; Issue Distribution: { JSON.stringify(multi_file_scan_summary.issue_severity_distribution, null, 1)} </p>
+          <p>For more details,&nbsp;
+            <a href="https://solidityscan.com/signup"
+              target='_blank'
+              onClick={() => _paq.push(['trackEvent', 'solidityCompiler', 'solidityScan', 'goToSolidityScan'])}>
               go to SolidityScan.
-          </a>
-        </p>
+            </a>
+          </p>
         </>
       ): null}
     </>
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
index 12bca721b8..1aa0b84f25 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@@ -2,7 +2,7 @@ import { ICompilerApi, ConfigurationSettings, iSolJsonBinData } from '@remix-pro
 import { CompileTabLogic } from '../logic/compileTabLogic'
 export type onCurrentFileChanged = (fileName: string) => void
 
-//// SolidityScan Types 
+//// SolidityScan Types
 
 export interface ScanTemplate {
   issue_id: string
@@ -34,7 +34,7 @@ export interface ScanReport {
   // others
 }
 
-//// SolidityScan Types 
+//// SolidityScan Types
 
 export interface SolidityCompilerProps {
   api: ICompilerApi

From ee0005a15ae03e2df7c9d281c6d4e1076904169f Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 9 Jul 2024 11:06:39 +0530
Subject: [PATCH 6/6] updated link

---
 libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx | 3 +--
 libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
index c7f694bc33..b13f3ddcb3 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
@@ -312,7 +312,6 @@ export const ContractSelection = (props: ContractSelectionProps) => {
           const url = data.payload.scan_details.link
 
           const { data: scanData } = await axios.post('https://solidityscan.remixproject.org/downloadResult', { url })
-          console.log('scan data--->', scanData)
           const scanReport: ScanReport = scanData.scan_report
 
           if (scanReport?.multi_file_scan_details?.length) {
@@ -339,7 +338,7 @@ export const ContractSelection = (props: ContractSelectionProps) => {
       title: <FormattedMessage id="solidity.solScan.modalTitle" />,
       message: <div className='d-flex flex-column'>
         <span><FormattedMessage id="solidity.solScan.modalMessage" />
-          <a href={'https://solidityscan.com'}
+          <a href={'https://solidityscan.com/?utm_campaign=remix&utm_source=remix'}
             target="_blank"
             onClick={() => _paq.push(['trackEvent', 'solidityCompiler', 'solidityScan', 'learnMore'])}>
               Learn more
diff --git a/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx b/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
index 7c64cb4203..059262744c 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solScanTable.tsx
@@ -54,7 +54,7 @@ export function SolScanTable(props: SolScanTableProps) {
           <p>&emsp; Scan Score: {multi_file_scan_summary.score_v2}</p>
           <p>&emsp; Issue Distribution: { JSON.stringify(multi_file_scan_summary.issue_severity_distribution, null, 1)} </p>
           <p>For more details,&nbsp;
-            <a href="https://solidityscan.com/signup"
+            <a href="https://solidityscan.com/?utm_campaign=remix&utm_source=remix"
               target='_blank'
               onClick={() => _paq.push(['trackEvent', 'solidityCompiler', 'solidityScan', 'goToSolidityScan'])}>
               go to SolidityScan.