From 455c4e1fd89de2fdfd8a4623d949cb25d0e30542 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Fri, 20 Nov 2020 11:12:45 +0100
Subject: [PATCH] style fixes

---
 .../debugger-ui/src/lib/debugger-ui.tsx       | 48 +++++++++++--------
 .../src/lib/tx-browser/tx-browser.tsx         | 22 ++++-----
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
index f28ce848fb..ad3b69fa30 100644
--- a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
@@ -47,13 +47,11 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
       editor.event.register('breakpointCleared', (fileName, row) => {
         if (state.debugger) state.debugger.breakPointManager.remove({fileName: fileName, row: row})
       })
-  
       editor.event.register('breakpointAdded', (fileName, row) => {
         if (state.debugger) {
           state.debugger.breakPointManager.add({fileName: fileName, row: row})
         }
       })
-  
       editor.event.register('contentChanged', () => {
         unLoad()
       })
@@ -146,7 +144,12 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
     if (state.debugger) unLoad()
     if (!txNumber) return
     const web3 = await debuggerModule.getDebugWeb3()
-    const currentReceipt = await web3.eth.getTransactionReceipt(txNumber)
+    let currentReceipt
+    try {
+      currentReceipt = await web3.eth.getTransactionReceipt(txNumber)
+    } catch (e) {
+    // throw modal
+    }
     const debuggerInstance = new Debugger({
       web3,
       offsetToLineColumnConverter: debuggerModule.offsetToLineColumnConverter,
@@ -207,26 +210,31 @@ const vmDebugger = {
 }
 
   return (
-      <div>
-        <div className="px-2">
-          <div className="mt-3">
-            <p className="mt-2 debuggerLabel">Debugger Configuration</p>
-            <div className="mt-2 debuggerConfig custom-control custom-checkbox">
-              <input className="custom-control-input" id="debugGeneratedSourcesInput" onChange={({ target: { checked } }) => {
-                setState(prevState => {
-                  return { ...prevState, opt: { debugWithGeneratedSources: checked }}
-                })
-              }} type="checkbox" title="Debug with generated sources" />
-              <label data-id="debugGeneratedSourcesLabel" className="form-check-label custom-control-label" htmlFor="debugGeneratedSourcesInput">Use generated sources (from Solidity v0.7.2)</label>
-            </div>
+    <div>
+      <div className='px-2'>
+        <div className='mt-3'>
+          <p className='mt-2 debuggerLabel'>Debugger Configuration</p>
+          <div className='mt-2 debuggerConfig custom-control custom-checkbox'>
+            <input className='custom-control-input' id='debugGeneratedSourcesInput' onChange={({ target: { checked } }) => {
+              setState(prevState => {
+                return { ...prevState, opt: { debugWithGeneratedSources: checked }}
+              })
+            }} type='checkbox' title='Debug with generated sources' />
+            <label data-id='debugGeneratedSourcesLabel' className='form-check-label custom-control-label' htmlFor='debugGeneratedSourcesInput'>Use generated sources (from Solidity v0.7.2)</label>
           </div>
-          <TxBrowser requestDebug={ requestDebug } unloadRequested={ unloadRequested } transactionNumber={ state.txNumber } debugging={ state.debugging } />
-  { state.debugging && <StepManager stepManager={ stepManager } /> }
-  { state.debugging && <VmDebuggerHead vmDebugger={ vmDebugger } /> }
         </div>
-  { state.debugging && <div className="statusMessage">{ state.statusMessage }</div> }
-  { state.debugging && <VmDebugger vmDebugger={ vmDebugger } /> }
+        <TxBrowser
+          requestDebug={ requestDebug }
+          unloadRequested={ unloadRequested }
+          transactionNumber={ state.txNumber }
+          debugging={ state.debugging }
+        />
+        { state.debugging && <StepManager stepManager={ stepManager } /> }
+        { state.debugging && <VmDebuggerHead vmDebugger={ vmDebugger } /> }
       </div>
+      { state.debugging && <div className='statusMessage'>{ state.statusMessage }</div> }
+      { state.debugging && <VmDebugger vmDebugger={ vmDebugger } /> }
+    </div>
   )
 }
 
diff --git a/libs/remix-ui/debugger-ui/src/lib/tx-browser/tx-browser.tsx b/libs/remix-ui/debugger-ui/src/lib/tx-browser/tx-browser.tsx
index 4e7f7186ee..4a062d99e2 100644
--- a/libs/remix-ui/debugger-ui/src/lib/tx-browser/tx-browser.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/tx-browser/tx-browser.tsx
@@ -22,7 +22,6 @@ export const TxBrowser = ({ requestDebug, unloadRequested, transactionNumber, de
       requestDebug(undefined, state.txNumber)
     }
   }
-  
   const unload = () => {
     unloadRequested()
   }
@@ -33,7 +32,6 @@ export const TxBrowser = ({ requestDebug, unloadRequested, transactionNumber, de
     // oninvalid="setCustomValidity('Please provide a valid transaction number, must start with 0x and have length of 22')"
     // pattern="^0[x,X]+[0-9a-fA-F]{22}"
     // this.state.txNumberInput.setCustomValidity('')
-  
     setState(prevState => {
       return {
         ...prevState,
@@ -58,16 +56,16 @@ export const TxBrowser = ({ requestDebug, unloadRequested, transactionNumber, de
           />
         </div>
         <div className="d-flex justify-content-center w-100 btn-group py-1">
-        <button
-          className="btn btn-primary btn-sm txbutton"
-          id="load"
-          title={debugging ? 'Stop debugging' : 'Start debugging'}
-          onClick={handleSubmit}
-          data-id="debuggerTransactionStartButton"
-          disabled={!state.txNumber ? true : false }
-        >
-          { debugging ? 'Stop' : 'Start' } debugging
-        </button>
+          <button
+            className="btn btn-primary btn-sm txbutton"
+            id="load"
+            title={debugging ? 'Stop debugging' : 'Start debugging'}
+            onClick={handleSubmit}
+            data-id="debuggerTransactionStartButton"
+            disabled={!state.txNumber ? true : false }
+          >
+            { debugging ? 'Stop' : 'Start' } debugging
+          </button>
         </div>
       </div>
       <span id='error'></span>