diff --git a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx index d0dc3f0c6d..1671e1bcc8 100644 --- a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx +++ b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx @@ -60,7 +60,6 @@ const DragBar = (props: IRemixDragBarUi) => { function stopDrag(data: any) { setDragState(false) - console.log("drag") if (data.x < props.minWidth + offset) { setDragBarPosX(offset) props.setHideStatus(true) diff --git a/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx b/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx index 95fdf63c3d..56439b0ad3 100644 --- a/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx +++ b/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx @@ -36,18 +36,18 @@ function RootView ({ pluginComponent, children }: RootViewProps) { return (
-
+
{ setFilterPlugin(event.target.value.toLowerCase()) }} value={filterPlugins} - className="form-control" + className="mb-2 form-control" placeholder="Search" data-id="pluginManagerComponentSearchInput" /> -
diff --git a/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.css b/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.css index 413e6c5846..65913d52aa 100644 --- a/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.css +++ b/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.css @@ -12,9 +12,6 @@ .remixui_pluginSearchInput { height: 38px; } -.remixui_pluginSearchButton { - font-size: 13px; -} .remixui_displayName { width: 100%; display: flex; 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 a33fc95050..353732de9d 100644 --- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx @@ -29,6 +29,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) { const [loadedContractData, setLoadedContractData] = useState(null) const [constructorInterface, setConstructorInterface] = useState(null) const [constructorInputs, setConstructorInputs] = useState(null) + const [addressIsValid, setaddressIsValid] = useState(true) const [compilerName, setCompilerName] = useState('') const contractsRef = useRef(null) const atAddressValue = useRef(null) @@ -201,12 +202,19 @@ export function ContractDropdownUI (props: ContractDropdownProps) { const loadFromAddress = () => { let address = loadedAddress - - if (!ethJSUtil.isValidChecksumAddress(address)) { - props.tooltip(checkSumWarning()) - address = ethJSUtil.toChecksumAddress(address) + if (address == '') return + try { + if (!ethJSUtil.isValidChecksumAddress(address)) { + props.tooltip(checkSumWarning()) + address = ethJSUtil.toChecksumAddress(address) + } + props.loadAddress(loadedContractData, address) + } catch(e) { + console.log("Invalid Address input: ", e) + setaddressIsValid(false) + return } - props.loadAddress(loadedContractData, address) + setaddressIsValid(true) } const handleCheckedIPFS = () => { @@ -268,13 +276,17 @@ export function ContractDropdownUI (props: ContractDropdownProps) { evmVersion = JSON.parse(loadedContractData.metadata).settings.evmVersion } catch (err) {} return ( -
+
- {compilerName && compilerName !== '' && } + {compilerName && compilerName !== '' && + + }
{props.remixdActivated ? () - : null} + : null}
- + {(contractList[currentFile] || []).map((contract, index) => { return
{ evmVersion && loadedContractData && - - } - > - evm version: {evmVersion} - } + placement={'right'} + tooltipClasses="text-wrap text-left" + tooltipId="info-evm-version-warn" + tooltipText={ + + } + > + evm version: {evmVersion} +
+ }
- {((contractList[currentFile] && contractList[currentFile].filter(contract => contract)) || []).length <= 0 ? intl.formatMessage({ id: 'udapp.noCompiledContracts' }) - : loadedContractData ?
+ {(((contractList[currentFile] && contractList[currentFile].filter(contract => contract)) || []).length > 0 && loadedContractData) && +
-
: '' +
}
-
- -
-
- +
+
-
-
- } - > - - + + } + > + + +
+ { !addressIsValid && The address is not valid }
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 c8ec0e7a6c..233a5be7bf 100644 --- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx @@ -182,11 +182,9 @@ export function ContractGUI (props: ContractGUIProps) { setProxyAddressError('proxy address cannot be empty') } else { const isValidProxyAddress = await props.isValidProxyAddress(proxyAddress) - if (isValidProxyAddress) { setProxyAddressError('') const upgradeReport: any = await props.isValidProxyUpgrade(proxyAddress) - if (upgradeReport.ok) { !proxyAddressError && props.clickCallBack(props.funcABI.inputs, proxyAddress, ['Upgrade with Proxy']) } else { @@ -279,14 +277,14 @@ export function ContractGUI (props: ContractGUIProps) { placement={"right"} tooltipClasses="text-wrap" tooltipId="remixUdappInstanceButtonTooltip" - tooltipText={toggleUpgradeImp && !proxyAddress ? 'Proxy address cannot be empty' : buttonOptions.title} + tooltipText={toggleUpgradeImp && !proxyAddress ? 'Proxy address cannot be empty' : (props.inputs !=='' && basicInput === '') ? 'Input required' : buttonOptions.title} > @@ -309,6 +307,7 @@ export function ContractGUI (props: ContractGUIProps) { } ref={basicInputRef} style={{ + height: '2rem', visibility: !( (props.funcABI.inputs && props.funcABI.inputs.length > 0) || props.funcABI.type === "fallback" || @@ -439,12 +438,7 @@ export function ContractGUI (props: ContractGUIProps) { {props.initializerOptions && props.initializerOptions.initializeInputs ? ( - @@ -534,12 +528,14 @@ export function ContractGUI (props: ContractGUIProps) { > { - switchProxyAddress(deployment.address) - }} + onClick={() => { switchProxyAddress(deployment.address) }} data-id={`proxyAddress${index}`} > - { proxyAddress === deployment.address ? ✓ { deployment.contractName + ' ' + shortenProxyAddress(deployment.address) } : { deployment.contractName + ' ' + shortenProxyAddress(deployment.address) } } + + { proxyAddress === deployment.address ? + ✓ { deployment.contractName + ' ' + shortenProxyAddress(deployment.address) } + : { deployment.contractName + ' ' + shortenProxyAddress(deployment.address) } } + )) diff --git a/libs/remix-ui/run-tab/src/lib/components/deployButton.tsx b/libs/remix-ui/run-tab/src/lib/components/deployButton.tsx index 5ee10c6536..6e72485186 100644 --- a/libs/remix-ui/run-tab/src/lib/components/deployButton.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/deployButton.tsx @@ -15,7 +15,14 @@ export function DeployButton (props: DeployButtonProps) { <> { props.deployOptions && (props.deployOptions || []).length > 0 ? - + { diff --git a/libs/remix-ui/run-tab/src/lib/components/deployInput.tsx b/libs/remix-ui/run-tab/src/lib/components/deployInput.tsx index aeba86f05f..3f00e3fa38 100644 --- a/libs/remix-ui/run-tab/src/lib/components/deployInput.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/deployInput.tsx @@ -5,7 +5,7 @@ import { DeployButton } from './deployButton' export function DeployInput (props: DeployInputProps) { return ( -
+
diff --git a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx index e7e7b43609..5f9639077c 100644 --- a/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/recorderCardUI.tsx @@ -30,7 +30,7 @@ export function RecorderUI (props: RecorderProps) { return ( -
+
-
-
+
+
- - - - - - } - > - - - - + + + + + + } + > + + + +
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 220180cece..cb57ad001a 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 @@ -101,8 +101,6 @@ align-items: center; margin-top: 13px; } -.udapp_transaction { -} .udapp_atAddress { margin: 0; min-width: 100px; @@ -118,7 +116,6 @@ height: 32px; } .udapp_atAddressSect input { - height: 32px; border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important; }