Skip to content

Conversation

@jreamy
Copy link

@jreamy jreamy commented Mar 26, 2025

This addresses #188 to insert larger line breaks between grouped messages.

Pull Request Checklist

  • I have linked this PR to a related GitHub issue.
  • I have added a description of the change (and Github issue number, if any) to the root CHANGELOG.md.

@jreamy
Copy link
Author

jreamy commented Mar 26, 2025

Two few questions @holmesworcester:

  1. Do you think this is a good approach? I thought about just inserting a
    or other divider between each <NestedMessageContent>... thoughts on which approach you would prefer?
  2. How much spacing do you want here? I started with 7 pixels, but it could be more... in #1403 you said 1.5 lines which would be ~10 px margin

7px margin:
Screenshot 2025-03-26 at 12 48 32 PM

10px margin:
Screenshot 2025-03-26 at 1 09 50 PM

@holmesworcester
Copy link
Collaborator

That approach with 10px looks good to me!

jreamy and others added 15 commits March 26, 2025 13:51
* Adds bubbly date dividers to match design
* Adds floating, disappearing, sticky date with fade in/out
* Removes leading 0 from dates
* Uses light theme for Storybook tests
* Fixes some typescript errors in Cypress tests
* Switches Cypress tests to use light mode (WIP)
* Upgraded cypress to 12.17.4
* Changes existing test scripts to use non-visual assertions, eliminating screenshots and wait times for faster and less flaky tests
* Adds new tests for floating dates
* Cleans up unused cypress plugins, improves test script name for clarity
* Updates CHANGELOG
* Moves cypress to dev dependency
* Adds linting for *.cy.tsx by separating tsconfig for builds and cypress
* Removes temporary enum definition and its accompanying TODO, adding proper import for ModalName
* Fixes message ordering in story, renames story
* Improves readability using args

Co-authored-by: Taea <88346289+adrastaea@users.noreply.github.com>

* Adds output directory to avoid error about overwriting files

---------

Co-authored-by: Taea <88346289+adrastaea@users.noreply.github.com>
Co-authored-by: Isla Koenigsknecht <ikoenigbu@gmail.com>
* adds bubbly date dividers

* updates snapshots

* removes leading 0 from dates

* "Date" floats in the correct place

* FloatingDate displays appropriate date

* Fixes floating date display in dark mode

* FloatingDate disappears after two seconds

* Fixes floating date appearing momentarily on channel load

* FloatingDate fades in/out in 200ms

* Decreases font size on date markers to match design

* Adjusts font size on floating date

* Adds shadow on floating date

* Updates snapshots

* Updates CHANGELOG

* Fixes typescript errorin Cypress tests

* Fixes theme switching

* Switches cypress tests to use light mode (WIP)

* Upgraded cypress to 12.17.4 and re-created base screenshots

* Changed test scripts to work more consistently and recreates base files

* Fixes issue with page up/down keys triggering multiple times

* updates snapshots

* fixes typescript errors when running cypress tests

* tabindex seems fine, so updating snapshot

* Fixes ts errors with sending mocked messages

* All tests pass without relying on snapshots

* fixes ts error

* Uses wait(0) workaround to render reliably without arbitrary waits

* adds floating date tests

* fixes styles, ts errors

* Cleaned up and improved readability

* Cleans up unused cypress plugins, improves script name

* more cleanup

* Small cleanup and updating snapshots

* Restores Node 18 package-lock.json (no license fields)

* Fixes CHANGELOG

* Fixes tests not running on CI

* Fixes more ts errors in tests

* Improves date formatting on messages and markers (WIP)

* moves cypress to dev dependency

* Adds linting for *.cy.tsx by separating tsconfig for builds and cypress

* Removes temporary enum definition and its accompanying TODO, adding proper import for ModalName

* Gives component export a better name

* Fixes message ordering in story, renames story

* Fixes "Today" flashing on transitions (I *think* -- can't reproduce)

* Improves readability using args

* Renames constants

* Update packages/desktop/src/shared/setupTests.ts

Co-authored-by: Taea <88346289+adrastaea@users.noreply.github.com>

* Adds output directory to avoid error about overwriting files

* Fixes constant that I forgot to rename

* Fixes type errors in Channel.stories so that app runs without errors

* Fixes helia type errors running bootstrap, also updates a snapshot

* Fixes an issue where floating date was displaying after sending a message

* Makes the floating date match the vertical position of the first date marker

* updates snapshots

* stop excluding cypress from typechecking

* Clarifies todo

* Removes errant .cursor/settings.json from project

* fixes error from using incorrect test function

* Adds meaningful date markers with "today", "yesterday", days of week, dates. and years

* updates CHANGELOG

* updates CHANGELOG

* Addresses feedback re: location of outDir

* Fixes for the expect error on branch switch

* Forces Cypress to use same timezone in CI as in local.

Uses a recommended solution: https://stackoverflow.com/questions/58790800/how-to-handle-timezones-in-cypress-snapshot-tests

* Second attempt to set consistent timezone for tests

* Fixing date/time locale mismatch, third attempt, cleans up previous non-fixes

* Updates snapshots

* Fixes mistake in merge that restored unnecessary type declarations

* removes cruft

* Adds correct time display on messages

* Makes am/pm capitalization match designs

* WIP times and dates display

* updates snapshots

* Reverts unnecessary changes to mobile UI

* Fixes mistaken downgrading of typescript

Co-authored-by: Taea <88346289+adrastaea@users.noreply.github.com>

* Specifies timezone for jest and rtl tests, and updates snapshots

---------

Co-authored-by: Taea <88346289+adrastaea@users.noreply.github.com>
Co-authored-by: Isla Koenigsknecht <ikoenigbu@gmail.com>
* Fix back and close in User Profile

* Update CHANGELOG.md
This bug was happening due to Luxon not detecting the correct system time when running in React Native / NodeJS Mobile. So we have to get the timezone offset from JavaScript's DateTime and use that in Luxon. 

* displays correct local time
* Removes mobile formatMessageDisplayDate in favor of putting date code in renderer
* Updates CHANGELOG
* Basic working emojicode replacement
* replace as you type works, without it being over eager on :s as you type 😄, e.g.
* fixes bug where hearts weren't tiny and black instead of big and red
* adds a large emoji list
* Adds basic tab completion for emojicodes
* adds a nice dropdown for autocompletion
* adds some passing cypress tests
* Adds a storybook for messages with emojis
* Removes emoticons beginning with > to avoid conflict with markdown, but leaves a note for posterity so they don't get added back when someone asks for them
* Comments out emoticons whose quotes are being stripped by our linter

---------

Shout out to agiledev24 )(whose work I did not end up using because it was easier to start fresh, but who took a first pass on this and got something working! <3)

Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
Co-authored-by: Taea <88346289+adrastaea@users.noreply.github.com>
This bug was happening due to Luxon not detecting the correct system time when running in React Native / NodeJS Mobile. So we have to get the timezone offset from JavaScript's DateTime and use that in Luxon. 

* displays correct local time
* Removes mobile formatMessageDisplayDate in favor of putting date code in renderer
* Updates CHANGELOG
…(2569 (TryQuiet#2793)

* (fix) adds settings back button

* fix(TryQuiet#2569): leave community settings

* CHANGLOG.md

* (fix) Snapshot tests in LeaveCommunity
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

3 participants