sync: classic-merge upstream/main (4664c572a7) into fork/dev - #464
Merged
Conversation
Co-authored-by: Pixel Perfect <me@pixp.cc>
Co-authored-by: Pixel Perfect <me@pixp.cc>
Classic-merge the 3 commits that landed on pingdotgg/t3code main while PR #463 was in CI. Keep fork identity marks, prefetch, and board-mode chrome; take upstream Material You layout and wallpaper colors.
The fork surface contract required a static flex-1 inner View around ThreadDetailScreen. Upstream Material You makes that class/style conditional; keep the existence assertion on the flex host.
github-actions
Bot
added
the
📱 Native Change
patroza
marked this pull request as ready for review
September 8, 2026 16:55
SnapShotSettings and ComposerPrimaryActions mock useSettings without usePrimarySettingsAvailable. Under isolate:false that leak made ProviderInstanceCard.test.ts fail SettingsRow in CI.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Classic-merge the 3
pingdotgg/t3codemaincommits that landed while #463 was in CI.Incoming:
fix(server): stop Windows terminal processes when closing(fix(server): stop Windows terminal processes when closing pingdotgg/t3code#10771)feat(mobile): use Android wallpaper colors(feat(mobile): use Android wallpaper colors pingdotgg/t3code#10691)feat(mobile): add optional Material You layout(feat(mobile): add optional Material You layout pingdotgg/t3code#10692)3-way weld (not whole-file ours/theirs):
pnpm-lock.yamlfor@material/material-color-utilities.Merge with
gh pr merge --mergeonly. Do not squash — squash would drop the second parent and makefork/dev..upstream/mainreport already-merged work as missing.