🚨 Release merge conflicts #8922
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![live-github-bot[bot]](https://avatars.githubusercontent.com/in/198164?s=60&v=4){kind=small}
[fix/LIVE-15117]: add custom ptx handlers to handlers memo
* fix: add ledger validator on mantra * update snapshot
…wn (#8526) * feat(llm): log category cards impression when 50% of the card is visible * feat(llm): do not run in view checks when no items is being watched * feat(llm): log portfolio content cards impression on 50% visibility * chore: update change log * feat(llm): log dynamic content card impression when 50% is shown * feat(llm): log notification impression when 50% is shown * chore(llm): rename IsInViewContext to InViewContext * chore(llm): add InViewContextProvider to the AppProviders * fix(llm): undefined order in null * feat(lld): log category impression when 50% is shown * chore(llm): use LLM alias in imports * feat(llm): trigger segment event on card impression * fix(llm): rewatch card when `LogContentCardWrapper.id` change * fix(llm): use mobileCardsSelector to find the card to log the impression * fix(llm): race condition between interval and inViewStatus * chore(llm): check "exhaustive-deps" on `useInViewContext` * chore(llm): remove unnecessary key
fix: Move ICP memo tag field on recepient step when FF lldMemoTag is ON
…8601) * revert useNFTCollections * improvement LLD * Improve LLM
Release - fix(lld): use a debounce on memotag field
fix(llm): fix long Memo Tag issue in Stacks chore: update change log chore: update unimported fix(llm): use `truncateUtf8` instead of `Array.slice` chore(llm): use `maxLength` instead of `Array.slice` on Algorand fix(llm): validate the memo bytes length instead of the js string length
fix(llm): debounce memo tag changes
* fix(llm): fix long memo issue on Cardano * chore: update change log
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
3 Skipped Deployments
|
live-github-bot
bot
added
desktop
Wiz Scan Summary
To detect these findings earlier in the dev lifecycle, try using Wiz Code VS Code Extension. |
Justkant
previously approved these changes
Jan 16, 2025
Desktop Bundle ChecksMobile Bundle Checks
|
jiyuzhuang
approved these changes
Jan 16, 2025
valpinkman
approved these changes
Jan 16, 2025
KVNLS
reviewed
Jan 16, 2025
libs/ledger-live-common/src/exchange/swap/hooks/v5/useFilteredProviders.ts
Show resolved
Hide resolved
KVNLS
approved these changes
Jan 16, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The release had some merge conflicts 🚨
This pull request was created in order to resolve the merge conflicts between the release and develop branches.
git checkout develop && git pull git checkout support/release-merge-conflicts git merge developChecklist
To be ready to be merged, we must comply with all theses checks: