Skip to content

Commit fbeba77

Browse files
committed
Refactor connect function
1 parent 2bacec9 commit fbeba77

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

src/utilities.ts

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -148,24 +148,23 @@ export function createModernProviderInterface(provider: any): WalletInterface {
148148
balance: {
149149
get: () => getBalance(provider)
150150
},
151-
connect: () =>
152-
new Promise(
153-
(resolve: () => void, reject: (err: { message: string }) => void) => {
154-
const request = provider.request
155-
? getAddress(provider).then((address: string) => {
156-
return address
157-
? address
158-
: provider.request({ method: 'eth_requestAccounts' })
159-
})
160-
: provider.enable()
161-
162-
return request.then(resolve).catch(() =>
163-
reject({
164-
message: 'This dapp needs access to your account information.'
165-
})
166-
)
151+
connect: async () => {
152+
try {
153+
if (provider.request) {
154+
const result = await provider.request({
155+
method: 'eth_requestAccounts'
156+
})
157+
return result
158+
} else {
159+
const result = await provider.enable()
160+
return result
167161
}
168-
),
162+
} catch (e) {
163+
throw {
164+
message: 'This dapp requires access to your account information.'
165+
}
166+
}
167+
},
169168
name: getProviderName(provider)
170169
}
171170
}
@@ -193,7 +192,7 @@ export function getProviderName(provider: any): string | undefined {
193192
}
194193
if (provider.isDcentWallet) {
195194
return 'D\'CENT'
196-
}
195+
}
197196
if (provider.isTokenPocket) {
198197
return 'TokenPocket'
199198
}

0 commit comments

Comments
 (0)