Skip to content

Commit 51f5e3a

Browse files
committed
Use getBalance function
1 parent 8aca4b4 commit 51f5e3a

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

.prettierrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
"tabWidth": 2,
44
"useTabs": false,
55
"semi": false,
6-
"singleQuote": true
6+
"singleQuote": true,
7+
"trailingComma": "none",
8+
"arrowParens": "avoid"
79
}

src/modules/select/wallets/imtoken.ts

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function imtoken(
1313
iconSrc,
1414
svg: svg || imTokenIcon,
1515
wallet: async (helpers: Helpers) => {
16-
const { getProviderName } = helpers
16+
const { getProviderName, getBalance } = helpers
1717
const imTokenProvider = (window as any).ethereum
1818
const isImToken = getProviderName(imTokenProvider) === 'imToken'
1919
let createProvider
@@ -34,11 +34,11 @@ function imtoken(
3434
imTokenProvider && isImToken
3535
? {
3636
address: {
37-
get: () => Promise.resolve(imTokenProvider.selectedAddress),
37+
get: () => Promise.resolve(imTokenProvider.selectedAddress)
3838
},
3939
network: {
4040
get: () =>
41-
Promise.resolve(Number(imTokenProvider.networkVersion)),
41+
Promise.resolve(Number(imTokenProvider.networkVersion))
4242
},
4343
balance: {
4444
get: () => {
@@ -52,27 +52,20 @@ function imtoken(
5252
return Promise.resolve(null)
5353
}
5454

55-
const params = {
56-
jsonrpc: '2.0',
57-
method: 'eth_getBalance',
58-
params: [imTokenProvider.selectedAddress, 'latest'],
59-
id: 42,
60-
}
61-
62-
return provider.sendAsync(params)
63-
},
55+
return getBalance(provider, imTokenProvider.selectedAddress)
56+
}
6457
},
6558
name: getProviderName(imTokenProvider),
66-
connect: () => imTokenProvider.enable(),
59+
connect: () => imTokenProvider.enable()
6760
}
68-
: null,
61+
: null
6962
}
7063
},
7164
type: 'injected',
7265
link: `imtokenv2://navigate?screen=DappView&url=${window.location.href}`,
7366
installMessage: mobileWalletInstallMessage,
7467
mobile: true,
75-
preferred,
68+
preferred
7669
}
7770
}
7871

src/utilities.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,12 @@ export function getAddress(provider: any): Promise<string | any> {
5353
})
5454
}
5555

56-
export function getBalance(provider: any): Promise<string | any> {
56+
export function getBalance(
57+
provider: any,
58+
address?: string
59+
): Promise<string | any> {
5760
return new Promise(async (resolve, reject) => {
58-
const currentAddress = await getAddress(provider)
61+
const currentAddress = address || (await getAddress(provider))
5962

6063
if (!currentAddress) {
6164
resolve(null)

0 commit comments

Comments
 (0)