From ba1bfcbc9959db436104141768b99b6e14b07d96 Mon Sep 17 00:00:00 2001
From: 0xKheops <26880866+0xKheops@users.noreply.github.com>
Date: Tue, 21 Jan 2025 18:20:45 +0900
Subject: [PATCH 1/4] fix: unawaited promise in chaindata provider

---
 packages/chaindata-provider/src/util.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/chaindata-provider/src/util.ts b/packages/chaindata-provider/src/util.ts
index d2647106a2..23704ec9f4 100644
--- a/packages/chaindata-provider/src/util.ts
+++ b/packages/chaindata-provider/src/util.ts
@@ -106,16 +106,19 @@ export const customTokensFilter = (tokens: Token[]) =>
 type ObservableReturnType<O> = O extends Observable<infer T> ? T : O
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const wrapObservableWithGetter = async <O extends Observable<any>>(
+export const wrapObservableWithGetter = <O extends Observable<any>>(
   errorReason: string,
   observable: O,
 ): Promise<ObservableReturnType<O>> => {
-  return await withErrorReason(errorReason, () => firstValueFrom(observable))
+  return withErrorReason(errorReason, () => firstValueFrom(observable))
 }
 
-export const withErrorReason = <T>(reason: string, task: () => T): T => {
+export const withErrorReason = async <T>(
+  reason: string,
+  task: () => Promise<T> | T,
+): Promise<T> => {
   try {
-    return task()
+    return await task()
   } catch (cause) {
     throw new Error(reason, { cause })
   }

From bce779190a0fabe1f354a0a09c04daf507dc5ba9 Mon Sep 17 00:00:00 2001
From: 0xKheops <26880866+0xKheops@users.noreply.github.com>
Date: Tue, 21 Jan 2025 18:23:01 +0900
Subject: [PATCH 2/4] fix: null check in balance pool

---
 packages/extension-core/src/domains/balances/pool.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/extension-core/src/domains/balances/pool.ts b/packages/extension-core/src/domains/balances/pool.ts
index f0d250a786..f8693410e3 100644
--- a/packages/extension-core/src/domains/balances/pool.ts
+++ b/packages/extension-core/src/domains/balances/pool.ts
@@ -76,7 +76,7 @@ const getActiveStuff = <T extends { isTestnet?: boolean }, A extends Record<stri
   return combineLatest([dataObservable, activeStoreObservable, settingsStore.observable]).pipe(
     map(([data, active, { useTestnets }]) => {
       return data
-        .filter((item) => isActiveFn(item, active))
+        .filter((item) => !!item && isActiveFn(item, active))
         .filter((item) => (useTestnets ? true : !item.isTestnet))
     }),
   )

From dcc541396cb838bef646e50ec73bb9a43279cfc0 Mon Sep 17 00:00:00 2001
From: 0xKheops <26880866+0xKheops@users.noreply.github.com>
Date: Wed, 22 Jan 2025 09:53:15 +0900
Subject: [PATCH 3/4] fix: unawaited promise

---
 .changeset/fuzzy-penguins-promise.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/fuzzy-penguins-promise.md

diff --git a/.changeset/fuzzy-penguins-promise.md b/.changeset/fuzzy-penguins-promise.md
new file mode 100644
index 0000000000..7ad77e037c
--- /dev/null
+++ b/.changeset/fuzzy-penguins-promise.md
@@ -0,0 +1,5 @@
+---
+"@talismn/chaindata-provider": patch
+---
+
+fix: unawaited promise

From 912046b4e5ef3ea16435d368debe40ad9c7fa141 Mon Sep 17 00:00:00 2001
From: alecdwm <2741569+alecdwm@users.noreply.github.com>
Date: Wed, 22 Jan 2025 07:02:56 +0000
Subject: [PATCH 4/4] chore: add async await back to wrapObservableWithGetter

---
 packages/chaindata-provider/src/util.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/chaindata-provider/src/util.ts b/packages/chaindata-provider/src/util.ts
index 23704ec9f4..974cce165d 100644
--- a/packages/chaindata-provider/src/util.ts
+++ b/packages/chaindata-provider/src/util.ts
@@ -106,11 +106,11 @@ export const customTokensFilter = (tokens: Token[]) =>
 type ObservableReturnType<O> = O extends Observable<infer T> ? T : O
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const wrapObservableWithGetter = <O extends Observable<any>>(
+export const wrapObservableWithGetter = async <O extends Observable<any>>(
   errorReason: string,
   observable: O,
 ): Promise<ObservableReturnType<O>> => {
-  return withErrorReason(errorReason, () => firstValueFrom(observable))
+  return await withErrorReason(errorReason, () => firstValueFrom(observable))
 }
 
 export const withErrorReason = async <T>(