Skip to content

Commit cb7be61

Browse files
joeizangAniket-Engg
authored andcommitted
simplify implementation for lowlevel icon
1 parent 6090c82 commit cb7be61

File tree

8 files changed

+7
-55
lines changed

8 files changed

+7
-55
lines changed

libs/remix-ui/run-tab/src/lib/actions/account.ts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,3 @@ export const signMessageWithAddress = (plugin: RunTab, dispatch: React.Dispatch<
101101
dispatch(displayNotification('Signed Message', modalContent(msgHash, signedData), 'OK', null, () => {}, null))
102102
})
103103
}
104-
105-
export const extractCompilerVersion = (runTab: RunTabState, dispatch: React.Dispatch<any>) =>
106-
{
107-
const runtabState = Object.entries(runTab['contracts'] ?? {})
108-
const contractList = runtabState[0] ?? {}
109-
const contractNameHolder = runtabState[4] ?? ['currentName', '']
110-
const contractName = contractNameHolder[1] ?? ''
111-
const currentObj = contractList[1] ?? {}
112-
const currObjDetails = currentObj[contractName as string] ?? {}
113-
const currObjDetailsLength = currObjDetails.length -1
114-
const alias = currObjDetails[currObjDetailsLength]['alias'] ?? ''
115-
const serializeTarget = currObjDetails[currObjDetailsLength]?.compiler?.data?.contracts[contractName as string][alias]?.metadata ?? ''
116-
const obj = (serializeTarget as string).length > 0 ? JSON.parse(serializeTarget) : {}
117-
const version = obj?.compiler?.version ?? ''
118-
const compilerVersion = `v${version?.split('+commit')[0]}` ?? 'v'
119-
dispatch({ type: 'EXTRACT_COMPILER_VERSION', payload: {compilerVersion, runTab }})
120-
}

libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,6 @@ export function ContractDropdownUI(props: ContractDropdownProps) {
481481
isValidProxyUpgrade={isValidProxyUpgrade}
482482
modal={props.modal}
483483
disabled={props.selectedAccount === ''}
484-
dispatch={props.stateDispatch}
485-
runTabState={props.runTabState}
486484
/>
487485
<div className="d-flex py-1 align-items-center custom-control custom-checkbox">
488486
<input

libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {ContractGUIProps} from '../types'
66
import {CopyToClipboard} from '@remix-ui/clipboard'
77
import {CustomTooltip, ProxyAddressToggle, ProxyDropdownMenu, shortenDate, shortenProxyAddress, unavailableProxyLayoutMsg, upgradeReportMsg} from '@remix-ui/helper'
88
import {Dropdown} from 'react-bootstrap'
9-
import { extractCompilerVersion } from '../actions/account'
109

1110
const txFormat = remixLib.execution.txFormat
1211
const txHelper = remixLib.execution.txHelper
@@ -174,7 +173,6 @@ export function ContractGUI(props: ContractGUIProps) {
174173
}
175174

176175
const handleActionClick = async () => {
177-
extractCompilerVersion(props.runTabState, props.dispatch)
178176
if (deployState.deploy) {
179177
const proxyInitializeString = getMultiValsString(initializeFields.current)
180178
props.clickCallBack(props.initializerOptions.inputs.inputs, proxyInitializeString, ['Deploy with Proxy'])

libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
3939
{props.instances.instanceList.map((instance, index) => {
4040
return (
4141
<UniversalDappUI
42-
state={props.state}
4342
key={index}
4443
instance={instance}
4544
context={props.getContext()}

libs/remix-ui/run-tab/src/lib/components/lowlevelInteractionIcon.tsx

Lines changed: 0 additions & 22 deletions
This file was deleted.

libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {ContractGUI} from './contractGUI'
1010
import {TreeView, TreeViewItem} from '@remix-ui/tree-view'
1111
import {BN} from 'bn.js'
1212
import {CustomTooltip, is0XPrefixed, isHexadecimal, isNumeric, shortenAddress} from '@remix-ui/helper'
13-
import { LowLevelInteractionIcon } from './lowlevelInteractionIcon'
1413

1514
const txHelper = remixLib.execution.txHelper
1615

@@ -25,6 +24,8 @@ export function UniversalDappUI(props: UdappProps) {
2524
const [evmBC, setEvmBC] = useState(null)
2625
const [instanceBalance, setInstanceBalance] = useState(0)
2726

27+
const getVersion = () => window.location.href.split('=')[5].split('+')[0].split('-')[1]
28+
2829
useEffect(() => {
2930
if (!props.instance.abi) {
3031
const abi = txHelper.sortAbiFunction(props.instance.contractData.abi)
@@ -285,7 +286,11 @@ export function UniversalDappUI(props: UdappProps) {
285286
<div className="py-2 border-top d-flex justify-content-start flex-grow-1">
286287
<FormattedMessage id="udapp.lowLevelInteractions" />
287288
</div>
288-
<LowLevelInteractionIcon plugin={props.state} />
289+
<CustomTooltip placement={'bottom-end'} tooltipClasses="text-wrap" tooltipId="receiveEthDocstoolTip" tooltipText={<FormattedMessage id="udapp.tooltipText8" />}>
290+
<a href={`https://solidity.readthedocs.io/en/${getVersion()}/contracts.html#receive-ether-function`} target="_blank" rel="noreferrer">
291+
<i aria-hidden="true" className="fas fa-info my-2 mr-1"></i>
292+
</a>
293+
</CustomTooltip>
289294
</div>
290295
<div className="d-flex flex-column align-items-start">
291296
<label className="">CALLDATA</label>

libs/remix-ui/run-tab/src/lib/run-tab.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,6 @@ export function RunTabUI(props: RunTabProps) {
299299
isValidProxyAddress={isValidProxyAddress}
300300
isValidProxyUpgrade={isValidProxyUpgrade}
301301
proxy={runTab.proxy}
302-
stateDispatch={dispatch}
303-
runTabState={runTab}
304302
/>
305303
<RecorderUI
306304
plugin={plugin}
@@ -324,7 +322,6 @@ export function RunTabUI(props: RunTabProps) {
324322
runTransactions={executeTransactions}
325323
sendValue={runTab.sendValue}
326324
getFuncABIInputs={getFuncABIValues}
327-
state={runTab}
328325
/>
329326
</div>
330327
</div>

libs/remix-ui/run-tab/src/lib/types/index.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,6 @@ export type MainnetPrompt = (
225225
) => JSX.Element
226226

227227
export interface ContractDropdownProps {
228-
stateDispatch: React.Dispatch<any>,
229-
runTabState: RunTabState,
230228
selectedAccount: string,
231229
exEnvironment: string,
232230
contracts: {
@@ -286,7 +284,6 @@ export interface RecorderProps {
286284
}
287285

288286
export interface InstanceContainerProps {
289-
state: RunTabState,
290287
instances: {
291288
instanceList: {
292289
contractData?: ContractData,
@@ -373,8 +370,6 @@ export interface ContractGUIProps {
373370
isValidProxyAddress?: (address: string) => Promise<boolean>,
374371
isValidProxyUpgrade?: (proxyAddress: string) => Promise<LayoutCompatibilityReport | { ok: boolean, pass: boolean, warning: boolean }>,
375372
modal?: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void, okBtnClass?: string, cancelBtnClass?: string) => void
376-
dispatch?: React.Dispatch<any>
377-
runTabState?: RunTabState
378373
}
379374
export interface MainnetProps {
380375
network: Network,
@@ -402,7 +397,6 @@ export interface UdappProps {
402397
decodedResponse?: Record<number, any>,
403398
abi?: any
404399
},
405-
state: RunTabState,
406400
context: 'memory' | 'blockchain',
407401
removeInstance: (index: number) => void,
408402
index: number,

0 commit comments

Comments
 (0)