Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: wagmi authConnector connectExternal resolving issue and enable wagmi email tests #2504

Merged
merged 13 commits into from
Jul 8, 2024
Merged

fix: wagmi authConnector connectExternal resolving issue and enable wagmi email tests #2504

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1ab1b37
refactor: conditionally set connector resolver variable, enable wagmi…
enesozturk Jul 3, 2024
3ecfcae
chore: remove unused variable
enesozturk Jul 3, 2024
dd36fff
Merge branch 'main' into fix/enable-wagmi-email-tests
tomiir Jul 3, 2024
ee219c3
refactor: disable social tests for wagmi
enesozturk Jul 3, 2024
5c59bcf
refactor: ignore siwe-sa and social tests for wagmi, set pref account…
enesozturk Jul 4, 2024
524bc4d
chore: enable sharding for playwright tests
enesozturk Jul 4, 2024
8d8aa72
chore: add sync connectors call back
enesozturk Jul 4, 2024
951169a
chore: increase timeout
enesozturk Jul 4, 2024
9afe57d
chore: revert wagmi email regex
enesozturk Jul 5, 2024
c7377d2
chore: email random index logic
enesozturk Jul 5, 2024
84650af
refactor: testing settings, enable email for wagmi
enesozturk Jul 8, 2024
130bd54
Merge branch 'main' into fix/enable-wagmi-email-tests
enesozturk Jul 8, 2024
02b7751
chore: revert configs
enesozturk Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions apps/laboratory/tests/shared/utils/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ 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 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

Expand All @@ -52,15 +49,8 @@ const customProjectProperties: CustomProjectProperties = {
testIgnore: /(?:social\.spec\.ts).*$/u
},
'Desktop Brave/wagmi': {
testIgnore: EMAIL_BASED_PLATFORM_REGEX,
useOptions: braveOptions
},
'Desktop Chrome/wagmi': {
testIgnore: EMAIL_BASED_PLATFORM_REGEX
tomiir marked this conversation as resolved.
Show resolved Hide resolved
},
'Desktop Firefox/wagmi': {
testIgnore: EMAIL_BASED_PLATFORM_REGEX
},
// Exclude social.spec.ts, email.spec.ts, siwe.spec.ts, and canary.spec.ts from solana, not yet implemented
'Desktop Chrome/solana': {
grep: SOLANA_UNIMPLEMENTED_TESTS_REGEX
Expand Down
1 change: 0 additions & 1 deletion packages/wagmi/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@ export class Web3Modal extends Web3ModalScaffold {
this.wagmiConfig = wagmiConfig

this.syncRequestedNetworks([...wagmiConfig.chains])
this.syncConnectors([...wagmiConfig.connectors])
this.initAuthConnectorListeners([...wagmiConfig.connectors])

watchConnectors(this.wagmiConfig, {
Expand Down
6 changes: 5 additions & 1 deletion packages/wallet/src/W3mFrameProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
})
}

Expand Down Expand Up @@ -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(
Expand Down
Loading