🏃‍♀️ Activate browser wallet check options type in runtime (#1014)

TrueFiEng · Oct 31, 2022 · 50d1ac2 · 50d1ac2 · github-actions · Oct 31, 2022
1 parent 14c271f
commit 50d1ac2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/.changeset/tidy-turtles-taste.md b/.changeset/tidy-turtles-taste.md
@@ -0,0 +1,5 @@
+---
+'@usedapp/core': patch
+---
+
+Safely handle invalid runtime parameters in `activateBrowserWallet`
diff --git a/packages/core/src/providers/network/connectors/context.tsx b/packages/core/src/providers/network/connectors/context.tsx
@@ -76,7 +76,14 @@ export function ConnectorContextProvider({ children }: ConnectorContextProviderP
   )
 
   const activateBrowserWallet: ActivateBrowserWallet = useCallback(
-    async ({ type } = { type: 'metamask' }) => {
+    async (options) => {
+      // done for backward compatibility.
+      // If the options object looks like an event object or is undefined,
+      // it's not a valid option and will be ignored
+      if (!options || typeof (options as any).preventDefault === 'function') {
+        options = { type: 'metamask' }
+      }
+      const { type } = options
       if (!connectors[type]) {
         throw new Error(`Connector ${type} is not configured`)
       }

diff --git a/packages/example/playwright/without-metamask.ts b/packages/example/playwright/without-metamask.ts
@@ -100,10 +100,10 @@ export const withoutMetamaskTest = (baseUrl: string) => {
         await page.goto(`${baseUrl}multichain`)
 
         await waitForExpect(async () => {
-          expect(await page.isVisible(XPath.text('span', 'Chain id:', 4))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 4))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 4))).to.be.true
-          expect(await page.isVisible(XPath.text('span', 'Current block:', 4))).to.be.true
+          expect(await page.isVisible(XPath.text('span', 'Chain id:', 2))).to.be.true
+          expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 2))).to.be.true
+          expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 2))).to.be.true
+          expect(await page.isVisible(XPath.text('span', 'Current block:', 2))).to.be.true
         })
       })
     })