Skip to content

Commit

Permalink
Merge branch 'V4' into fix/identity-resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
glitch-txs authored Apr 11, 2024
2 parents bf97c8a + 37f0d14 commit 217747c
Show file tree
Hide file tree
Showing 59 changed files with 432 additions and 185 deletions.
9 changes: 9 additions & 0 deletions apps/demo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @apps/demo

## 4.1.6

### Patch Changes

- Fix modal default height. Fix ethers email connection lag. Fix ethers + rc relay disconnect issue. Adds new wui-components for secure site.

- Updated dependencies []:
- @web3modal/wagmi@4.1.6

## 4.1.5

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions apps/demo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@apps/demo",
"version": "4.1.5",
"version": "4.1.6",
"private": true,
"scripts": {
"dev:demo": "next dev",
Expand All @@ -11,7 +11,7 @@
"dependencies": {
"@radix-ui/react-switch": "1.0.3",
"@tanstack/react-query": "5.24.8",
"@web3modal/wagmi": "4.1.5",
"@web3modal/wagmi": "4.1.6",
"clsx": "2.1.0",
"framer-motion": "11.0.8",
"next": "14.1.1",
Expand Down
10 changes: 10 additions & 0 deletions apps/gallery/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @apps/gallery

## 4.1.6

### Patch Changes

- Fix modal default height. Fix ethers email connection lag. Fix ethers + rc relay disconnect issue. Adds new wui-components for secure site.

- Updated dependencies []:
- @web3modal/common@4.1.6
- @web3modal/ui@4.1.6

## 4.1.5

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions apps/gallery/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@apps/gallery",
"version": "4.1.5",
"version": "4.1.6",
"private": true,
"main": "index.js",
"scripts": {
Expand All @@ -9,8 +9,8 @@
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@web3modal/common": "4.1.5",
"@web3modal/ui": "4.1.5",
"@web3modal/common": "4.1.6",
"@web3modal/ui": "4.1.6",
"lit": "3.1.0",
"storybook": "7.6.7"
},
Expand Down
12 changes: 12 additions & 0 deletions apps/laboratory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @apps/laboratory

## 4.1.6

### Patch Changes

- Fix modal default height. Fix ethers email connection lag. Fix ethers + rc relay disconnect issue. Adds new wui-components for secure site.

- Updated dependencies []:
- @web3modal/ethers@4.1.6
- @web3modal/siwe@4.1.6
- @web3modal/solana@4.1.6
- @web3modal/wagmi@4.1.6

## 4.1.5

### Patch Changes
Expand Down
10 changes: 5 additions & 5 deletions apps/laboratory/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@apps/laboratory",
"version": "4.1.5",
"version": "4.1.6",
"private": true,
"scripts": {
"dev:laboratory": "next dev",
Expand Down Expand Up @@ -29,10 +29,10 @@
"@sentry/react": "7.92.0",
"@solana/web3.js": "1.87.6",
"@tanstack/react-query": "5.24.8",
"@web3modal/ethers": "4.1.5",
"@web3modal/siwe": "4.1.5",
"@web3modal/solana": "4.1.5",
"@web3modal/wagmi": "4.1.5",
"@web3modal/ethers": "4.1.6",
"@web3modal/siwe": "4.1.6",
"@web3modal/solana": "4.1.6",
"@web3modal/wagmi": "4.1.6",
"ethers": "6.9.0",
"framer-motion": "10.17.9",
"next": "14.0.4",
Expand Down
9 changes: 5 additions & 4 deletions apps/laboratory/tests/shared/utils/email.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const EMAIL_APPROVE_BUTTON_TEXT = 'Approve this login'
const APPROVE_URL_REGEX = /https:\/\/register.*/u
const OTP_CODE_REGEX = /\d{3}\s?\d{3}/u
const AVAILABLE_MAILSAC_ADDRESSES = 10
const EMAIL_DOMAIN = 'web3modal.msdc.co'

export class Email {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand All @@ -31,19 +32,19 @@ export class Email {
if (messages.data.length > 0) {
const message = messages.data[0]
if (!message) {
throw new Error('No message found')
throw new Error(`No message found for address ${email}`)
}
const id = message._id
if (!id) {
throw new Error('Message ID not present')
throw new Error(`Message id not present for address ${email}`)
}

return id
}
await this.timeout(EMAIL_CHECK_TIMEOUT)
checks += 1
}
throw new Error('No email found')
throw new Error(`No email found for address ${email}`)
}

async getEmailBody(email: string, messageId: string): Promise<string> {
Expand Down Expand Up @@ -82,6 +83,6 @@ export class Email {
)
}

return `web3modal${index}@mailsac.com`
return `tests-${index}@${EMAIL_DOMAIN}`
}
}
13 changes: 10 additions & 3 deletions apps/laboratory/tests/shared/validators/ModalValidator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ export class ModalValidator {
await expect(accountButton, 'Account button should be present').toBeAttached({
timeout: MAX_WAIT
})
await expect(
this.page.getByTestId('connect-button'),
'Connect button should not be present'
).toBeHidden({
timeout: MAX_WAIT
})
await this.page.waitForTimeout(500)
}

async expectAuthenticated() {
Expand All @@ -38,9 +45,9 @@ export class ModalValidator {

async expectDisconnected() {
await expect(
this.page.getByTestId('account-button'),
'Account button should not be present'
).not.toBeVisible({
this.page.getByTestId('connect-button'),
'Connect button should be present'
).toBeVisible({
timeout: MAX_WAIT
})
}
Expand Down
20 changes: 10 additions & 10 deletions apps/laboratory/tests/shared/validators/ModalWalletValidator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import { ModalValidator } from './ModalValidator'

// Each entry corresponds to web3modal${index} email address EOA
const testEmailsEOAAddresses = [
'0x6DAa039A2bFBb48dE6c02E3333a30856C047D73f',
'0x804642811117f5063594D0Db0273EA3C1959AE2C',
'0x871f447Cc32EA3F28Ea09910BE124c451CCcAE4c',
'0xd3041Dbf9473b9D2f6E15EB1Ca2e5999D3eF9519',
'0x88dEF109b4877B6fc14c5Fd25ED68B821E270E30',
'0x465B06679a2a33F3350C9D245872d1e34f10BA9C',
'0x8cD2c90E98309FcdeEd2bA0FdaC050e0284D1fD6',
'0x4446d7538f4CF5832604BE20535d954439Ff075d',
'0xbC6996C993d358989743bC74082B046da9d4d8fb',
'0x1216ff6012bcFcBaDFb4691cF586702Af9482F8C',
'0x629EC1c38cB60E90A47464e166A422256ADd9987',
'0xc3425Dda0A828983d7D372153B637231b8b53b30',
'0xa9B505304E0DD13F6C4EaBE21d7a707d620fbce4',
'0xC1f94ee0cD3dF13866f8fFD2d0907694266C28CE',
'0xAde4446855699e2aB1bD9D2f57B31A920A7C7bec',
'0xE66C5Cd1b0B9162D9cb036f7452Ca5C47260757c',
'0x2221967773371A742C297AD5290c5db0Ed632023',
'0x72d8d1Cc520d715D8db8E9B34D971F783FdAe634',
'0x774Ef09E6d93DB7ffE31A836610EDB6202752687',
'0x3A24983B0527442d8249DE97cFAFabb379c9A938',
// Non-smart account enabled address
'0x26760E9EbAcD6f4C47c095E7fd544C5AC093a4E3'
]
Expand Down
9 changes: 9 additions & 0 deletions examples/html-ethers5/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @examples/html-ethers5

## 4.1.6

### Patch Changes

- Fix modal default height. Fix ethers email connection lag. Fix ethers + rc relay disconnect issue. Adds new wui-components for secure site.

- Updated dependencies []:
- @web3modal/ethers5@4.1.6

## 4.1.5

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions examples/html-ethers5/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@examples/html-ethers5",
"private": true,
"version": "4.1.5",
"version": "4.1.6",
"scripts": {
"dev:example": "vite --port 3011",
"build:examples": "vite build"
},
"dependencies": {
"@web3modal/ethers5": "4.1.5",
"@web3modal/ethers5": "4.1.6",
"ethers": "5.7.2"
},
"devDependencies": {
Expand Down
9 changes: 9 additions & 0 deletions examples/html-wagmi/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @examples/html-wagmi

## 4.1.6

### Patch Changes

- Fix modal default height. Fix ethers email connection lag. Fix ethers + rc relay disconnect issue. Adds new wui-components for secure site.

- Updated dependencies []:
- @web3modal/wagmi@4.1.6

## 4.1.5

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions examples/html-wagmi/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@examples/html-wagmi",
"private": true,
"version": "4.1.5",
"version": "4.1.6",
"scripts": {
"dev:example": "vite --port 3001",
"build:examples": "vite build"
},
"dependencies": {
"@web3modal/wagmi": "4.1.5",
"@web3modal/wagmi": "4.1.6",
"@wagmi/connectors": "4.1.14",
"@wagmi/core": "2.6.5",
"react": "18.2.0",
Expand Down
9 changes: 9 additions & 0 deletions examples/next-wagmi/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @examples/next-wagmi

## 4.1.6

### Patch Changes

- Fix modal default height. Fix ethers email connection lag. Fix ethers + rc relay disconnect issue. Adds new wui-components for secure site.

- Updated dependencies []:
- @web3modal/wagmi@4.1.6

## 4.1.5

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions examples/next-wagmi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@examples/next-wagmi",
"version": "4.1.5",
"version": "4.1.6",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -10,7 +10,7 @@
},
"dependencies": {
"@tanstack/react-query": "5.24.8",
"@web3modal/wagmi": "4.1.5",
"@web3modal/wagmi": "4.1.6",
"next": "14.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
9 changes: 9 additions & 0 deletions examples/react-ethers5/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @examples/react-ethers5

## 4.1.6

### Patch Changes

- Fix modal default height. Fix ethers email connection lag. Fix ethers + rc relay disconnect issue. Adds new wui-components for secure site.

- Updated dependencies []:
- @web3modal/ethers5@4.1.6

## 4.1.5

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions examples/react-ethers5/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@examples/react-ethers5",
"private": true,
"version": "4.1.5",
"version": "4.1.6",
"scripts": {
"dev:example": "vite --port 3012",
"build:examples": "vite build"
},
"dependencies": {
"@web3modal/ethers5": "4.1.5",
"@web3modal/ethers5": "4.1.6",
"ethers": "5.7.2",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
9 changes: 9 additions & 0 deletions examples/react-wagmi/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @examples/react-wagmi

## 4.1.6

### Patch Changes

- Fix modal default height. Fix ethers email connection lag. Fix ethers + rc relay disconnect issue. Adds new wui-components for secure site.

- Updated dependencies []:
- @web3modal/wagmi@4.1.6

## 4.1.5

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions examples/react-wagmi/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@examples/react-wagmi",
"private": true,
"version": "4.1.5",
"version": "4.1.6",
"scripts": {
"dev:example": "vite --port 3002",
"build:examples": "vite build"
},
"dependencies": {
"@tanstack/react-query": "5.24.8",
"@web3modal/wagmi": "4.1.5",
"@web3modal/wagmi": "4.1.6",
"react": "18.2.0",
"react-dom": "18.2.0",
"vite": "5.0.12",
Expand Down
9 changes: 9 additions & 0 deletions examples/vue-ethers5/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @examples/vue-ethers5

## 4.1.6

### Patch Changes

- Fix modal default height. Fix ethers email connection lag. Fix ethers + rc relay disconnect issue. Adds new wui-components for secure site.

- Updated dependencies []:
- @web3modal/ethers5@4.1.6

## 4.1.5

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions examples/vue-ethers5/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@examples/vue-ethers5",
"private": true,
"version": "4.1.5",
"version": "4.1.6",
"scripts": {
"dev:example": "vite --port 3013",
"build:examples": "vite build"
},
"dependencies": {
"@web3modal/ethers5": "4.1.5",
"@web3modal/ethers5": "4.1.6",
"ethers": "5.7.2"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 217747c

Please sign in to comment.