From 13d19f0b42b173e36e2132bdb99e82d42b7d71e8 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Mon, 10 Jul 2023 15:28:05 +0200
Subject: [PATCH] mprovements

---
 .../src/lib/components/contractDropdownUI.tsx |  3 +-
 .../src/lib/components/contractGUI.tsx        | 36 +++++++++++--------
 .../src/lib/components/universalDappUI.tsx    | 22 ++++++------
 libs/remix-ui/run-tab/src/lib/css/run-tab.css |  3 --
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
index 758207f66e..4196c0e550 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -338,7 +338,8 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
           tooltipId="info-evm-version-warn"
           tooltipText={<span className="text-left">
             <FormattedMessage id='udapp.warningEvmVersion' values={{ evmVersion }}/>
-          </span>}
+          </span>
+          }
         >
           <span className='udapp_evmVersion badge alert-warning'>evm version: {evmVersion}</span>
         </CustomTooltip>
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 233a5be7bf..14ec0eba3e 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -274,20 +274,25 @@ export function ContractGUI (props: ContractGUIProps) {
         style={{ display: toggleContainer ? "none" : "flex" }}
       > 
         <CustomTooltip
+          delay={0}
           placement={"right"}
           tooltipClasses="text-wrap"
           tooltipId="remixUdappInstanceButtonTooltip"
           tooltipText={toggleUpgradeImp && !proxyAddress ? 'Proxy address cannot be empty' : (props.inputs !=='' && basicInput === '') ? 'Input required' : buttonOptions.title}
         >
-          <button
+          <div
+            className='d-flex'
             onClick={handleActionClick}
-            className={`udapp_instanceButton ${props.widthClass} btn btn-sm ${buttonOptions.classList}`}
-            data-id={buttonOptions.dataId}
-            data-title={buttonOptions.title}
-            disabled={(toggleUpgradeImp && !proxyAddress) || props.disabled || (props.inputs !=='' && basicInput === '')}
           >
-            <div className='text-nowrap overflow-hidden text-truncate'>{title}</div>
-          </button>
+            <button
+              className={`udapp_instanceButton text-nowrap overflow-hidden text-truncate ${props.widthClass} btn btn-sm ${buttonOptions.classList}`}
+              data-id={buttonOptions.dataId}
+              data-title={buttonOptions.title}
+              disabled={(toggleUpgradeImp && !proxyAddress) || props.disabled || (props.inputs !=='' && basicInput === '')}
+            >
+              {title}
+            </button>
+          </div>
         </CustomTooltip>
         <input
           className="form-control"
@@ -401,15 +406,18 @@ export function ContractGUI (props: ContractGUIProps) {
               tooltipId="remixUdappInstanceButtonTooltip"
               tooltipText={buttonOptions.title}
             >
-              <button
-                type="button"
+              <div
                 onClick={handleExpandMultiClick}
-                data-id={buttonOptions.dataId}
-                className={`udapp_instanceButton ${buttonOptions.classList}`}
-                disabled={props.disabled}
               >
-                {buttonOptions.content}
-              </button>
+                <button
+                  type="button"
+                  data-id={buttonOptions.dataId}
+                  className={`udapp_instanceButton ${buttonOptions.classList}`}
+                  disabled={props.disabled || (props.inputs !=='' && basicInput === '')}
+                >
+                  {buttonOptions.content}
+                </button>
+              </div>
             </CustomTooltip>
           </div>
         </div>
diff --git a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
index 6f81417ced..c56fc3f2f2 100644
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@@ -301,18 +301,18 @@ export function UniversalDappUI (props: UdappProps) {
 
                           return key === funcIndex
                             ? Object.keys(response || {}).map(
-                                (innerkey, index) => {
-                                  return renderData(
-                                    props.instance.decodedResponse[key][
-                                      innerkey
-                                    ],
-                                    response,
-                                    innerkey,
+                              (innerkey, index) => {
+                                return renderData(
+                                  props.instance.decodedResponse[key][
                                     innerkey
-                                  );
-                                }
-                              )
-                            : null;
+                                  ],
+                                  response,
+                                  innerkey,
+                                  innerkey
+                                );
+                              }
+                            )
+                          : null;
                         }
                       )}
                     </TreeView>
diff --git a/libs/remix-ui/run-tab/src/lib/css/run-tab.css b/libs/remix-ui/run-tab/src/lib/css/run-tab.css
index cb57ad001a..c3ec9a555a 100644
--- a/libs/remix-ui/run-tab/src/lib/css/run-tab.css
+++ b/libs/remix-ui/run-tab/src/lib/css/run-tab.css
@@ -361,9 +361,6 @@
   margin:0;
   word-break: inherit;
 }
-.udapp_contractProperty button:disabled {
-  cursor: not-allowed;
-}
 .udapp_contractProperty.udapp_constant button {
   min-width: 100px;
   width: 100px;