diff --git a/libs/remix-ui/run-tab/.babelrc b/libs/remix-ui/run-tab/.babelrc index ccae900be4..09d67939cc 100644 --- a/libs/remix-ui/run-tab/.babelrc +++ b/libs/remix-ui/run-tab/.babelrc @@ -1,12 +1,4 @@ { - "presets": [ - [ - "@nrwl/react/babel", - { - "runtime": "automatic", - "useBuiltIns": "usage" - } - ] - ], + "presets": ["@nrwl/react/babel"], "plugins": [] } diff --git a/libs/remix-ui/run-tab/src/lib/actions/index.ts b/libs/remix-ui/run-tab/src/lib/actions/index.ts index c659b2a802..9ee2446b1c 100644 --- a/libs/remix-ui/run-tab/src/lib/actions/index.ts +++ b/libs/remix-ui/run-tab/src/lib/actions/index.ts @@ -548,7 +548,6 @@ export const clearInstances = () => { export const loadAddress = (contract: ContractData, address: string) => { if (!contract) return dispatch(displayPopUp('No compiled contracts found.')) - clearInstances() loadContractFromAddress(address, (cb) => { dispatch(displayNotification('At Address', `Do you really want to interact with ${address} using the current ABI definition?`, 'OK', 'Cancel', cb, null)) 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 dd13a983ef..4bd6c7df96 100644 --- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx @@ -62,13 +62,7 @@ export function ContractGUI (props: ContractGUIProps) { return 'cannot encode empty arguments' } const multiJSON = JSON.parse('[' + multiString + ']') - let encodeObj - - if (props.evmBC) { - encodeObj = txFormat.encodeData(props.funcABI, multiJSON, props.evmBC) - } else { - encodeObj = txFormat.encodeData(props.funcABI, multiJSON, null) - } + const encodeObj = txFormat.encodeData(props.funcABI, multiJSON, null) if (encodeObj.error) { console.error(encodeObj.error) return encodeObj.error diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx index 740dfae507..3c791d1c1b 100644 --- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx +++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx @@ -36,7 +36,7 @@ export const TabsUI = (props: TabsUIProps) => { const classNameImg = 'my-1 mr-1 text-dark ' + tab.iconClass const classNameTab = 'nav-item nav-link d-flex justify-content-center align-items-center px-2 py-1 tab' + (index === currentIndexRef.current ? ' active' : '') return ( -
{ props.onSelect(index); currentIndexRef.current = index; setSelectedIndex(index) }} ref={el => { tabsRef.current[index] = el }} className={classNameTab} title={tab.tooltip}> +
{ tabsRef.current[index] = el }} className={classNameTab} title={tab.tooltip}> {tab.icon ? () : ()} {tab.title} { props.onClose(index); event.stopPropagation() }}> @@ -88,6 +88,11 @@ export const TabsUI = (props: TabsUIProps) => { tabsElement.current = domEl tabsElement.current.addEventListener('wheel', transformScroll) }} + onSelect={(index) => { + props.onSelect(index) + currentIndexRef.current = index + setSelectedIndex(index) + }} > {props.tabs.map((tab, i) => {renderTab(tab, i)})}