Staging spark merged - #4341
Merged
thisconnect merged 3 commits intoAug 20, 2026
Merged
Conversation
After moving Insurance to the Marketplace, "Settings" was now the only item inside "More", causing unnecessary friction to enter the actual settings on mobile. This moves settings directly into the menu bar, removing the redundant intermediate step.
5 tasks
Collaborator
Author
|
I've seem to have successfully merged, but didn't test everything |
Collaborator
Author
|
@sutterseba if you have a moment could oyu check that everything in 5ec120f works here? |
sutterseba
requested changes
Aug 20, 2026
Collaborator
There was a problem hiding this comment.
there is a regression breaking the active tab indication now, fixed by sutterseba@fe0707b
thisconnect
force-pushed
the
staging-spark-merged
branch
2 times, most recently
from
August 20, 2026 12:09
aafef49 to
fe0707b
Compare
Conflicts: CHANGELOG.md frontends/web/src/app.tsx frontends/web/src/components/bottom-navigation/bottom-navigation.tsx frontends/web/src/components/bottom-navigation/utils.test.ts frontends/web/src/components/bottom-navigation/utils.ts frontends/web/src/routes/router.tsx
thisconnect
force-pushed
the
staging-spark-merged
branch
from
August 20, 2026 12:17
fe0707b to
2470778
Compare
thisconnect
marked this pull request as ready for review
August 20, 2026 12:40
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
2 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.
Conflicts:
CHANGELOG.md
frontends/web/src/app.tsx
frontends/web/src/components/bottom-navigation/bottom-navigation.tsx
frontends/web/src/components/bottom-navigation/utils.test.ts
frontends/web/src/components/bottom-navigation/utils.ts
frontends/web/src/routes/router.tsx