Merge pull request #491 from blocknative/fix/status-wallet-module

1.19.0-0.0.1: [fix] - Status Wallet Module

Author: lnbc1QWFyb24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.19.0",
+  "version": "1.19.0-0.0.1",
   "description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
   "keywords": [
     "ethereum",

src/interfaces.ts

@@ -274,8 +274,8 @@ interface LocaleLinks<T> {
   ja?: T
   ko?: T
   de?: T
-  zh?: T,
-  es?: T,
+  zh?: T
+  es?: T
 }
 
 interface ThemeParams {
@@ -307,7 +307,13 @@ export interface TorusOptions extends CommonWalletOptions {
   buttonPosition?: 'top-left' | 'top-right' | 'bottom-right' | 'bottom-left'
   modalZIndex?: number
   apiKey?: string
-  buildEnv?: 'production' | 'development' | 'binance' | 'testing' | 'lrc' | 'beta'
+  buildEnv?:
+    | 'production'
+    | 'development'
+    | 'binance'
+    | 'testing'
+    | 'lrc'
+    | 'beta'
   enableLogging?: boolean
   enabledVerifiers?: VerifierStatus
   loginConfig?: LoginConfig

src/modules/select/wallets/status.ts

@@ -12,15 +12,39 @@ function status(options: CommonWalletOptions): WalletModule {
     iconSrcSet: iconSrc,
     svg: svg || statusIcon,
     wallet: async (helpers: Helpers) => {
-      const { getProviderName, createModernProviderInterface } = helpers
+      const { getProviderName, getAddress, getBalance, getNetwork } = helpers
 
       const provider = (window as any).ethereum
+      let accountsApproved = false
 
       return {
         provider,
         interface:
           provider && getProviderName(provider) === 'Status'
-            ? createModernProviderInterface(provider)
+            ? {
+                connect: () =>
+                  provider
+                    .request({
+                      method: 'eth_requestAccounts'
+                    })
+                    .then(() => (accountsApproved = true)),
+                address: {
+                  get: () =>
+                    accountsApproved
+                      ? getAddress(provider)
+                      : Promise.resolve(null)
+                },
+                balance: {
+                  get: () =>
+                    accountsApproved
+                      ? getBalance(provider)
+                      : Promise.resolve(null)
+                },
+                network: {
+                  get: () => getNetwork(provider)
+                },
+                name: 'Status'
+              }
             : null
       }
     },

src/utilities.ts

@@ -148,24 +148,23 @@ export function createModernProviderInterface(provider: any): WalletInterface {
     balance: {
       get: () => getBalance(provider)
     },
-    connect: () =>
-      new Promise(
-        (resolve: () => void, reject: (err: { message: string }) => void) => {
-          const request = provider.request
-            ? getAddress(provider).then((address: string) => {
-                return address
-                  ? address
-                  : provider.request({ method: 'eth_requestAccounts' })
-              })
-            : provider.enable()
-
-          return request.then(resolve).catch(() =>
-            reject({
-              message: 'This dapp needs access to your account information.'
-            })
-          )
+    connect: async () => {
+      try {
+        if (provider.request) {
+          const result = await provider.request({
+            method: 'eth_requestAccounts'
+          })
+          return result
+        } else {
+          const result = await provider.enable()
+          return result
         }
-      ),
+      } catch (e) {
+        throw {
+          message: 'This dapp requires access to your account information.'
+        }
+      }
+    },
     name: getProviderName(provider)
   }
 }
@@ -193,7 +192,7 @@ export function getProviderName(provider: any): string | undefined {
   }
   if (provider.isDcentWallet) {
     return 'D\'CENT'
-  }  
+  }
   if (provider.isTokenPocket) {
     return 'TokenPocket'
   }