From 35f3c9e55a38a091cc30efc07177edd84d61ff0e Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Mon, 11 Mar 2024 20:37:57 +0530
Subject: [PATCH] fix clearing

---
 .../lib/components/instanceContainerUI.tsx    |  3 ++-
 .../src/lib/components/universalDappUI.tsx    | 19 -------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

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 2d0c523c39..5e44f36b43 100644
--- a/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/instanceContainerUI.tsx
@@ -37,10 +37,11 @@ export function InstanceContainerUI(props: InstanceContainerProps) {
           }
           localStorage.removeItem('savedContracts')
         }
+        // Clear existing saved instance state
+        await props.plugin.call('udapp', 'clearAllSavedInstances')
         // Load contracts from FE
         const isPinnedAvailable = await props.plugin.call('fileManager', 'exists', `.deploys/pinned-contracts/${chainId.current}`)
         if (isPinnedAvailable) {
-          await props.plugin.call('udapp', 'clearAllSavedInstances')
           const list = await props.plugin.call('fileManager', 'readdir', `.deploys/pinned-contracts/${chainId.current}`)
           const filePaths = Object.keys(list)
           for (const file of filePaths) {
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 0833c0f90b..e2416ed973 100644
--- a/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/universalDappUI.tsx
@@ -139,9 +139,6 @@ export function UniversalDappUI(props: UdappProps) {
   const pinContract = async() => {
     const workspace = await props.plugin.call('filePanel', 'getCurrentWorkspace')
     const {network} = await props.plugin.call('blockchain', 'getCurrentNetworkStatus')
-    // const hasPreviousPinned = await this.call('fileManager', 'exists', `.deploys/upgradeable-contracts/${networkName}/UUPS.json`)
-
-    // const savedContracts = localStorage.getItem('savedContracts')
     let objToSave = {
       name: props.instance.name,
       address: props.instance.address,
@@ -149,23 +146,7 @@ export function UniversalDappUI(props: UdappProps) {
       filePath: props.instance.filePath || `${workspace.name}/${props.instance.contractData.contract.file}`,
       pinnedAt: Date.now()
     }
-    // if (!savedContracts) {
-    //   objToSave = {}
-    //   objToSave[network.id] = []
-    // } else {
-    //   objToSave = JSON.parse(savedContracts)
-    //   if (!objToSave[network.id]) {
-    //     objToSave[network.id] = []
-    //   }
-    // }
-    // const deployments = await this.call('fileManager', 'readFile', `.deploys/upgradeable-contracts/${networkName}/UUPS.json`)
-    // const hasPreviousDeploys = await this.call('fileManager', 'exists', `.deploys/upgradeable-contracts/${networkName}/UUPS.json`)
     await props.plugin.call('fileManager', 'writeFile', `.deploys/pinned-contracts/${network.id}/${props.instance.address}.json`, JSON.stringify(objToSave, null, 2))
-
-    // props.instance.savedOn = Date.now()
-    // props.instance.filePath = props.instance.filePath || `${workspace.name}/${props.instance.contractData.contract.file}`
-    // objToSave[network.id].push(props.instance)
-    // localStorage.setItem('savedContracts', JSON.stringify(objToSave))
     // Add contract to saved contracts list on UI
     await props.plugin.call('udapp', 'addSavedInstance', objToSave.address, objToSave.abi, objToSave.name, objToSave.pinnedAt, objToSave.filePath)
     _paq.push(['trackEvent', 'udapp', 'pinContracts', 'pinned'])