From ee80192eeaf6b20388f5485d04ee8f7077ecc8e0 Mon Sep 17 00:00:00 2001
From: "davidzagi93@gmail.com" <davidzagi93@gmail.com>
Date: Tue, 21 Sep 2021 15:20:13 +0100
Subject: [PATCH] refactor: little changes to terminal

---
 libs/remix-ui/terminal/src/lib/remix-ui-terminal.css |  4 ++++
 libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
index eadcabb373..6af3918cbe 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
@@ -9,6 +9,10 @@ element.style {
   font-weight: bold;
   color: #a2a3b4;
   border-top-style: hidden;
+
+
+
+  
   border-right-style: hidden;
   border-left-style: hidden;
   border-bottom-style: hidden;
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index 97c2769d64..f847bcb191 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -14,7 +14,7 @@ import RenderUnKnownTransactions from './components/RenderUnknownTransactions' /
 import RenderCall from './components/RenderCall' // eslint-disable-line
 import RenderKnownTransactions from './components/RenderKnownTransactions' // eslint-disable-line
 import parse from 'html-react-parser'
-import { RemixUiTerminalProps } from './types/terminalTypes'
+import { EmptyBlock, KnownTransaction, RemixUiTerminalProps, UnknownTransaction } from './types/terminalTypes'
 import { wrapScript } from './utils/wrapScript'
 
 /* eslint-disable-next-line */
@@ -501,18 +501,18 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
           <div id='journal' className='journal' data-id='terminalJournal'>
             {!clearConsole && <TerminalWelcomeMessage packageJson={version}/>}
             {newstate.journalBlocks && newstate.journalBlocks.map((x, index) => {
-              if (x.name === 'emptyBlock') {
+              if (x.name === EmptyBlock) {
                 return (
                   <div className="px-4 block" data-id='block' key={index}>
                     <span className='txLog'>
                       <span className='tx'><div className='txItem'>[<span className='txItemTitle'>block:{x.message} - </span> 0 {'transactions'} ] </div></span></span>
                   </div>
                 )
-              } else if (x.name === 'unknownTransaction') {
+              } else if (x.name === UnknownTransaction) {
                 return x.message.filter(x => x.tx.hash.includes(searchInput) || x.tx.from.includes(searchInput) || (x.tx.to.includes(searchInput))).map((trans) => {
                   return (<div className='px-4 block' data-id={`block_tx${trans.tx.hash}`} key={index}> { <RenderUnKnownTransactions tx={trans.tx} receipt={trans.receipt} index={index} plugin={props.plugin} showTableHash={showTableHash} txDetails={txDetails} />} </div>)
                 })
-              } else if (x.name === 'knownTransaction') {
+              } else if (x.name === KnownTransaction) {
                 return x.message.map((trans) => {
                   return (<div className='px-4 block' data-id={`block_tx${trans.tx.hash}`} key={index}> { trans.tx.isCall ? <RenderCall tx={trans.tx} resolvedData={trans.resolvedData} logs={trans.logs} index={index} plugin={props.plugin} showTableHash={showTableHash} txDetails={txDetails} /> : (<RenderKnownTransactions tx = { trans.tx } receipt = { trans.receipt } resolvedData = { trans.resolvedData } logs = {trans.logs } index = { index } plugin = { props.plugin } showTableHash = { showTableHash } txDetails = { txDetails } />) } </div>)
                 })
@@ -524,7 +524,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
                     )
                   } else {
                     return (
-                      <div className="px-4 block" data-id="block" key={i}>{ msg ? msg.toString().replace(/,/g, '') : msg }</div>
+                      <div className="px-4 block" data-id="block" key={i}><span className={x.style}>{ msg ? msg.toString().replace(/,/g, '') : msg }</span></div>
                     )
                   }
                 })