chore: enable wallet features by default (#2382)

Co-authored-by: enesozturk <[email protected]>
reown-com · Jun 11, 2024 · e900656 · e900656
1 parent 8b10b51
commit e900656
Show file tree

Hide file tree

Showing 31 changed files with 246 additions and 159 deletions.
diff --git a/apps/demo/package.json b/apps/demo/package.json
@@ -21,7 +21,7 @@
     "tailwind-merge": "2.2.1",
     "vaul": "0.9.0",
     "viem": "2.10.3",
-    "wagmi": "2.9.9",
+    "wagmi": "2.9.10",
     "zustand": "4.5.2"
   },
   "devDependencies": {

diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json
@@ -49,7 +49,7 @@
     "@walletconnect/utils": "2.13.1",
     "valtio": "1.11.2",
     "viem": "2.10.3",
-    "wagmi": "2.9.9",
+    "wagmi": "2.9.10",
     "@wagmi/connectors": "5.0.8"
   },
   "devDependencies": {

diff --git a/apps/laboratory/src/pages/library/ethers-all.tsx b/apps/laboratory/src/pages/library/ethers-all.tsx
@@ -26,8 +26,7 @@ const modal = createWeb3Modal({
   privacyPolicyUrl: 'https://walletconnect.com/privacy',
   siweConfig,
   enableOnramp: true,
-  customWallets: ConstantsUtil.CustomWallets,
-  enableWalletFeatures: true
+  customWallets: ConstantsUtil.CustomWallets
 })
 
 ThemeStore.setModal(modal)

diff --git a/apps/laboratory/src/pages/library/ethers-wallet.tsx b/apps/laboratory/src/pages/library/ethers-wallet.tsx
diff --git a/apps/laboratory/src/pages/library/wagmi-all.tsx b/apps/laboratory/src/pages/library/wagmi-all.tsx
@@ -23,8 +23,7 @@ const modal = createWeb3Modal({
   privacyPolicyUrl: 'https://walletconnect.com/privacy',
   siweConfig,
   enableOnramp: true,
-  customWallets: ConstantsUtil.CustomWallets,
-  enableWalletFeatures: true
+  customWallets: ConstantsUtil.CustomWallets
 })
 
 ThemeStore.setModal(modal)

diff --git a/apps/laboratory/src/pages/library/wagmi-wallet.tsx b/apps/laboratory/src/pages/library/wagmi-wallet.tsx
diff --git a/apps/laboratory/src/utils/DataUtil.ts b/apps/laboratory/src/utils/DataUtil.ts
@@ -30,14 +30,9 @@ export const wagmiSdkOptions = [
     description: 'Configuration using wagmi and implementing sign in with ethereum'
   },
   {
-    title: 'Email',
+    title: 'Email & Social',
     link: '/library/wagmi-email/',
-    description: 'Configuration using wagmi and implementing email login'
-  },
-  {
-    title: 'Wallet',
-    link: '/library/wagmi-wallet/',
-    description: 'Configuration using wagmi and implementing social wallet'
+    description: 'Configuration using wagmi and implementing email and social login'
   }
 ]
 
@@ -53,14 +48,9 @@ export const ethersSdkOptions = [
     description: 'Configuration using ethers and implementing sign in with ethereum'
   },
   {
-    title: 'Email',
+    title: 'Email and Social',
     link: '/library/ethers-email/',
-    description: 'Configuration using ethers and implementing email login'
-  },
-  {
-    title: 'Wallet',
-    link: '/library/ethers-wallet/',
-    description: 'Configuration using ethers and implementing social wallet'
+    description: 'Configuration using ethers and implementing email and social login'
   }
 ]
 

diff --git a/apps/laboratory/tests/email.spec.ts b/apps/laboratory/tests/email.spec.ts
@@ -1,6 +1,8 @@
 import { expect } from '@playwright/test'
 import { testMEmail } from './shared/fixtures/w3m-email-fixture'
 import { SECURE_WEBSITE_URL } from './shared/constants'
