From 02cc51673c73b10ef1c9355259a2336d63df9be9 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Fri, 17 Mar 2023 15:57:32 +0100
Subject: [PATCH] dd a tittle to terminal toggle

---
 apps/remix-ide-e2e/src/tests/recorder.test.ts |  10 +-
 .../src/lib/components/contractGUI.tsx        | 130 +++++++++---------
 .../terminal/src/lib/remix-ui-terminal.tsx    |  11 +-
 3 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/recorder.test.ts b/apps/remix-ide-e2e/src/tests/recorder.test.ts
index e8dd925de2..17363edbfc 100644
--- a/apps/remix-ide-e2e/src/tests/recorder.test.ts
+++ b/apps/remix-ide-e2e/src/tests/recorder.test.ts
@@ -95,12 +95,10 @@ module.exports = {
       .clickInstance(1)
       .pause(1000)
       .clickFunction('set2 - transact (not payable)', { types: 'uint256 _po', values: '10' })
-      .testFunction('last',
-        {
-          status: 'true Transaction mined and execution succeed',
-          'decoded input': { 'uint256 _po': '10' }
-        })
-      
+      .testFunction('last', {
+        status: 'true Transaction mined and execution succeed',
+        'decoded input': { 'uint256 _po': '10' }
+      })
   },
 
   'Run with live "mode" #group2': function (browser: NightwatchBrowser) {
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
index b74cfd3530..2fe8c893eb 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -274,7 +274,13 @@ export function ContractGUI (props: ContractGUIProps) {
       <div
         className="udapp_contractActionsContainerSingle pt-2"
         style={{ display: toggleContainer ? "none" : "flex" }}
-      >
+      > 
+        <CustomTooltip
+          placement={"right"}
+          tooltipClasses="text-wrap"
+          tooltipId="remixUdappInstanceButtonTooltip"
+          tooltipText={toggleUpgradeImp && !proxyAddress ? 'Proxy address cannot be empty' : buttonOptions.title}
+        >
           <button
             onClick={handleActionClick}
             className={`udapp_instanceButton ${props.widthClass} btn btn-sm ${buttonOptions.classList}`}
@@ -282,47 +288,41 @@ export function ContractGUI (props: ContractGUIProps) {
             data-title={buttonOptions.title}
             disabled={(toggleUpgradeImp && !proxyAddress) || props.disabled}
           >
-            <CustomTooltip
-              placement={"right"}
-              tooltipClasses="text-wrap"
-              tooltipId="remixUdappInstanceButtonTooltip"
-              tooltipText={toggleUpgradeImp && !proxyAddress ? 'Proxy address cannot be empty' : buttonOptions.title}
-            >
-              <div>{title}</div>
-            </CustomTooltip>
+            <div>{title}</div>
           </button>
-          <input
-            className="form-control"
-            data-id={
+        </CustomTooltip>
+        <input
+          className="form-control"
+          data-id={
+            props.funcABI.type === "fallback" ||
+            props.funcABI.type === "receive"
+              ? `'(${props.funcABI.type}')`
+              : "multiParamManagerBasicInputField"
+          }
+          placeholder={props.inputs}
+          onChange={handleBasicInput}
+          ref={basicInputRef}
+          style={{
+            visibility: !(
+              (props.funcABI.inputs && props.funcABI.inputs.length > 0) ||
               props.funcABI.type === "fallback" ||
               props.funcABI.type === "receive"
-                ? `'(${props.funcABI.type}')`
-                : "multiParamManagerBasicInputField"
-            }
-            placeholder={props.inputs}
-            onChange={handleBasicInput}
-            ref={basicInputRef}
-            style={{
-              visibility: !(
-                (props.funcABI.inputs && props.funcABI.inputs.length > 0) ||
-                props.funcABI.type === "fallback" ||
-                props.funcABI.type === "receive"
-              )
-                ? "hidden"
-                : "visible",
-            }}
-          />
-          <i
-            className="fas fa-angle-down udapp_methCaret"
-            onClick={switchMethodViewOn}
-            style={{
-              visibility: !(
-                props.funcABI.inputs && props.funcABI.inputs.length > 0
-              )
-                ? "hidden"
-                : "visible",
-            }}
-          ></i>
+            )
+              ? "hidden"
+              : "visible",
+          }}
+        />
+        <i
+          className="fas fa-angle-down udapp_methCaret"
+          onClick={switchMethodViewOn}
+          style={{
+            visibility: !(
+              props.funcABI.inputs && props.funcABI.inputs.length > 0
+            )
+              ? "hidden"
+              : "visible",
+          }}
+        ></i>
       </div>
       <div
         className="udapp_contractActionsContainerMulti"
@@ -463,14 +463,14 @@ export function ContractGUI (props: ContractGUIProps) {
                         {" "}
                         {inp.name}:{" "}
                       </label>
-                        <input
-                          ref={(el) => {
-                            initializeFields.current[index] = el;
-                          }}
-                          style={{ height: 32 }}
-                          className="form-control udapp_input"
-                          placeholder={inp.type}
-                        />
+                      <input
+                        ref={(el) => {
+                          initializeFields.current[index] = el;
+                        }}
+                        style={{ height: 32 }}
+                        className="form-control udapp_input"
+                        placeholder={inp.type}
+                      />
                     </div>
                   );
                 })}
@@ -526,26 +526,26 @@ export function ContractGUI (props: ContractGUIProps) {
                           tooltipText={'Deployed ' + shortenDate(deployment.date)}
                           key={index}
                         >
-                            <Dropdown.Item
-                              key={index}
-                              onClick={() => {
-                                switchProxyAddress(deployment.address)
-                              }}
-                              data-id={`proxyAddress${index}`}
-                            >
-                              <span>{ proxyAddress === deployment.address ? <span>&#10003; { deployment.contractName + ' ' + shortenProxyAddress(deployment.address) } </span> : <span className="pl-3">{ deployment.contractName + ' ' + shortenProxyAddress(deployment.address) }</span> }</span>
-                            </Dropdown.Item>
-                          </CustomTooltip>
-                        ))
-                      }
-                    </Dropdown.Menu>
-                  }
-                </Dropdown>
+                          <Dropdown.Item
+                            key={index}
+                            onClick={() => {
+                              switchProxyAddress(deployment.address)
+                            }}
+                            data-id={`proxyAddress${index}`}
+                          >
+                            <span>{ proxyAddress === deployment.address ? <span>&#10003; { deployment.contractName + ' ' + shortenProxyAddress(deployment.address) } </span> : <span className="pl-3">{ deployment.contractName + ' ' + shortenProxyAddress(deployment.address) }</span> }</span>
+                          </Dropdown.Item>
+                        </CustomTooltip>
+                      ))
+                    }
+                  </Dropdown.Menu>
+                }
+              </Dropdown>
             </div>
             <div className='d-flex'>
-                <div className="mb-2">
-                  { proxyAddressError && <span className='text-lowercase text-danger' data-id="errorMsgProxyAddress" style={{ fontSize: '.8em' }}>{ proxyAddressError }</span> }
-                </div>
+              <div className="mb-2">
+                { proxyAddressError && <span className='text-lowercase text-danger' data-id="errorMsgProxyAddress" style={{ fontSize: '.8em' }}>{ proxyAddressError }</span> }
+              </div>
             </div>
           </div>
         </> 
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 8a5a3c1f1f..47a2627d8a 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -440,8 +440,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
       setIsOpen(!panels.terminal.minimized)
     })
 
-
-
     return () => {
       props.plugin.off('layout', 'change')
     }
@@ -453,7 +451,14 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     <div style={{ flexGrow: 1 }} className='remix_ui_terminal_panel' ref={panelRef}>
       <div className="remix_ui_terminal_bar d-flex">
         <div className="remix_ui_terminal_menu d-flex w-100 align-items-center position-relative border-top border-dark bg-light" ref={terminalMenu} data-id="terminalToggleMenu">
-          <i className={`mx-2 remix_ui_terminal_toggleTerminal fas ${isOpen ? 'fa-angle-double-down' : 'fa-angle-double-up'}`} data-id="terminalToggleIcon" onClick={handleToggleTerminal}></i>
+        <CustomTooltip
+            placement="top"
+            tooltipId="terminalToggle"
+            tooltipClasses="text-nowrap"
+            tooltipText={isOpen ? "Hide Terminal" : "Show Terminal"}
+          >
+            <i className={`mx-2 remix_ui_terminal_toggleTerminal fas ${isOpen ? 'fa-angle-double-down' : 'fa-angle-double-up'}`} data-id="terminalToggleIcon" onClick={handleToggleTerminal}></i>
+          </CustomTooltip>
           <div className="mx-2 remix_ui_terminal_console" id="clearConsole" data-id="terminalClearConsole" onClick={handleClearConsole} >
             <CustomTooltip
               placement="top"