Skip to content

Commit

Permalink
Merge branch 'main' of github.com:WalletConnect/web3modal into renova…
Browse files Browse the repository at this point in the history
…te/solana-web3.js-1.x
  • Loading branch information
tomiir committed Jul 10, 2024
2 parents 75d5ee5 + 0f8380c commit 428fdd4
Show file tree
Hide file tree
Showing 382 changed files with 16,100 additions and 2,714 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "V4",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
}
28 changes: 21 additions & 7 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
# Breaking Changes
# Description

N/A
Please include a brief summary of the change.

# Changes
## Type of change

- feat:
- fix:
- chore:
- [ ] Chore (non-breaking change that addresses non-functional tasks, maintenance, or code quality improvements)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)

# Associated Issues

closes #...
For Linear issues: Closes APKT-xxx
For GH issues: closes #...

# Showcase (Optional)

If there is a UI change include the screenshots with before and after state.
If new feature is being introduced, include the link to demo recording.

# Checklist

- [ ] Code in this PR is covered by automated tests (Unit tests, E2E tests)
- [ ] My changes generate no new warnings
- [ ] I have reviewed my own code
- [ ] I have filled out all required sections
2 changes: 2 additions & 0 deletions .github/workflows/pr_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches:
- V3
- V4
- V5
- main

concurrency:
# Support push/pr as event types with different behaviors each:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- V4
- main

concurrency: ${{ github.workflow }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release
on:
push:
branches:
- V4
- V5

concurrency: ${{ github.workflow }}-${{ github.ref }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ui_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
inputs:
branch:
description: 'The branch to use'
default: 'V3'
default: 'main'
required: false
type: string
base-url:
Expand Down Expand Up @@ -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
Expand Down
54 changes: 54 additions & 0 deletions apps/demo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,59 @@
# @apps/demo

## 5.0.6

### Patch Changes

- fix: Social Login illegal invocation issue. Wagmi tests

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

## 5.0.5

### Patch Changes

- feat: universal link internal flag. Add kotlin assetlinks. Fix email truncation'

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

## 5.0.4

### Patch Changes

- fix: wcPromise incompatibility issues

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

## 5.0.3

### Patch Changes

- fix: ethers5 coinbase issues. Turbo build issues. Upate cb connector.

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

## 5.0.2

### Patch Changes

- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue

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

## 5.0.1

### Patch Changes

- fix: remove walletconnect restriction on names

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

## 5.0.0

### Major 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": "5.0.0",
"version": "5.0.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": "5.0.0",
"@web3modal/wagmi": "5.0.6",
"clsx": "2.1.0",
"framer-motion": "11.0.8",
"next": "14.2.3",
Expand Down
60 changes: 60 additions & 0 deletions apps/gallery/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,65 @@
# @apps/gallery

## 5.0.6

### Patch Changes

- fix: Social Login illegal invocation issue. Wagmi tests

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

## 5.0.5

### Patch Changes

- feat: universal link internal flag. Add kotlin assetlinks. Fix email truncation'

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

## 5.0.4

### Patch Changes

- fix: wcPromise incompatibility issues

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

## 5.0.3

### Patch Changes

- fix: ethers5 coinbase issues. Turbo build issues. Upate cb connector.

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

## 5.0.2

### Patch Changes

- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue

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

## 5.0.1

### Patch Changes

- fix: remove walletconnect restriction on names

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

## 5.0.0

### Major 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": "5.0.0",
"version": "5.0.6",
"private": true,
"main": "index.js",
"scripts": {
Expand All @@ -9,8 +9,8 @@
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
},
"dependencies": {
"@web3modal/common": "5.0.0",
"@web3modal/ui": "5.0.0",
"@web3modal/common": "5.0.6",
"@web3modal/ui": "5.0.6",
"lit": "3.1.0",
"storybook": "7.6.7"
},
Expand Down
16 changes: 16 additions & 0 deletions apps/gallery/stories/components/wui-text.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,19 @@ export const Default: Component = {
</wui-text>
`
}

export const LineClamp: Component = {
render: args => html`
<div style="max-width:300px">
<wui-text
variant=${args.variant}
color=${args.color}
align=${ifDefined(args.align)}
lineClamp="1"
>
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has
been the industry's standard dummy text ever since the 1500s.
</wui-text>
</div>
`
}
28 changes: 28 additions & 0 deletions apps/gallery/stories/composites/wui-list-address.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import type { Meta } from '@storybook/web-components'
import '@web3modal/ui/src/composites/wui-list-token'
import type { WuiListAccount } from '@web3modal/ui/src/composites/wui-list-account'
import { html } from 'lit'
import '../../components/gallery-container'
import { networkImageSrc } from '../../utils/PresetUtils'

type Component = Meta<WuiListAccount>

export default {
title: 'Composites/wui-list-account',
args: {
address: 'Ethereum',
addressDescription: 'some ens',
logo: networkImageSrc
}
} as Component

export const Default: Component = {
render: args =>
html` <gallery-container width="336">
<wui-list-account
address=${args.address}
addressDescription=${args.addressDescription}
logo=${args.logo}
></wui-list-account>
</gallery-container>`
}

This file was deleted.

2 changes: 2 additions & 0 deletions apps/laboratory/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ MAILSAC_API_KEY=""
NEXT_PUBLIC_SECURE_SITE_SDK_URL=""
SOCIAL_TEST_EMAIL=""
SOCIAL_TEST_PASSWORD=""
NEXT_PUBLIC_DEFAULT_LOG_LEVEL=""

Loading

0 comments on commit 428fdd4

Please sign in to comment.