Merge pull request argentlabs#668 from argentlabs/bugfix/sync-new-tra…

…nsactions
crypto-forks · May 24, 2022 · 92e1da4 · 92e1da4
2 parents 93590b9 + c654408
commit 92e1da4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/packages/extension/src/background/index.ts b/packages/extension/src/background/index.ts
@@ -218,15 +218,21 @@ import { Wallet, WalletStorageProps } from "./wallet"
         if (!selectedAccount) {
           throw Error("no accounts")
         }
-        const { amount, unit } = await starknetAccount.estimateFee(msg.data)
+        try {
+          const { amount, unit } = await starknetAccount.estimateFee(msg.data)
 
-        return sendToTabAndUi({
-          type: "ESTIMATE_TRANSACTION_FEE_RES",
-          data: {
-            amount: number.toHex(amount),
-            unit,
-          },
-        })
+          return sendToTabAndUi({
+            type: "ESTIMATE_TRANSACTION_FEE_RES",
+            data: {
+              amount: number.toHex(amount),
+              unit,
+            },
+          })
+        } catch {
+          return sendToTabAndUi({
+            type: "ESTIMATE_TRANSACTION_FEE_REJ",
+          })
+        }
       }
 
       case "UPDATE_TRANSACTION_FEE": {

diff --git a/packages/extension/src/background/transactions/transactions.ts b/packages/extension/src/background/transactions/transactions.ts
@@ -72,12 +72,15 @@ export const getTransactionsTracker: GetTransactionsTracker = async (
   const clearUpdate = setIntervalAsync(updateHandler, updateInterval)
 
   return {
-    add: (transaction) =>
-      transactionsStore.addItem({
-        status: "RECEIVED",
+    add: (transaction) => {
+      const newTransaction = {
+        status: "RECEIVED" as const,
         timestamp: timestampInSeconds(),
         ...transaction,
-      }),
+      }
+      onUpdate?.([newTransaction])
+      return transactionsStore.addItem(newTransaction)
+    },
     addAccount: async (account, transaction) => {
       if (
         !accounts.find((existingAccount) =>

diff --git a/packages/extension/src/shared/MessageType.ts b/packages/extension/src/shared/MessageType.ts
@@ -24,6 +24,7 @@ export type MessageType =
   | { type: "GET_ACCOUNTS" }
   | { type: "GET_ACCOUNTS_RES"; data: WalletAccount[] }
   | { type: "ESTIMATE_TRANSACTION_FEE"; data: Call | Call[] }
+  | { type: "ESTIMATE_TRANSACTION_FEE_REJ" }
   | {
       type: "ESTIMATE_TRANSACTION_FEE_RES"
       data: {