From 41597bc02f454e731db19234520ca19dad9f9589 Mon Sep 17 00:00:00 2001
From: Georges KABBOUCHI <georges.kabbouchi@gmail.com>
Date: Sat, 21 Aug 2021 14:33:31 +0300
Subject: [PATCH] fix simulation

---
 composables/useDSA.ts      | 11 ++++++++---
 composables/useTenderly.ts | 11 ++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/composables/useDSA.ts b/composables/useDSA.ts
index 6163608..8fdc30e 100644
--- a/composables/useDSA.ts
+++ b/composables/useDSA.ts
@@ -28,15 +28,19 @@ export function useDSA() {
     }
   });
 
-  watch(dsa, async () => {
-    if (dsa.value) {
-      accounts.value = await dsa.value.getAccounts();
+  const refreshAccounts = async () => {
+    accounts.value = await dsa.value.getAccounts(account.value);
 
       if (accounts.value.length > 0) {
         activeAccount.value = accounts.value[0];
       } else {
         activeAccount.value = undefined;
       }
+  }
+
+  watch(dsa, async () => {
+    if (dsa.value) {
+      refreshAccounts()
     }
     //@ts-ignore
     window.dsa = dsa.value;
@@ -161,6 +165,7 @@ export function useDSA() {
 
   return {
     dsa,
+    refreshAccounts,
     activeAccount: readonly(activeAccount),
     accounts,
     createAccount,
diff --git a/composables/useTenderly.ts b/composables/useTenderly.ts
index ac7f86b..753615f 100644
--- a/composables/useTenderly.ts
+++ b/composables/useTenderly.ts
@@ -9,7 +9,7 @@ const forkId = ref(null);
 export function useTenderly() {
   const { $config } = useContext();
   const { setWeb3, refreshWeb3 } = useWeb3();
-  const { accounts } = useDSA();
+  const { accounts, refreshAccounts } = useDSA();
   const canSimulate = computed(
     () => $config.TENDERLY_FORK_PATH && $config.TENDERLY_KEY
   );
@@ -40,12 +40,13 @@ export function useTenderly() {
         })
       });
 
-      setForkId(data?.simulation_fork?.id);
+      await setForkId(data?.simulation_fork?.id);
       if (data?.simulation_fork?.id) {
-        addBalance();
+        await addBalance();
+        await refreshAccounts();
       }
     } catch (error) {
-      stopSimulation();
+      await stopSimulation();
     }
     loading.value = false;
   };
@@ -65,7 +66,7 @@ export function useTenderly() {
 
     forkId.value = null;
     window.localStorage.removeItem("forkId");
-    refreshWeb3();
+    await refreshWeb3();
     loading.value = false;
   };