[core-v2.4.0-alpha.6, react-v2.2.3-alpha.4, vue v2.1.3-alpha.4] : Update - Refactor updateBalance within notification trigger (#1129)

* Refactor updateBalance within notification trigger
* Rename update-balances file to conform to kebab case

Author: Adamj1232

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.4.0-alpha.5",
+  "version": "2.4.0-alpha.6",
   "repository": "blocknative/web3-onboard",
   "scripts": {
     "build": "rollup -c",

packages/core/src/notify.ts

@@ -13,7 +13,7 @@ import type {
 import { validateTransactionHandlerReturn } from './validation'
 import { state } from './store'
 import { addNotification } from './store/actions'
-import updateBalances from './updateBalances'
+import updateBalances from './update-balances'
 
 export function handleTransactionUpdates(
   transaction: EthereumTransactionData
@@ -25,6 +25,10 @@ export function handleTransactionUpdates(
     throw invalid
   }
 
+  if (transaction.eventCode === 'txConfirmed') {
+    updateBalances([transaction.watchedAddress, transaction.counterparty])
+  }
+
   const notification = transactionEventToNotification(transaction, customized)
 
   addNotification(notification)
@@ -48,10 +52,6 @@ export function transactionEventToNotification(
 
   const type: NotificationType = eventToType(eventCode)
 
-  if (type === 'success') {
-    updateWalletBalance(transaction)
-  }
-
   const key = `${id || hash}-${
     (typeof customization === 'object' && customization.eventCode) || eventCode
   }`
@@ -167,29 +167,3 @@ export function typeToDismissTimeout(type: string): number {
   }
 }
 
-const updateWalletBalance = (
-  transaction: Pick<EthereumTransactionData, 'to' | 'from'>
-) => {
-  let walletsToUpdate: string[] = []
-  state.get().wallets.forEach(wallet => {
-    if (
-      wallet.accounts.some(
-        e => e.address.toLowerCase() === transaction.to.toLowerCase()
-      )
-    ) {
-      walletsToUpdate = [...walletsToUpdate, transaction.to]
-    }
-    if (
-      wallet.accounts.some(
-        e => e.address.toLowerCase() === transaction.from.toLowerCase()
-      )
-    ) {
-      walletsToUpdate = [...walletsToUpdate, transaction.from]
-    }
-  })
-
-  // Pause to allow provider endpoint time to update
-  setTimeout(() => {
-    updateBalances(walletsToUpdate)
-  }, 500)
-}

packages/core/src/updateBalances.ts renamed to packages/core/src/update-balances.ts

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@web3-onboard/coinbase": "^2.0.7",
-    "@web3-onboard/core": "^2.3.2",
+    "@web3-onboard/core": "^2.4.0-alpha.6",
     "@web3-onboard/dcent": "^2.0.4",
     "@web3-onboard/fortmatic": "^2.0.6",
     "@web3-onboard/gnosis": "^2.0.5",

packages/demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/react",
-  "version": "2.2.3-alpha.3",
+  "version": "2.2.3-alpha.4",
   "description": "Collection of React Hooks for web3-onboard",
   "repository": "blocknative/web3-onboard",
   "module": "dist/index.js",
@@ -24,7 +24,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/core": "^2.4.0-alpha.5",
+    "@web3-onboard/core": "^2.4.0-alpha.6",
     "@web3-onboard/common": "^2.1.4",
     "use-sync-external-store": "1.0.0"
   },

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/vue",
-  "version": "2.1.3-alpha.3",
+  "version": "2.1.3-alpha.4",
   "description": "Vue Composable for web3-onboard",
   "repository": "blocknative/web3-onboard",
   "module": "dist/index.js",
@@ -25,7 +25,7 @@
     "@vueuse/core": "^8.4.2",
     "@vueuse/rxjs": "^8.2.0",
     "@web3-onboard/common": "^2.1.4",
-    "@web3-onboard/core": "^2.4.0-alpha.5",
+    "@web3-onboard/core": "^2.4.0-alpha.6",
     "vue-demi": "^0.12.4"
   },
   "peerDependencies": {