load dirName from state

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

@@ -167,10 +167,7 @@ export const setupEvents = (plugin: RunTab, dispatch: React.Dispatch<any>) => {
 }
 
 const loadPinnedContracts = async (plugin, dispatch, dirName) => {
-  console.log('loadPinnedContracts---->')
   await plugin.call('udapp', 'clearAllPinnedInstances')
-  // const { network } = await plugin.call('blockchain', 'getCurrentNetworkStatus')
-  // const dirName = plugin.REACT_API.networkName === 'VM' ? plugin.REACT_API.selectExEnv : network.id
   const isPinnedAvailable = await plugin.call('fileManager', 'exists', `.deploys/pinned-contracts/${dirName}`)
   if (isPinnedAvailable) {
     try {

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

@@ -113,13 +113,7 @@ export function UniversalDappUI(props: UdappProps) {
   }
 
   const unsavePinnedContract = async () => {
-    let dirName
+    await props.plugin.call('fileManager', 'remove', `.deploys/pinned-contracts/${props.plugin.REACT_API.chainId}/${props.instance.address}.json`)
-    if (props.plugin.REACT_API.networkName === 'VM') dirName = props.plugin.REACT_API.selectExEnv
-    else {
-      const {network} = await props.plugin.call('blockchain', 'getCurrentNetworkStatus')
-      dirName = network.id
-    }
-    await props.plugin.call('fileManager', 'remove', `.deploys/pinned-contracts/${dirName}/${props.instance.address}.json`)
   }
 
   const remove = async() => {
@@ -145,16 +139,10 @@ export function UniversalDappUI(props: UdappProps) {
       filePath: props.instance.filePath || `${workspace.name}/${props.instance.contractData.contract.file}`,
       pinnedAt: Date.now()
     }
-    let dirName
+    await props.plugin.call('fileManager', 'writeFile', `.deploys/pinned-contracts/${props.plugin.REACT_API.chainId}/${props.instance.address}.json`, JSON.stringify(objToSave, null, 2))
-    if (props.plugin.REACT_API.networkName === 'VM') dirName = props.plugin.REACT_API.selectExEnv
-    else {
-      const {network} = await props.plugin.call('blockchain', 'getCurrentNetworkStatus')
-      dirName = network.id
-    }
-    await props.plugin.call('fileManager', 'writeFile', `.deploys/pinned-contracts/${dirName}/${props.instance.address}.json`, JSON.stringify(objToSave, null, 2))
     // Add contract to saved contracts list on UI
     await props.plugin.call('udapp', 'addPinnedInstance', objToSave.address, objToSave.abi, objToSave.name, objToSave.pinnedAt, objToSave.filePath)
-    _paq.push(['trackEvent', 'udapp', 'pinContracts', `pinned at ${dirName}`])
+    _paq.push(['trackEvent', 'udapp', 'pinContracts', `pinned at ${props.plugin.REACT_API.chainId}`])
     // Remove contract from deployed contracts list on UI
     props.removeInstance(props.index, false, false)
   }