diff --git a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx index 74f94eea10..3cfbd8f564 100644 --- a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx @@ -1,25 +1,27 @@ // eslint-disable-next-line no-use-before-define import { CustomTooltip } from '@remix-ui/helper' -import React, {useEffect} from 'react' +import React, {useEffect, useRef} from 'react' import { FormattedMessage } from 'react-intl' import { InstanceContainerProps } from '../types' import { UniversalDappUI } from './universalDappUI' export function InstanceContainerUI(props: InstanceContainerProps) { const { instanceList } = props.instances + const env = useRef() useEffect(() => { const fetchSavedContracts = async () => { - const allSavedContracts = localStorage.getItem('savedContracts') - if (allSavedContracts) { - const savedContracts = JSON.parse(allSavedContracts) - const { network } = await props.plugin.call('blockchain', 'getCurrentNetworkStatus') - if (network.id === ' - ') network.id = network.id.trim() // For VM, id is ' - ' - const env = await props.plugin.call('blockchain', 'getProvider') - if (savedContracts[env] && savedContracts[env][network.id]) { - const instances = savedContracts[env][network.id] - for (const inst of instances) - if (inst) await props.plugin.call('udapp', 'addSavedInstance', inst.address, inst.contractData.abi, inst.name, inst.savedOn) + env.current = await props.plugin.call('blockchain', 'getProvider') + if(env.current && env.current === 'injected') { + const allSavedContracts = localStorage.getItem('savedContracts') + if (allSavedContracts) { + const savedContracts = JSON.parse(allSavedContracts) + const { network } = await props.plugin.call('blockchain', 'getCurrentNetworkStatus') + if (savedContracts[env.current] && savedContracts[env.current][network.id]) { + const instances = savedContracts[env.current][network.id] + for (const inst of instances) + if (inst) await props.plugin.call('udapp', 'addSavedInstance', inst.address, inst.contractData.abi, inst.name, inst.savedOn) + } } } } @@ -32,41 +34,44 @@ export function InstanceContainerUI(props: InstanceContainerProps) { return (
-
- }> - - -
- {props.savedInstances.instanceList.length > 0 ? ( -
- {' '} - {props.savedInstances.instanceList.map((instance, index) => { - return ( - - ) - })} -
- ) : ( - - - - )} + { env.current && env.current === 'injected' ? ( +
+ }> + + +
) : null } + { env.current && env.current === 'injected' ? ( + props.savedInstances.instanceList.length > 0 ? ( +
+ {' '} + {props.savedInstances.instanceList.map((instance, index) => { + return ( + + ) + })} +
+ ) : ( + + + + ) + ) : null }
}> 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 d92a4390bc..afd68379e2 100644 --- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx +++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx @@ -52,7 +52,6 @@ export function UniversalDappUI(props: UdappProps) { }, [props.instance.contractData]) useEffect(() => { - console.log('props====>', props) if (props.instance.balance) { setInstanceBalance(props.instance.balance) }