Skip to content

Fix Cherry Pick Conflict#1311

Closed
satanmourner wants to merge 80 commits intomainfrom
fix/cherry-pick-conflict
Closed

Fix Cherry Pick Conflict#1311
satanmourner wants to merge 80 commits intomainfrom
fix/cherry-pick-conflict

Conversation

@satanmourner
Copy link
Copy Markdown
Contributor

FIX:

  • cherry-pick on prod got conflict on main

satanmourner and others added 30 commits April 25, 2025 15:49
---
updated-dependencies:
- dependency-name: "@vitejs/plugin-react-swc"
  dependency-version: 3.11.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-version: 5.5.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
updated-dependencies:
- dependency-name: "@capacitor/cli"
  dependency-version: 7.4.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
updated-dependencies:
- dependency-name: eslint-config-prettier
  dependency-version: 10.1.8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [ethers](https://github.com/ethers-io/ethers.js) from 6.14.3 to 6.15.0.
- [Release notes](https://github.com/ethers-io/ethers.js/releases)
- [Changelog](https://github.com/ethers-io/ethers.js/blob/main/CHANGELOG.md)
- [Commits](ethers-io/ethers.js@v6.14.3...v6.15.0)

---
updated-dependencies:
- dependency-name: ethers
  dependency-version: 6.15.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 6.6.3 to 6.6.4.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](testing-library/jest-dom@v6.6.3...v6.6.4)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-version: 6.6.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) from 5.80.7 to 5.83.0.
- [Release notes](https://github.com/TanStack/query/releases)
- [Commits](https://github.com/TanStack/query/commits/v5.83.0/packages/react-query)

---
updated-dependencies:
- dependency-name: "@tanstack/react-query"
  dependency-version: 5.83.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@reown/appkit](https://github.com/reown-com/appkit) from 1.7.11 to 1.7.16.
- [Release notes](https://github.com/reown-com/appkit/releases)
- [Commits](https://github.com/reown-com/appkit/compare/@reown/appkit@1.7.11...@reown/appkit@1.7.16)

---
updated-dependencies:
- dependency-name: "@reown/appkit"
  dependency-version: 1.7.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@reown/appkit-adapter-wagmi](https://github.com/reown-com/appkit) from 1.7.11 to 1.7.17.
- [Release notes](https://github.com/reown-com/appkit/releases)
- [Commits](https://github.com/reown-com/appkit/compare/@reown/appkit-adapter-wagmi@1.7.11...@reown/appkit-adapter-wagmi@1.7.17)

---
updated-dependencies:
- dependency-name: "@reown/appkit-adapter-wagmi"
  dependency-version: 1.7.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@swc/core](https://github.com/swc-project/swc) from 1.13.1 to 1.13.3.
- [Release notes](https://github.com/swc-project/swc/releases)
- [Changelog](https://github.com/swc-project/swc/blob/main/CHANGELOG.md)
- [Commits](swc-project/swc@v1.13.1...v1.13.3)

---
updated-dependencies:
- dependency-name: "@swc/core"
  dependency-version: 1.13.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [cypress](https://github.com/cypress-io/cypress) from 14.4.0 to 14.5.3.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](cypress-io/cypress@v14.4.0...v14.5.3)

---
updated-dependencies:
- dependency-name: cypress
  dependency-version: 14.5.3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [markdown-to-jsx](https://github.com/quantizor/markdown-to-jsx) from 7.7.6 to 7.7.12.
- [Release notes](https://github.com/quantizor/markdown-to-jsx/releases)
- [Changelog](https://github.com/quantizor/markdown-to-jsx/blob/main/CHANGELOG.md)
- [Commits](quantizor/markdown-to-jsx@v7.7.6...v7.7.12)

---
updated-dependencies:
- dependency-name: markdown-to-jsx
  dependency-version: 7.7.12
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [globals](https://github.com/sindresorhus/globals) from 16.2.0 to 16.3.0.
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](sindresorhus/globals@v16.2.0...v16.3.0)

---
updated-dependencies:
- dependency-name: globals
  dependency-version: 16.3.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [prettier](https://github.com/prettier/prettier) from 3.5.3 to 3.6.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@3.5.3...3.6.2)

---
updated-dependencies:
- dependency-name: prettier
  dependency-version: 3.6.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [eslint-plugin-i18next](https://github.com/edvardchen/eslint-plugin-i18next) from 6.1.1 to 6.1.3.
- [Changelog](https://github.com/edvardchen/eslint-plugin-i18next/blob/main/CHANGELOG.md)
- [Commits](edvardchen/eslint-plugin-i18next@v6.1.1...v6.1.3)

---
updated-dependencies:
- dependency-name: eslint-plugin-i18next
  dependency-version: 6.1.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@capacitor/camera](https://github.com/ionic-team/capacitor-plugins) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/ionic-team/capacitor-plugins/releases)
- [Changelog](https://github.com/ionic-team/capacitor-plugins/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/camera@7.0.1...@capacitor/camera@7.0.2)

---
updated-dependencies:
- dependency-name: "@capacitor/camera"
  dependency-version: 7.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.27.3 to 7.28.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.28.0/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-version: 7.28.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
dependabot bot and others added 24 commits October 7, 2025 14:11
Bumps [@capacitor/action-sheet](https://github.com/ionic-team/capacitor-plugins) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/ionic-team/capacitor-plugins/releases)
- [Changelog](https://github.com/ionic-team/capacitor-plugins/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/action-sheet@7.0.1...@capacitor/action-sheet@7.0.2)

---
updated-dependencies:
- dependency-name: "@capacitor/action-sheet"
  dependency-version: 7.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [postcss](https://github.com/postcss/postcss) from 8.5.4 to 8.5.6.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.5.4...8.5.6)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.5.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [js-base64](https://github.com/dankogai/js-base64) from 3.7.7 to 3.7.8.
- [Commits](dankogai/js-base64@3.7.7...3.7.8)

---
updated-dependencies:
- dependency-name: js-base64
  dependency-version: 3.7.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@reown/appkit](https://github.com/reown-com/appkit) from 1.7.19 to 1.8.2.
- [Release notes](https://github.com/reown-com/appkit/releases)
- [Commits](https://github.com/reown-com/appkit/compare/@reown/appkit@1.7.19...@reown/appkit@1.8.2)

---
updated-dependencies:
- dependency-name: "@reown/appkit"
  dependency-version: 1.8.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 8.35.0 to 8.43.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.43.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.43.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@datadog/browser-rum](https://github.com/DataDog/browser-sdk/tree/HEAD/packages/rum) from 6.8.0 to 6.19.0.
- [Release notes](https://github.com/DataDog/browser-sdk/releases)
- [Changelog](https://github.com/DataDog/browser-sdk/blob/main/CHANGELOG.md)
- [Commits](https://github.com/DataDog/browser-sdk/commits/v6.19.0/packages/rum)

---
updated-dependencies:
- dependency-name: "@datadog/browser-rum"
  dependency-version: 6.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@capgo/capacitor-social-login](https://github.com/Cap-go/capacitor-social-login) from 7.6.3 to 7.11.3.
- [Changelog](https://github.com/Cap-go/capacitor-social-login/blob/main/CHANGELOG.md)
- [Commits](Cap-go/capacitor-social-login@7.6.3...7.11.3)

---
updated-dependencies:
- dependency-name: "@capgo/capacitor-social-login"
  dependency-version: 7.11.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom) from 30.0.5 to 30.1.2.
- [Release notes](https://github.com/jestjs/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jestjs/jest/commits/v30.1.2/packages/jest-environment-jsdom)

---
updated-dependencies:
- dependency-name: jest-environment-jsdom
  dependency-version: 30.1.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@capacitor/ios](https://github.com/ionic-team/capacitor) from 7.2.0 to 7.4.3.
- [Release notes](https://github.com/ionic-team/capacitor/releases)
- [Changelog](https://github.com/ionic-team/capacitor/blob/7.4.3/CHANGELOG.md)
- [Commits](ionic-team/capacitor@7.2.0...7.4.3)

---
updated-dependencies:
- dependency-name: "@capacitor/ios"
  dependency-version: 7.4.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [axios](https://github.com/axios/axios) from 1.10.0 to 1.12.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.10.0...v1.12.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-version: 1.12.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [wagmi](https://github.com/wevm/wagmi/tree/HEAD/packages/react) from 2.16.1 to 2.17.1.
- [Release notes](https://github.com/wevm/wagmi/releases)
- [Changelog](https://github.com/wevm/wagmi/blob/main/packages/react/CHANGELOG.md)
- [Commits](https://github.com/wevm/wagmi/commits/@wagmi/core@2.17.1/packages/react)

---
updated-dependencies:
- dependency-name: wagmi
  dependency-version: 2.17.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@capacitor/toast](https://github.com/ionic-team/capacitor-plugins) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/ionic-team/capacitor-plugins/releases)
- [Changelog](https://github.com/ionic-team/capacitor-plugins/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/toast@7.0.1...@capacitor/toast@7.0.2)

---
updated-dependencies:
- dependency-name: "@capacitor/toast"
  dependency-version: 7.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [lint-staged](https://github.com/lint-staged/lint-staged) from 16.1.0 to 16.2.3.
- [Release notes](https://github.com/lint-staged/lint-staged/releases)
- [Changelog](https://github.com/lint-staged/lint-staged/blob/main/CHANGELOG.md)
- [Commits](lint-staged/lint-staged@v16.1.0...v16.2.3)

---
updated-dependencies:
- dependency-name: lint-staged
  dependency-version: 16.2.3
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [globals](https://github.com/sindresorhus/globals) from 16.3.0 to 16.4.0.
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](sindresorhus/globals@v16.3.0...v16.4.0)

---
updated-dependencies:
- dependency-name: globals
  dependency-version: 16.4.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@stripe/stripe-js](https://github.com/stripe/stripe-js) from 7.4.0 to 7.9.0.
- [Release notes](https://github.com/stripe/stripe-js/releases)
- [Commits](stripe/stripe-js@v7.4.0...v7.9.0)

---
updated-dependencies:
- dependency-name: "@stripe/stripe-js"
  dependency-version: 7.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [i18next-browser-languagedetector](https://github.com/i18next/i18next-browser-languageDetector) from 8.1.0 to 8.2.0.
- [Changelog](https://github.com/i18next/i18next-browser-languageDetector/blob/master/CHANGELOG.md)
- [Commits](i18next/i18next-browser-languageDetector@v8.1.0...v8.2.0)

---
updated-dependencies:
- dependency-name: i18next-browser-languagedetector
  dependency-version: 8.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 8.43.0 to 8.45.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.45.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.45.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [dotenv](https://github.com/motdotla/dotenv) from 17.2.1 to 17.2.3.
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](motdotla/dotenv@v17.2.1...v17.2.3)

---
updated-dependencies:
- dependency-name: dotenv
  dependency-version: 17.2.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@satanmourner satanmourner changed the title Fix Cherry Pick Fix Cherry Pick Conflict Oct 7, 2025
@satanmourner satanmourner changed the base branch from main to prod October 7, 2025 10:47
@cloudflare-workers-and-pages
Copy link
Copy Markdown

Deploying web-app-v2 with  Cloudflare Pages  Cloudflare Pages

Latest commit: 7842b17
Status: ✅  Deploy successful!
Preview URL: https://3bf5ec4a.web-app-v2-eq8.pages.dev
Branch Preview URL: https://fix-cherry-pick-conflict.web-app-v2-eq8.pages.dev

View logs

@satanmourner satanmourner changed the base branch from prod to main October 7, 2025 10:50
@satanmourner satanmourner deleted the fix/cherry-pick-conflict branch October 7, 2025 11:01
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.

4 participants