From fd22c5795f76d3aa39862c44d3853ec221531a41 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Wed, 23 Sep 2020 10:40:34 +0100
Subject: [PATCH] Unload debugger

---
 .../debugger-ui/src/lib/debugger-ui.tsx       | 52 +++++++++----------
 .../src/lib/tx-browser/tx-browser.tsx         |  8 +--
 2 files changed, 29 insertions(+), 31 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 1e0e84d89c..7113c74365 100644
--- a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
+++ b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
@@ -45,7 +45,7 @@ export const DebuggerUI = ({ debuggerModule, fetchContractAndCompile, debugHash,
       })
   
       editor.event.register('contentChanged', () => {
-        if (state.debugger) state.debugger.unload()
+        unLoad()
       })
     }
 
@@ -94,12 +94,11 @@ export const DebuggerUI = ({ debuggerModule, fetchContractAndCompile, debugHash,
   }
 
   const requestDebug = (blockNumber, txNumber, tx) => {
-    if (state.debugger) state.debugger.unload()
     startDebugging(blockNumber, txNumber, tx)
   }
 
   const unloadRequested = (blockNumber, txIndex, tx) => {
-    if (state.debugger) state.debugger.unload()
+    unLoad()
   }
 
   const isDebuggerActive = () => {
@@ -123,29 +122,28 @@ export const DebuggerUI = ({ debuggerModule, fetchContractAndCompile, debugHash,
   }
 
   const unLoad = () => {
-    // yo.update(this.debuggerHeadPanelsView, yo`<div></div>`)
-    // yo.update(this.debuggerPanelsView, yo`<div></div>`)
-    // yo.update(this.stepManagerView, yo`<div></div>`)
-    // setState(prevState => {
-    //   const { visibility } = prevState
-
-    //   return {
-    //     ...prevState,
-    //     debugger: null,
-    //     debugging: false,
-    //     visibility: {
-    //       ...visibility,
-    //       vmDebugger: false,
-    //       stepManager: false
-    //     }
-    //   }
-    // })
-    // event.trigger('traceUnloaded', [])
+    if (state.debugger) state.debugger.unload()
+    setState(prevState => {
+      return {
+        ...prevState,
+        isActive: false,
+        statusMessage: '',
+        debugger: null,
+        currentReceipt: {
+          contractAddress: null,
+          to: null
+        },
+        blockNumber: null,
+        ready: {
+          vmDebugger: false,
+          vmDebuggerHead: false
+        },
+        debugging: false
+      }
+    })
   }
 
   const startDebugging = async (blockNumber, txNumber, tx) => {
-    if (state.debugger) unLoad()
-
     const web3 = await getDebugWeb3()
     const currentReceipt = await web3.eth.getTransactionReceipt(txNumber)
     const debuggerInstance = new Debugger({
@@ -254,11 +252,11 @@ if (state.ready.vmDebugger && state.ready.vmDebuggerHead) {
       <div>
         <div className="px-2">
           <TxBrowser requestDebug={ requestDebug } unloadRequested={ unloadRequested } transactionNumber={ state.txNumber } debugging={ state.debugging } />
-          <StepManager stepManager={ state.debugger ? state.debugger.step_manager : null } />
-          <VmDebuggerHead vmDebuggerLogic={ state.debugger ? state.debugger.vmDebuggerLogic : null } ready={vmDebuggerHeadReady} />
+  { state.debugging && <StepManager stepManager={ state.debugger ? state.debugger.step_manager : null } /> }
+  { state.debugging && <VmDebuggerHead vmDebuggerLogic={ state.debugger ? state.debugger.vmDebuggerLogic : null } ready={vmDebuggerHeadReady} /> }
         </div>
-        <div className="statusMessage">{ state.statusMessage }</div>
-        <VmDebugger vmDebuggerLogic={ state.debugger ? state.debugger.vmDebuggerLogic : null } ready={vmDebuggerReady} />
+  { state.debugging && <div className="statusMessage">{ state.statusMessage }</div> }
+  { state.debugging && <VmDebugger vmDebuggerLogic={ state.debugger ? state.debugger.vmDebuggerLogic : null } ready={vmDebuggerReady} /> }
       </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 39841b5021..4e7f7186ee 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
@@ -27,7 +27,7 @@ export const TxBrowser = ({ requestDebug, unloadRequested, transactionNumber, de
     unloadRequested()
   }
 
-  const txInputChanged = (e) => {
+  const txInputChanged = (value) => {
     // todo check validation of txnumber in the input element, use
     // required
     // oninvalid="setCustomValidity('Please provide a valid transaction number, must start with 0x and have length of 22')"
@@ -37,7 +37,7 @@ export const TxBrowser = ({ requestDebug, unloadRequested, transactionNumber, de
     setState(prevState => {
       return {
         ...prevState,
-        txNumber: e.target.value
+        txNumber: value
       }
     })
   }
@@ -51,7 +51,7 @@ export const TxBrowser = ({ requestDebug, unloadRequested, transactionNumber, de
             className="form-control m-0 txinput"
             id='txinput'
             type='text'
-            onChange={txInputChanged}
+            onChange={({ target: { value } }) => txInputChanged(value)}
             placeholder={'Transaction hash, should start with 0x'}
             data-id="debuggerTransactionInput"
             disabled={debugging}
@@ -64,7 +64,7 @@ export const TxBrowser = ({ requestDebug, unloadRequested, transactionNumber, de
           title={debugging ? 'Stop debugging' : 'Start debugging'}
           onClick={handleSubmit}
           data-id="debuggerTransactionStartButton"
-          disabled={!state.txNumber ? true : !debugging ? true : false }
+          disabled={!state.txNumber ? true : false }
         >
           { debugging ? 'Stop' : 'Start' } debugging
         </button>