enable save for each env except VM

pull/4595/head
aniket-engg 11 months ago committed by Aniket
parent 94dd13f0e4
commit 167e38e77d
  1. 15
      libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
  2. 17
      libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx

@ -1,18 +1,19 @@
// eslint-disable-next-line no-use-before-define
import { CustomTooltip } from '@remix-ui/helper'
import React, {useEffect, useRef} from 'react'
import React, {useEffect, useRef, useState} 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()
const enableSave = useRef(false)
useEffect(() => {
const fetchSavedContracts = async () => {
env.current = await props.plugin.call('blockchain', 'getProvider')
if(env.current && env.current === 'injected') {
if (props.plugin.REACT_API.selectExEnv && props.plugin.REACT_API.selectExEnv.startsWith('vm-')) enableSave.current = false
else enableSave.current = true
if (enableSave.current) {
const allSavedContracts = localStorage.getItem('savedContracts')
if (allSavedContracts) {
await props.plugin.call('udapp', 'clearAllSavedInstances')
@ -27,7 +28,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
}
}
fetchSavedContracts()
}, [props.plugin.REACT_API.networkName])
}, [props.plugin.REACT_API.selectExEnv, props.plugin.REACT_API.networkName])
const clearInstance = () => {
props.clearInstances()
@ -35,7 +36,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
return (
<div className="udapp_instanceContainer mt-3 border-0 list-group-item">
{ env.current && env.current === 'injected' ? (
{ enableSave.current ? (
<div className="d-flex justify-content-between align-items-center pl-2">
<CustomTooltip placement="top-start" tooltipClasses="text-nowrap" tooltipId="deployAndRunClearInstancesTooltip" tooltipText={<FormattedMessage id="udapp.tooltipText6" />}>
<label className="udapp_deployedContracts">
@ -43,7 +44,7 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
</label>
</CustomTooltip>
</div>) : null }
{ env.current && env.current === 'injected' ? (
{ enableSave.current ? (
props.savedInstances.instanceList.length > 0 ? (
<div>
{' '}

@ -23,7 +23,7 @@ export function UniversalDappUI(props: UdappProps) {
const [calldataValue, setCalldataValue] = useState<string>('')
const [evmBC, setEvmBC] = useState(null)
const [instanceBalance, setInstanceBalance] = useState(0)
const env = useRef()
// const env = useRef()
const getVersion = () => window.location.href.split('=')[5].split('+')[0].split('-')[1]
@ -58,12 +58,13 @@ export function UniversalDappUI(props: UdappProps) {
}
}, [props.instance.balance])
useEffect(() => {
const getEnv = async () => {
env.current = await props.plugin.call('blockchain', 'getProvider')
}
getEnv()
}, [])
// useEffect(() => {
// console.log('props----->', props)
// const getEnv = async () => {
// env.current = await props.plugin.call('blockchain', 'getProvider')
// }
// getEnv()
// }, [props.plugin.REACT_API.selectExEnv])
const sendData = () => {
setLlIError('')
@ -272,7 +273,7 @@ export function UniversalDappUI(props: UdappProps) {
<div className="btn" style={{padding: '0.15rem'}}>
<CopyToClipboard tip={intl.formatMessage({id: 'udapp.copy'})} content={address} direction={'top'} />
</div>
{ !props.isSavedContract && env.current === 'injected' ? ( <div className="btn" style={{padding: '0.15rem', marginLeft: '-0.5rem'}}>
{ !props.isSavedContract || (props.plugin.REACT_API.selectExEnv && props.plugin.REACT_API.selectExEnv.startsWith('vm-')) ? ( <div className="btn" style={{padding: '0.15rem', marginLeft: '-0.5rem'}}>
<CustomTooltip placement="top" tooltipClasses="text-nowrap" tooltipId="udapp_udappSaveTooltip" tooltipText={<FormattedMessage id="udapp.tooltipText14" />}>
<i className="far fa-save p-2" aria-hidden="true" data-id="universalDappUiUdappSave" onClick={saveContract}></i>
</CustomTooltip>

Loading…
Cancel
Save