fix estimating fee issues

BibliothecaDAO · Oct 9, 2023 · 15107e2 · 15107e2 · vercel · Oct 9, 2023
1 parent 0fdd27f
commit 15107e2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/ui/src/app/containers/BeastScreen.tsx b/ui/src/app/containers/BeastScreen.tsx
@@ -91,7 +91,8 @@ export default function BeastScreen({ attack, flee }: BeastScreenProps) {
         adventurer?.beastHealth == 0 ||
         loading ||
         adventurer?.level == 1 ||
-        adventurer.dexterity === 0,
+        adventurer.dexterity === 0 ||
+        estimatingFee,
       loading: loading,
     },
     {
@@ -108,7 +109,8 @@ export default function BeastScreen({ attack, flee }: BeastScreenProps) {
         adventurer?.beastHealth == 0 ||
         loading ||
         adventurer?.level == 1 ||
-        adventurer.dexterity === 0,
+        adventurer.dexterity === 0 ||
+        estimatingFee,
       loading: loading,
     },
   ];

diff --git a/ui/src/app/lib/utils/syscalls.ts b/ui/src/app/lib/utils/syscalls.ts
@@ -60,24 +60,30 @@ async function checkArcadeBalance(
   if (ethBalance < FEE_CHECK_BALANCE) {
     const storage: BurnerStorage = Storage.get("burners");
     if (account && (account?.address ?? "0x0") in storage) {
-      setEstimatingFee(true);
-      const newAccount = new Account(
-        account,
-        account?.address,
-        storage[account?.address]["privateKey"],
-        "1"
-      );
-      const { suggestedMaxFee: estimatedFee } = await newAccount.estimateFee(
-        calls
-      );
-      // Add 10% to fee for safety
-      const formattedFee = estimatedFee * (BigInt(11) / BigInt(10));
-      setEstimatingFee(false);
-      if (ethBalance < formattedFee) {
-        showTopUpDialog(true);
-        setTopUpAccount(account?.address);
-        return true;
-      } else {
+      try {
+        setEstimatingFee(true);
+        const newAccount = new Account(
+          account,
+          account?.address,
+          storage[account?.address]["privateKey"],
+          "1"
+        );
+        const { suggestedMaxFee: estimatedFee } = await newAccount.estimateFee(
+          calls
+        );
+        // Add 10% to fee for safety
+        const formattedFee = estimatedFee * (BigInt(11) / BigInt(10));
+        setEstimatingFee(false);
+        if (ethBalance < formattedFee) {
+          showTopUpDialog(true);
+          setTopUpAccount(account?.address);
+          return true;
+        } else {
+          return false;
+        }
+      } catch (e) {
+        console.log(e);
+        setEstimatingFee(false);
         return false;
       }
     }