refactor: injected connector provider

wevm · Dec 30, 2021 · 0bff89a · 0bff89a
1 parent 37d39d1
commit 0bff89a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 31 deletions.
diff --git a/.changeset/silent-badgers-call.md b/.changeset/silent-badgers-call.md
@@ -0,0 +1,6 @@
+---
+'wagmi-private': patch
+'wagmi': patch
+---
+
+update injected connector
diff --git a/.github/workflows/size.yml b/.github/workflows/size.yml
diff --git a/docs/pages/docs/hooks/useSignMessage.mdx b/docs/pages/docs/hooks/useSignMessage.mdx
@@ -20,7 +20,7 @@ const App = () => {
 
   if (!data)
     return (
-      <button disabled={loading} onClick={() => await signMessage()}>
+      <button disabled={loading} onClick={async () => await signMessage()}>
         Sign message
       </button>
     )

diff --git a/packages/private/src/connectors/injectedConnector.ts b/packages/private/src/connectors/injectedConnector.ts
@@ -22,16 +22,13 @@ export class InjectedConnector extends Connector<
     typeof window !== 'undefined' && window.ethereum?.isMetaMask
       ? 'MetaMask'
       : 'Injected'
+  readonly provider = window?.ethereum
   readonly ready = typeof window !== 'undefined' && !!window.ethereum
 
   constructor(config?: { chains?: Chain[] }) {
     super({ ...config, options: undefined })
   }
 
-  get provider() {
-    return window?.ethereum
-  }
-
   async connect() {
     try {
       if (!this.provider) throw new ConnectorNotFoundError()

diff --git a/packages/react/src/hooks/accounts/useSignMessage.test.ts b/packages/react/src/hooks/accounts/useSignMessage.test.ts
@@ -52,9 +52,9 @@ describe('useSignMessage', () => {
 
         const res = await result.current.signMessage[1]()
         if (typeof res !== 'string') throw new Error('No signature')
-        const recovered = verifyNormalizedMessage(messageLookup.basic, res)
         const account =
           await result.current.connect[0].data.connector?.getAccount()
+        const recovered = verifyNormalizedMessage(messageLookup.basic, res)
         expect(account).toEqual(recovered)
       })
 
@@ -65,12 +65,12 @@ describe('useSignMessage', () => {
           "loading": false,
         }
       `)
+      const account =
+        await result.current.connect[0].data.connector?.getAccount()
       const recovered = verifyNormalizedMessage(
         messageLookup.basic,
         <any>result.current.signMessage[0]?.data,
       )
-      const account =
-        await result.current.connect[0].data.connector?.getAccount()
       expect(account).toEqual(recovered)
     })
 
@@ -85,9 +85,9 @@ describe('useSignMessage', () => {
           message: messageLookup.basic,
         })
         if (typeof res !== 'string') throw new Error('No signature')
-        const recovered = verifyNormalizedMessage(messageLookup.basic, res)
         const account =
           await result.current.connect[0].data.connector?.getAccount()
+        const recovered = verifyNormalizedMessage(messageLookup.basic, res)
         expect(account).toEqual(recovered)
       })
     })