Repository navigation
fix(groups): re-land the Edit Group refresh from #1705 - #1753
Merged
Merged
Conversation
#1705 merged into feat/group-profile-refresh a minute after #1703 had already merged that branch into code/cash, so the Edit Group screens with cover and description editors never reached code/cash. This is #1705's squash commit cherry-picked onto code/cash. Two conflicts came from work that landed since: - BalanceRequirementsCard keeps #1721's Community Currency row alongside #1705's compact mode and footnote. - holdingLabel moved to GroupHoldingLabel.kt in #1705; it keeps the namesToken parameter code/cash added to the copy in GroupProfileScreen.
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
1 participant
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.
Edit Group shipped without its refresh. #1705 targeted
feat/group-profile-refresh, and it merged at 15:40 on Oct 7, about a minute after #1703 had merged that branch intocode/cash. Its commit landed on a branch nothing merged again.This cherry-picks #1705's squash commit (
220713ec3) ontocode/cash. Two files conflicted with work that landed since:BalanceRequirementsCardkeeps the Community Currency row from feat(profile): link a chat's token from its profile #1721 alongside feat(groups): refresh Edit Group with cover and description editors #1705'scompactmode andfootnote.holdingLabelmoved toGroupHoldingLabel.ktin feat(groups): refresh Edit Group with cover and description editors #1705. It keeps thenamesTokenparameter thatcode/cashadded to the copy inGroupProfileScreen.Everything else applied as #1705 wrote it.