From 8479ad2ab100107504b5a7fdb6b9552d3f79820e Mon Sep 17 00:00:00 2001
From: tizah <davidzagi@yahoo.com>
Date: Fri, 23 Apr 2021 16:57:24 +0100
Subject: [PATCH] refactored warning message

---
 .../src/lib/remix-ui-static-analyser.tsx      | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 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 21acfe376a..383bfa7643 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
@@ -105,6 +105,20 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
     return () => { }
   }, [autoRun, categoryIndex])
 
+  const message = (name, warning, more, fileName, locationString) : string => {
+    return (`
+    <span className='d-flex flex-column'>
+    <span className='h6 font-weight-bold'>${name}</span>
+    ${warning}
+    ${more
+      ? (<span><a href={more} target='_blank'>more</a></span>)
+      : (<span> </span>)
+    }
+    <span className="" title={Position in ${fileName}}>Pos: ${locationString}</span>
+  </span>`
+    )
+  }
+
   const run = (lastCompilationResult, lastCompilationSource, currentFile) => {
     if (autoRun) {
       setResult({ lastCompilationResult, lastCompilationSource, currentFile })
@@ -150,16 +164,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
                 fileName = Object.keys(lastCompilationResult.contracts)[file]
               }
               warningCount++
-              const msg = `
-                <span class='d-flex flex-column'>
-                  <span class='h6 font-weight-bold'>${result.name}</span>
-                  ${item.warning}
-                  ${item.more
-                  ? `<span><a href=${item.more} target='_blank'>more</a></span>`
-                  : '<span> </span>'
-                }
-                  <span class="" title="Position in ${fileName}">Pos: ${locationString}</span>
-                </span>`
+              const msg = message(item.name, item.warning, item.more, fileName, locationString)
               const options = {
                 type: 'warning',
                 useSpan: true,