+import type { ModalWalletPage } from './shared/pages/ModalWalletPage'
+import type { ModalWalletValidator } from './shared/validators/ModalWalletValidator'
 
 testMEmail.beforeEach(async ({ modalValidator }) => {
   await modalValidator.expectConnected()
@@ -26,23 +28,33 @@ testMEmail('it should reject sign', async ({ modalPage, modalValidator }) => {
 
 testMEmail('it should switch network and sign', async ({ modalPage, modalValidator }) => {
   let targetChain = 'Polygon'
-  await modalPage.switchNetwork(targetChain)
-  await modalValidator.expectSwitchedNetwork(targetChain)
-  await modalPage.closeModal()
-  await modalPage.sign()
-  await modalPage.approveSign()
-  await modalValidator.expectAcceptedSign()
+  const walletModalPage = modalPage as ModalWalletPage
+  const walletModalValidator = modalValidator as ModalWalletValidator
+  await walletModalPage.openAccount()
+  await walletModalPage.openSettings()
+  await walletModalPage.switchNetwork(targetChain)
+  await walletModalValidator.expectSwitchedNetwork(targetChain)
+  await walletModalPage.closeModal()
+  await walletModalPage.sign()
+  await walletModalPage.approveSign()
+  await walletModalValidator.expectAcceptedSign()
 
   targetChain = 'Ethereum'
-  await modalPage.switchNetwork(targetChain)
-  await modalValidator.expectSwitchedNetwork(targetChain)
-  await modalPage.closeModal()
-  await modalPage.sign()
-  await modalPage.approveSign()
-  await modalValidator.expectAcceptedSign()
+  await walletModalPage.openAccount()
+  await walletModalPage.openSettings()
+  await walletModalPage.switchNetwork(targetChain)
+  await walletModalValidator.expectSwitchedNetwork(targetChain)
+  await walletModalPage.closeModal()
+  await walletModalPage.sign()
+  await walletModalPage.approveSign()
+  await walletModalValidator.expectAcceptedSign()
 })
 
 testMEmail('it should disconnect correctly', async ({ modalPage, modalValidator }) => {
-  await modalPage.disconnect()
-  await modalValidator.expectDisconnected()
+  const walletModalPage = modalPage as ModalWalletPage
+  const walletModalValidator = modalValidator as ModalWalletValidator
+  await walletModalPage.openAccount()
+  await walletModalPage.openSettings()
+  await walletModalPage.disconnect()
+  await walletModalValidator.expectDisconnected()
 })
diff --git a/apps/laboratory/tests/shared/fixtures/w3m-email-fixture.ts b/apps/laboratory/tests/shared/fixtures/w3m-email-fixture.ts
@@ -1,6 +1,4 @@
 import type { ModalFixture } from './w3m-fixture'
-import { ModalPage } from '../pages/ModalPage'
-import { ModalValidator } from '../validators/ModalValidator'
 import { Email } from '../utils/email'
 import { ModalWalletValidator } from '../validators/ModalWalletValidator'
 import { timingFixture } from './timing-fixture'
@@ -9,7 +7,7 @@ import { ModalWalletPage } from '../pages/ModalWalletPage'
 export const testMEmail = timingFixture.extend<ModalFixture>({
   library: ['wagmi', { option: true }],
   modalPage: async ({ page, library, context }, use, testInfo) => {
-    const modalPage = new ModalPage(page, library, 'email')
+    const modalPage = new ModalWalletPage(page, library, 'email')
     await modalPage.load()
 
     const mailsacApiKey = process.env['MAILSAC_API_KEY']
@@ -23,7 +21,7 @@ export const testMEmail = timingFixture.extend<ModalFixture>({
     await use(modalPage)
   },
   modalValidator: async ({ modalPage }, use) => {
-    const modalValidator = new ModalValidator(modalPage.page)
+    const modalValidator = new ModalWalletValidator(modalPage.page)
     await use(modalValidator)
   }
 })

diff --git a/apps/laboratory/tests/shared/pages/ModalPage.ts b/apps/laboratory/tests/shared/pages/ModalPage.ts
@@ -218,6 +218,8 @@ export class ModalPage {
 
   async clickWalletUpgradeCard(context: BrowserContext) {
     await this.page.getByTestId('account-button').click()
+
+    await this.page.getByTestId('w3m-profile-button').click()
     await this.page.getByTestId('w3m-wallet-upgrade-card').click()
 
     const page = await doActionAndWaitForNewPage(

diff --git a/apps/laboratory/tests/shared/pages/ModalWalletPage.ts b/apps/laboratory/tests/shared/pages/ModalWalletPage.ts
@@ -7,7 +7,7 @@ export class ModalWalletPage extends ModalPage {
   constructor(
     public override readonly page: Page,
     public override readonly library: string,
-    public override readonly flavor: 'wallet' | 'all' = 'wallet'
+    public override readonly flavor: 'email' | 'all' = 'email'
   ) {
     super(page, library, flavor)
   }

diff --git a/apps/laboratory/tests/shared/validators/ModalValidator.ts b/apps/laboratory/tests/shared/validators/ModalValidator.ts
@@ -84,7 +84,6 @@ export class ModalValidator {
     // We use Chakra Toast and it's not quite straightforward to set the `data-testid` attribute on the toast element.
     await expect(this.page.getByText(ConstantsUtil.SigningFailedToastTitle)).toBeVisible()
   }
-
   async expectSwitchedNetwork(network: string) {
     const switchNetworkButton = this.page.getByTestId('w3m-account-select-network')
     await expect(switchNetworkButton).toBeVisible()

diff --git a/apps/laboratory/tests/siwe-email.spec.ts b/apps/laboratory/tests/siwe-email.spec.ts
@@ -30,7 +30,7 @@ testMEmailSiwe('it should switch network and sign', async ({ modalPage, modalVal
   await modalWalletPage.switchNetwork(targetChain)
   await modalWalletPage.promptSiwe()
   await modalWalletPage.approveSign()
-  await modalWalletValidator.expectSwitchedNetwork(targetChain)
+  await modalWalletValidator.expectSwitchedNetwork(targetChain, true)
   await modalWalletPage.closeModal()
 
   await modalWalletPage.sign()

diff --git a/examples/next-wagmi/package.json b/examples/next-wagmi/package.json
@@ -15,7 +15,7 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "viem": "2.10.3",
-    "wagmi": "2.9.9"
+    "wagmi": "2.9.10"
   },
   "devDependencies": {
     "@types/node": "20.11.5",

diff --git a/examples/react-wagmi/package.json b/examples/react-wagmi/package.json
@@ -13,7 +13,7 @@
     "react-dom": "18.2.0",
     "vite": "5.2.11",
     "viem": "2.10.3",
-    "wagmi": "2.9.9"
+    "wagmi": "2.9.10"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "4.2.1",