From 073dc86a726fcf05a2c5b7fbfb2cc41d068c6b80 Mon Sep 17 00:00:00 2001
From: qwer951123 <qiuhao951@gmail.com>
Date: Thu, 27 Jul 2023 16:42:21 +0800
Subject: [PATCH] add to-promise func

---
 package.json                                | 2 +-
 packages/sdk/src/wallet/utils/to-promise.ts | 7 +++++++
 packages/sdk/src/wallet/wallet.ts           | 5 ++---
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 packages/sdk/src/wallet/utils/to-promise.ts

diff --git a/package.json b/package.json
index b347acfe..4dbf4319 100644
--- a/package.json
+++ b/package.json
@@ -35,5 +35,5 @@
     "typescript": "^5.0.4"
   },
   "packageManager": "yarn@3.5.0",
-  "stableVersion": "4.1.9-3"
+  "stableVersion": "4.1.9-4"
 }
diff --git a/packages/sdk/src/wallet/utils/to-promise.ts b/packages/sdk/src/wallet/utils/to-promise.ts
new file mode 100644
index 00000000..cc7f8f28
--- /dev/null
+++ b/packages/sdk/src/wallet/utils/to-promise.ts
@@ -0,0 +1,7 @@
+import { Observable, firstValueFrom, isObservable } from "rxjs";
+
+export function toPromise <T extends any>(a: Observable<T> | Promise<T>): Promise<T> {
+  if (isObservable(a)) return firstValueFrom(a);
+
+  return a;
+}
\ No newline at end of file
diff --git a/packages/sdk/src/wallet/wallet.ts b/packages/sdk/src/wallet/wallet.ts
index 3c86ce87..b4db2306 100644
--- a/packages/sdk/src/wallet/wallet.ts
+++ b/packages/sdk/src/wallet/wallet.ts
@@ -17,7 +17,6 @@ import {
 } from '@acala-network/sdk-core';
 import { BehaviorSubject, combineLatest, Observable, of, firstValueFrom } from 'rxjs';
 import { map, switchMap, filter, catchError } from 'rxjs/operators';
-import { FrameSystemAccountInfo } from '@polkadot/types/lookup';
 import { TokenRecord, WalletConsts, BalanceData, PresetTokens, WalletConfigs, PriceProviders } from './types';
 import { BelowExistentialDeposit, ChainType, Homa, Liquidity, SDKNotReady } from '..';
 import { getMaxAvailableBalance } from './utils/get-max-available-balance';
@@ -36,6 +35,7 @@ import { AcalaTokenProvider } from './token-provider/acala';
 import { DIDWeb3Name } from './web3name/did';
 import { subscribeLiquidCrowdloanTokenPrice } from './utils/get-liquid-crowdloan-token-price';
 import { Vesting } from './vesting';
+import { toPromise } from './utils/to-promise';
 
 export class Wallet implements BaseSDK {
   private api: AnyApi;
@@ -358,9 +358,8 @@ export class Wallet implements BaseSDK {
   public async checkTransfer(address: string, currency: MaybeCurrency, amount: FN, direction: 'from' | 'to' = 'to') {
     const { nativeToken } = this.getPresetTokens();
     const token = this.getToken(currency);
-    const tokenName = forceToCurrencyName(currency);
     const isNativeToken = nativeToken.isEqual(token);
-    const accountInfo = (await this.api.query.system.account(address)) as unknown as FrameSystemAccountInfo;
+    const accountInfo = await toPromise(this.api.query.system.account(address));
     const balance = await this.getBalance(currency, address);
 
     let needCheck = true;