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.

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

Merge conflicts main v2 #323

Merged
merged 39 commits into from
Dec 17, 2024
Merged

Merge conflicts main v2 #323

merged 39 commits into from
Dec 17, 2024

Conversation

fabiorigam
Copy link
Member

No description provided.

davidecarpini and others added 30 commits July 31, 2024 09:06
* feat: working tests

* feat: remove thor-devkit

* fix: e2e tests

* fix: tests
* fix: refactor inputs

* fix: improve inputs
* Create sonar-scan.yml

* Create sonar-project.properties

* remove test branch from workflow

---------

Co-authored-by: Fabio Rigamonti <[email protected]>
* chore: v1.0.13

* fix: versions
* fix: update README.md

* fix: update LICENSE
* feat: adding signer typed data with connex

* feat: expose signedTypedData

* feat: revert changes to dappKit Driver

* test: sign typed data

* fix: linting

* refactor: simplify signTypedData method in certificate-wallet and wc-wallet
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.3.5 to 5.3.6.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.3.6/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.3.6/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Davide Carpini <[email protected]>
Bumps [next](https://github.com/vercel/next.js) from 14.1.4 to 14.2.10.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](vercel/next.js@v14.1.4...v14.2.10)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Davide Carpini <[email protected]>
Bumps [express](https://github.com/expressjs/express) from 4.19.2 to 4.21.0.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md)
- [Commits](expressjs/express@4.19.2...4.21.0)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Davide Carpini <[email protected]>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.3 to 4.5.5.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.5/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.5/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: add vns domains on react

* fix: configs

* fix: vanilla button and modal

* fix: react stuff

* fix: improved tests

* fix: eslint

* fix: package json

* fix: yarn lock

* fix: build

* fix: eslint
Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/chimurai/http-proxy-middleware/releases)
- [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.7/CHANGELOG.md)
- [Commits](chimurai/http-proxy-middleware@v2.0.6...v2.0.7)

---
updated-dependencies:
- dependency-name: http-proxy-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Davide Carpini <[email protected]>
Co-authored-by: Fabio Rigamonti <[email protected]>
Co-authored-by: Davide Carpini <[email protected]>
* feat: ping wallet connect on focus

* fix: if statement for ssr

* fix: update yarn.lock

---------

Co-authored-by: Fabio Rigamonti <[email protected]>
Co-authored-by: Davide Carpini <[email protected]>
* chore: v1.0.16

* chore: v1.0.16
* chore: review build process

* fix: publish packages script

* fix: publish packages script

* chore(release): v1.1.0
davidecarpini and others added 9 commits November 4, 2024 17:11
Bumps [happy-dom](https://github.com/capricorn86/happy-dom) from 14.12.3 to 15.10.2.
- [Release notes](https://github.com/capricorn86/happy-dom/releases)
- [Commits](capricorn86/happy-dom@v14.12.3...v15.10.2)

---
updated-dependencies:
- dependency-name: happy-dom
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fabio Rigamonti <[email protected]>
Bumps [@eslint/plugin-kit](https://github.com/eslint/rewrite) from 0.2.1 to 0.2.3.
- [Release notes](https://github.com/eslint/rewrite/releases)
- [Changelog](https://github.com/eslint/rewrite/blob/main/release-please-config.json)
- [Commits](eslint/rewrite@plugin-kit-v0.2.1...plugin-kit-v0.2.3)

---
updated-dependencies:
- dependency-name: "@eslint/plugin-kit"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fabio Rigamonti <[email protected]>
@fabiorigam fabiorigam marked this pull request as ready for review December 16, 2024 17:14
@fabiorigam fabiorigam merged commit 5cbc56d into main-v2 Dec 17, 2024
9 checks passed
@fabiorigam fabiorigam deleted the merge-conflicts-main-v2 branch December 17, 2024 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants