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.

Sign up for GitHub

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

Jump to bottom

[Chore(release)] resolve release merge conflicts with main #7206

Merged
merged 12 commits into from
Jun 26, 2024
Merged

[Chore(release)] resolve release merge conflicts with main #7206

merged 12 commits into from
Jun 26, 2024

Conversation

kallen-ledger
Copy link
Contributor

✅ Checklist

  • npx changeset was attached.
  • Covered by automatic tests.
  • Impact of the changes:
    • ...

📝 Description

  • resolve release merge conflicts with main

❓ Context

  • JIRA or GitHub link:

🧐 Checklist for the PR Reviewers

  • The code aligns with the requirements described in the linked JIRA or GitHub issue.
  • The PR description clearly documents the changes made and explains any technical trade-offs or design decisions.
  • There are no undocumented trade-offs, technical debt, or maintainability issues.
  • The PR has been tested thoroughly, and any potential edge cases have been considered and handled.
  • Any new dependencies have been justified and documented.
  • Performance considerations have been taken into account. (changes have been profiled or benchmarked if necessary)

live-github-bot bot and others added 11 commits May 20, 2024 13:12
@live-github-bot
Merge branch 'hotfix'
6f2bc1a
@live-github-bot
Merge branch 'release'
a27c42b
@live-github-bot
chore(hotfix) 🚀 entering hotfix mode
e43e042
@hedi-edelbloute @hzheng-ledger
@sprohaszka-ledger @lvndry
Polkadot generic app support (#6326)
b0c7b8d 
* getAddress support

* fix: add metadata support

* fix: get polkadot app version

* fix: refactoring

* fix: refactoring

* fix: refactoring

* fix: refactoring

* fix: small refactoring

* fix: update doc

* feat: add Polkadot coin configuration

Signed-off-by: Stéphane Prohaszka <[email protected]>

* polkadot config location

* fix: polkadot transaction craft

* remove useless code

* fix: refactoring

* fix: runtime upgrade transaction

* fix: update doc

* fix: unit tests

* fix: update changelog

* fix: update pnpm-lock

* fix: update polkadot integration test APDU

---------

Signed-off-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: hzheng-ledger <[email protected]>
Co-authored-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: lvndry <[email protected]>
@live-github-bot
chore(hotfix): 🔥 hotfix prerelease [LLD(2.82.1-hotfix.0), LLM(3.45.1-…
231c1ca 
…hotfix.0)]
@gre
fix(llm): improve typing of ReceiveFunds/02-SelectAccount and fix cra…
33d26a9 
…sh case (#7148)
@live-github-bot
chore(hotfix): 🔥 hotfix prerelease [LLD(2.82.1-hotfix.0), LLM(3.45.1-…
e033fe4 
…hotfix.1)]
@live-github-bot
chore(hotfix): 🔥 hotfix release [skip ci]
146adee
@live-github-bot
Merge branch 'hotfix'
2614225
@kallen-ledger
chore: fix merge conflicts between release and main
96d970a
@kallen-ledger
chore: add changeset
fbf1e93
@vercel Vercel
Copy link

vercel bot commented Jun 26, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
web-tools ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jun 26, 2024 4:14pm
4 Ignored Deployments
Name Status Preview Comments Updated (UTC)
ledger-live-docs ⬜️ Ignored (Inspect) Visit Preview Jun 26, 2024 4:14pm
ledger-live-github-bot ⬜️ Ignored (Inspect) Visit Preview Jun 26, 2024 4:14pm
native-ui-storybook ⬜️ Ignored (Inspect) Visit Preview Jun 26, 2024 4:14pm
react-ui-storybook ⬜️ Ignored (Inspect) Visit Preview Jun 26, 2024 4:14pm

@kallen-ledger kallen-ledger changed the base branch from develop to release June 26, 2024 14:37
@live-github-bot live-github-bot bot added desktop Has changes in LLD mobile Has changes in LLM common Has changes in live-common ledgerjs Has changes in the ledgerjs open source libs cli labels Jun 26, 2024
@ledger-wiz-cspm-secret-detection
Copy link

Wiz Scan Summary
IaC Misconfigurations 0C 0H 0M 0L 0I
Sensitive Data 0C 0H 0M 4L 0I
Total 0C 0H 0M 4L 0I
Secrets 0🔑

@kallen-ledger kallen-ledger marked this pull request as ready for review June 26, 2024 14:40
@kallen-ledger kallen-ledger requested review from a team as code owners June 26, 2024 14:40
@kallen-ledger kallen-ledger requested a review from cng-ledger June 26, 2024 14:40
@socket-security Socket Security
Copy link

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/@ledgerhq/[email protected] None 0 0 B
npm/@ledgerhq/[email protected] None 0 0 B
npm/@ledgerhq/[email protected] None 0 0 B

🚮 Removed packages: npm/@ledgerhq/[email protected], npm/@ledgerhq/[email protected], npm/@ledgerhq/[email protected]

View full report↗︎

@kallen-ledger kallen-ledger merged commit 81e5b8b into release Jun 26, 2024
51 of 57 checks passed
@kallen-ledger kallen-ledger deleted the chore/main-release-merge-conflicts branch June 26, 2024 16:20
kallen-ledger added a commit that referenced this pull request Jun 26, 2024
@kallen-ledger @live-github-bot
@hedi-edelbloute @hzheng-ledger @sprohaszka-ledger @lvndry @gre
[Chore(release)] resolve release merge conflicts with main (#7206)
86badd9 
* chore(hotfix) 🚀 entering hotfix mode

* Polkadot generic app support (#6326)

* getAddress support

* fix: add metadata support

* fix: get polkadot app version

* fix: refactoring

* fix: refactoring

* fix: refactoring

* fix: refactoring

* fix: small refactoring

* fix: update doc

* feat: add Polkadot coin configuration

Signed-off-by: Stéphane Prohaszka <[email protected]>

* polkadot config location

* fix: polkadot transaction craft

* remove useless code

* fix: refactoring

* fix: runtime upgrade transaction

* fix: update doc

* fix: unit tests

* fix: update changelog

* fix: update pnpm-lock

* fix: update polkadot integration test APDU

---------

Signed-off-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: hzheng-ledger <[email protected]>
Co-authored-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: lvndry <[email protected]>

* chore(hotfix): 🔥 hotfix prerelease [LLD(2.82.1-hotfix.0), LLM(3.45.1-hotfix.0)]

* fix(llm): improve typing of ReceiveFunds/02-SelectAccount and fix crash case (#7148)

* chore(hotfix): 🔥 hotfix prerelease [LLD(2.82.1-hotfix.0), LLM(3.45.1-hotfix.1)]

* chore(hotfix): 🔥 hotfix release [skip ci]

* chore: add changeset

* fix: move polkdot getcrypto call outside of currency config fn

---------

Signed-off-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: live-github-bot[bot] <105061298+live-github-bot[bot]@users.noreply.github.com>
Co-authored-by: Hedi EDELBLOUTE <[email protected]>
Co-authored-by: hzheng-ledger <[email protected]>
Co-authored-by: Stéphane Prohaszka <[email protected]>
Co-authored-by: lvndry <[email protected]>
Co-authored-by: @greweb <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hzheng-ledger hzheng-ledger hzheng-ledger left review comments

@cng-ledger cng-ledger cng-ledger approved these changes

@LucasWerey LucasWerey LucasWerey approved these changes

@Justkant Justkant Justkant approved these changes

Assignees

@kallen-ledger kallen-ledger

Labels
cli common Has changes in live-common desktop Has changes in LLD ledgerjs Has changes in the ledgerjs open source libs mobile Has changes in LLM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@kallen-ledger @Justkant @hzheng-ledger @LucasWerey @cng-ledger @hedi-edelbloute @gre