Skip to content

Commit

Permalink
Merge branch 'V4' into refactor/convert-to-swaps-naming-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
enesozturk committed Apr 30, 2024
2 parents 3cc465d + 4c9aa55 commit b999685
Show file tree
Hide file tree
Showing 63 changed files with 479 additions and 197 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.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/wagmi@4.1.12-910a844.0

## 4.1.11

### 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.11",
"version": "4.1.12-910a844.0",
"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.11",
"@web3modal/wagmi": "4.1.12-910a844.0",
"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.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/common@4.1.12-910a844.0
- @web3modal/ui@4.1.12-910a844.0

## 4.1.11

### 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.11",
"version": "4.1.12-910a844.0",
"private": true,
"main": "index.js",
"scripts": {
Expand All @@ -9,8 +9,8 @@
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@web3modal/common": "4.1.11",
"@web3modal/ui": "4.1.11",
"@web3modal/common": "4.1.12-910a844.0",
"@web3modal/ui": "4.1.12-910a844.0",
"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.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/ethers@4.1.12-910a844.0
- @web3modal/siwe@4.1.12-910a844.0
- @web3modal/solana@4.1.12-910a844.0
- @web3modal/wagmi@4.1.12-910a844.0

## 4.1.11

### 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.11",
"version": "4.1.12-910a844.0",
"private": true,
"scripts": {
"dev:laboratory": "next dev",
Expand Down Expand Up @@ -31,10 +31,10 @@
"@sentry/react": "7.92.0",
"@solana/web3.js": "1.87.6",
"@tanstack/react-query": "5.24.8",
"@web3modal/ethers": "4.1.11",
"@web3modal/siwe": "4.1.11",
"@web3modal/solana": "4.1.11",
"@web3modal/wagmi": "4.1.11",
"@web3modal/ethers": "4.1.12-910a844.0",
"@web3modal/siwe": "4.1.12-910a844.0",
"@web3modal/solana": "4.1.12-910a844.0",
"@web3modal/wagmi": "4.1.12-910a844.0",
"ethers": "6.9.0",
"framer-motion": "10.17.9",
"next": "14.0.4",
Expand Down
6 changes: 3 additions & 3 deletions apps/laboratory/src/utils/ConstantsUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ export const ConstantsUtil = {
id: 'kotlin-web3wallet',
name: 'kotlin-web3wallet',
homepage: 'https://walletconnect.com',
mobile_link: 'kotlin-web3wallet://wc'
mobile_link: 'kotlin-web3wallet://'
},
{
id: 'swift-web3wallet',
name: 'swift-web3wallet',
homepage: 'https://walletconnect.com',
mobile_link: 'walletapp://wc'
mobile_link: 'walletapp://'
},
{
id: 'flutter-web3wallet',
name: 'flutter-web3wallet',
homepage: 'https://walletconnect.com',
mobile_link: 'wcflutterwallet://wc'
mobile_link: 'wcflutterwallet://'
}
],
ProjectId: projectId
Expand Down
9 changes: 0 additions & 9 deletions apps/laboratory/tests/email.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,3 @@ testMEmail('it should disconnect correctly', async ({ modalPage, modalValidator
await modalPage.disconnect()
await modalValidator.expectDisconnected()
})

testMEmail('it should update email', async ({ modalPage }) => {
const mailsacApiKey = process.env['MAILSAC_API_KEY']
if (!mailsacApiKey) {
throw new Error('MAILSAC_API_KEY is not set')
}

await modalPage.updateEmail(mailsacApiKey)
})
4 changes: 2 additions & 2 deletions apps/laboratory/tests/shared/pages/ModalPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ export class ModalPage {
await this.page.waitForTimeout(300)
}

async updateEmail(mailsacApiKey: string) {
async updateEmail(mailsacApiKey: string, index: number) {
const email = new Email(mailsacApiKey)
const newEmailAddress = email.getEmailAddressToUse(1)
const newEmailAddress = email.getEmailAddressToUse(index)

await this.page.getByTestId('account-button').click()
await this.page.getByTestId('w3m-account-email-update').click()
Expand Down
5 changes: 1 addition & 4 deletions apps/laboratory/tests/shared/utils/email.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Mailsac } from '@mailsac/api'
import { randomBytes } from 'crypto'
const EMAIL_CHECK_TIMEOUT = 1000
const MAX_EMAIL_CHECK = 16
const EMAIL_APPROVE_BUTTON_TEXT = 'Approve this login'
Expand Down Expand Up @@ -78,8 +77,6 @@ export class Email {
}

getEmailAddressToUse(index: number, domain = EMAIL_DOMAIN): string {
const prefix = randomBytes(12).toString('hex')

return `${prefix}-w${index}@${domain}`
return `w3m-w${index}@${domain}`
}
}
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.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/ethers5@4.1.12-910a844.0

## 4.1.11

### 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.11",
"version": "4.1.12-910a844.0",
"scripts": {
"dev:example": "vite --port 3011",
"build:examples": "vite build"
},
"dependencies": {
"@web3modal/ethers5": "4.1.11",
"@web3modal/ethers5": "4.1.12-910a844.0",
"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.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/wagmi@4.1.12-910a844.0

## 4.1.11

### 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.11",
"version": "4.1.12-910a844.0",
"scripts": {
"dev:example": "vite --port 3001",
"build:examples": "vite build"
},
"dependencies": {
"@web3modal/wagmi": "4.1.11",
"@web3modal/wagmi": "4.1.12-910a844.0",
"@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.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/wagmi@4.1.12-910a844.0

## 4.1.11

### 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.11",
"version": "4.1.12-910a844.0",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -10,7 +10,7 @@
},
"dependencies": {
"@tanstack/react-query": "5.24.8",
"@web3modal/wagmi": "4.1.11",
"@web3modal/wagmi": "4.1.12-910a844.0",
"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.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/ethers5@4.1.12-910a844.0

## 4.1.11

### 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.11",
"version": "4.1.12-910a844.0",
"scripts": {
"dev:example": "vite --port 3012",
"build:examples": "vite build"
},
"dependencies": {
"@web3modal/ethers5": "4.1.11",
"@web3modal/ethers5": "4.1.12-910a844.0",
"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.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/wagmi@4.1.12-910a844.0

## 4.1.11

### 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.11",
"version": "4.1.12-910a844.0",
"scripts": {
"dev:example": "vite --port 3002",
"build:examples": "vite build"
},
"dependencies": {
"@tanstack/react-query": "5.24.8",
"@web3modal/wagmi": "4.1.11",
"@web3modal/wagmi": "4.1.12-910a844.0",
"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.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/ethers5@4.1.12-910a844.0

## 4.1.11

### 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.11",
"version": "4.1.12-910a844.0",
"scripts": {
"dev:example": "vite --port 3013",
"build:examples": "vite build"
},
"dependencies": {
"@web3modal/ethers5": "4.1.11",
"@web3modal/ethers5": "4.1.12-910a844.0",
"ethers": "5.7.2"
},
"devDependencies": {
Expand Down
9 changes: 9 additions & 0 deletions examples/vue-wagmi/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @examples/vue-wagmi

## 4.1.12-910a844.0

### Patch Changes

- refactor: sync theme with secure site

- Updated dependencies []:
- @web3modal/wagmi@4.1.12-910a844.0

## 4.1.11

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions examples/vue-wagmi/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@examples/vue-wagmi",
"private": true,
"version": "4.1.11",
"version": "4.1.12-910a844.0",
"scripts": {
"dev:example": "vite --port 3003",
"build:examples": "vite build"
},
"dependencies": {
"@web3modal/wagmi": "4.1.11",
"@web3modal/wagmi": "4.1.12-910a844.0",
"@wagmi/connectors": "4.1.14",
"@wagmi/core": "2.6.5"
},
Expand Down
Loading

0 comments on commit b999685

Please sign in to comment.