Merge branch 'main' into chore/csp-dogfooding

reown-com · Jul 9, 2024 · 8011f77 · 8011f77
2 parents e387491 + fcfc26d
commit 8011f77
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 8 deletions.
diff --git a/.github/workflows/ui_tests.yml b/.github/workflows/ui_tests.yml
@@ -50,7 +50,7 @@ jobs:
     name: 'Playwright Tests'
     runs-on:
       group: ubuntu-runners
-    timeout-minutes: 15
+    timeout-minutes: 20
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/apps/laboratory/src/pages/library/wagmi-all.tsx b/apps/laboratory/src/pages/library/wagmi-all.tsx
@@ -14,6 +14,7 @@ import { WagmiModalInfo } from '../../components/Wagmi/WagmiModalInfo'
 const queryClient = new QueryClient()
 
 const wagmiConfig = getWagmiConfig('email')
+
 const modal = createWeb3Modal({
   wagmiConfig,
   projectId: ConstantsUtil.ProjectId,

diff --git a/apps/laboratory/tests/shared/utils/project.ts b/apps/laboratory/tests/shared/utils/project.ts
@@ -34,8 +34,7 @@ const braveOptions: UseOptions = {
   }
 }
 
-const EMAIL_BASED_PLATFORM_REGEX =
-  /(?:email\.spec\.ts|smart-account\.spec\.ts|siwe-email\.spec\.ts|siwe-sa\.spec\.ts|social\.spec\.ts).*$/u
+const WAGMI_EMAIL_BASED_REGEX = /(?:smart-account\.spec\.ts|siwe-sa\.spec\.ts|social\.spec\.ts).*$/u
 
 const SOLANA_UNIMPLEMENTED_TESTS_REGEX =
   /^(?!.*(?:email\.spec\.ts|siwe\.spec\.ts|canary\.spec\.ts|smart-account\.spec\.ts|social\.spec\.ts|siwe-sa\.spec\.ts|siwe-email\.spec\.ts)).*$/u
@@ -52,14 +51,14 @@ const customProjectProperties: CustomProjectProperties = {
     testIgnore: /(?:social\.spec\.ts).*$/u
   },
   'Desktop Brave/wagmi': {
-    testIgnore: EMAIL_BASED_PLATFORM_REGEX,
+    testIgnore: WAGMI_EMAIL_BASED_REGEX,
     useOptions: braveOptions
   },
   'Desktop Chrome/wagmi': {
-    testIgnore: EMAIL_BASED_PLATFORM_REGEX
+    testIgnore: WAGMI_EMAIL_BASED_REGEX
   },
   'Desktop Firefox/wagmi': {
-    testIgnore: EMAIL_BASED_PLATFORM_REGEX
+    testIgnore: WAGMI_EMAIL_BASED_REGEX
   },
   // Exclude social.spec.ts, email.spec.ts, siwe.spec.ts, and canary.spec.ts from solana, not yet implemented
   'Desktop Chrome/solana': {

diff --git a/apps/laboratory/tests/shared/validators/ModalWalletValidator.ts b/apps/laboratory/tests/shared/validators/ModalWalletValidator.ts
@@ -32,6 +32,10 @@ export class ModalWalletValidator extends ModalValidator {
     ).toContainText(type)
   }
 
+  async expectChangedAddressAfterSwitchingAccountType(previousAddress: string) {
+    await expect(this.page.getByTestId('w3m-address')).not.toHaveText(previousAddress)
+  }
+
   override async expectSwitchedNetwork(network: string) {
     const switchNetworkButton = this.page.getByTestId('account-switch-network-button')
     await expect(switchNetworkButton).toBeVisible()

diff --git a/apps/laboratory/tests/smart-account.spec.ts b/apps/laboratory/tests/smart-account.spec.ts
@@ -69,17 +69,20 @@ testModalSmartAccount(
   }
 )
 
-testModalSmartAccount(
+testModalSmartAccount.skip(
   'it should properly sign with a 6492 signature',
   async ({ modalPage, modalValidator }) => {
     const walletModalPage = modalPage as ModalWalletPage
     const walletModalValidator = modalValidator as ModalWalletValidator
 
+    const eoaAddress = await walletModalPage.getAddress()
+
     await walletModalPage.openAccount()
     await walletModalPage.openProfileView()
     await walletModalPage.openSettings()
     await walletModalPage.togglePreferredAccountType()
     await walletModalValidator.expectChangePreferredAccountToShow(EOA)
+    await walletModalValidator.expectChangedAddressAfterSwitchingAccountType(eoaAddress)
     await walletModalPage.closeModal()
 
     await walletModalPage.sign()
@@ -88,6 +91,7 @@ testModalSmartAccount(
     const signature = await walletModalPage.getSignature()
     const address = await walletModalPage.getAddress()
     const chainId = await walletModalPage.getChainId()
+
     await walletModalValidator.expectValidSignature(signature, address, chainId)
   }
 )
diff --git a/packages/scaffold-ui/src/views/w3m-account-settings-view/index.ts b/packages/scaffold-ui/src/views/w3m-account-settings-view/index.ts
@@ -59,6 +59,10 @@ export class W3mAccountSettingsView extends LitElement {
             ModalController.close()
           }
         }),
+        AccountController.subscribeKey(
+          'preferredAccountType',
+          val => (this.preferredAccountType = val)
+        ),
         NetworkController.subscribeKey('caipNetwork', val => {
           if (val?.id) {
             this.network = val

diff --git a/packages/wagmi/src/client.ts b/packages/wagmi/src/client.ts
@@ -730,6 +730,12 @@ export class Web3Modal extends Web3ModalScaffold {
           return
         }
         this.setPreferredAccountType(type as W3mFrameTypes.AccountType, this.chain)
+        this.syncAccount({
+          address: address as `0x${string}`,
+          isConnected: true,
+          chainId: NetworkUtil.caipNetworkIdToNumber(this.getCaipNetwork()?.id),
+          connector
+        })
       })
     }
   }

diff --git a/packages/wallet/src/W3mFrameProvider.ts b/packages/wallet/src/W3mFrameProvider.ts
@@ -367,7 +367,9 @@ export class W3mFrameProvider {
     })
 
     return new Promise<W3mFrameTypes.Responses['FrameGetUserResponse']>((resolve, reject) => {
-      this.connectResolver = { resolve, reject }
+      if (!this.connectResolver) {
+        this.connectResolver = { resolve, reject }
+      }
     })
   }
 
@@ -523,12 +525,14 @@ export class W3mFrameProvider {
     this.setLastUsedChainId(event.payload.chainId)
 
     this.connectResolver?.resolve(event.payload)
+    this.connectResolver = undefined
   }
 
   private onConnectError(
     event: Extract<W3mFrameTypes.FrameEvent, { type: '@w3m-frame/GET_USER_ERROR' }>
   ) {
     this.connectResolver?.reject(event.payload.message)
+    this.connectResolver = undefined
   }
 
   private onConnectSocialSuccess(