Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sticky date markers #2731

Open
wants to merge 48 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
ad703da
adds bubbly date dividers
holmesworcester Feb 2, 2025
fc0ec4e
updates snapshots
holmesworcester Feb 2, 2025
4dc3eec
removes leading 0 from dates
holmesworcester Feb 2, 2025
71c0387
"Date" floats in the correct place
holmesworcester Feb 2, 2025
fa09903
FloatingDate displays appropriate date
holmesworcester Feb 2, 2025
b0ecab2
Fixes floating date display in dark mode
holmesworcester Feb 2, 2025
2c0578c
FloatingDate disappears after two seconds
holmesworcester Feb 3, 2025
cec2223
Fixes floating date appearing momentarily on channel load
holmesworcester Feb 3, 2025
69574c4
FloatingDate fades in/out in 200ms
holmesworcester Feb 3, 2025
fd94909
Decreases font size on date markers to match design
holmesworcester Feb 4, 2025
a985062
Adjusts font size on floating date
holmesworcester Feb 4, 2025
f159d75
Adds shadow on floating date
holmesworcester Feb 4, 2025
ecef2aa
Updates snapshots
holmesworcester Feb 4, 2025
9a80227
Updates CHANGELOG
holmesworcester Feb 6, 2025
15f3e76
Fixes typescript errorin Cypress tests
holmesworcester Feb 7, 2025
0c5b83a
Fixes theme switching
holmesworcester Feb 7, 2025
c5c367c
Switches cypress tests to use light mode (WIP)
holmesworcester Feb 7, 2025
8438c3e
Upgraded cypress to 12.17.4 and re-created base screenshots
holmesworcester Feb 7, 2025
524b8dc
Changed test scripts to work more consistently and recreates base files
holmesworcester Feb 7, 2025
ac3a116
Fixes issue with page up/down keys triggering multiple times
holmesworcester Feb 10, 2025
94c8b82
updates snapshots
holmesworcester Feb 10, 2025
17c205b
fixes typescript errors when running cypress tests
holmesworcester Feb 10, 2025
d195195
tabindex seems fine, so updating snapshot
holmesworcester Feb 10, 2025
5405e9f
Fixes ts errors with sending mocked messages
holmesworcester Feb 11, 2025
e0f388c
All tests pass without relying on snapshots
holmesworcester Feb 11, 2025
849820f
fixes ts error
holmesworcester Feb 11, 2025
8fe548d
Uses wait(0) workaround to render reliably without arbitrary waits
holmesworcester Feb 11, 2025
f3083f2
adds floating date tests
holmesworcester Feb 11, 2025
f3bf53d
fixes styles, ts errors
holmesworcester Feb 11, 2025
824ff34
Cleaned up and improved readability
holmesworcester Feb 11, 2025
f38bb13
Cleans up unused cypress plugins, improves script name
holmesworcester Feb 11, 2025
946b6e6
more cleanup
holmesworcester Feb 11, 2025
1a399db
Small cleanup and updating snapshots
holmesworcester Feb 12, 2025
5b10b88
Restores Node 18 package-lock.json (no license fields)
holmesworcester Feb 12, 2025
3900c84
Merge remote-tracking branch 'origin/develop' into feature/sticky-dat…
holmesworcester Feb 12, 2025
f87f9e2
Fixes CHANGELOG
holmesworcester Feb 12, 2025
f181044
Fixes tests not running on CI
holmesworcester Feb 12, 2025
251a505
Fixes more ts errors in tests
holmesworcester Feb 12, 2025
e6efa21
moves cypress to dev dependency
holmesworcester Feb 13, 2025
5753d7f
Adds linting for *.cy.tsx by separating tsconfig for builds and cypress
holmesworcester Feb 13, 2025
cd9475f
Removes temporary enum definition and its accompanying TODO, adding p…
holmesworcester Feb 13, 2025
fe5dd60
Gives component export a better name
holmesworcester Feb 13, 2025
3e9484f
Fixes message ordering in story, renames story
holmesworcester Feb 13, 2025
42e0e53
Fixes "Today" flashing on transitions (I *think* -- can't reproduce)
holmesworcester Feb 13, 2025
abd687b
Improves readability using args
holmesworcester Feb 13, 2025
5c301e3
Renames constants
holmesworcester Feb 13, 2025
6c9edd9
Update packages/desktop/src/shared/setupTests.ts
holmesworcester Feb 13, 2025
08d6069
Merge remote-tracking branch 'origin/develop' into feature/sticky-dat…
holmesworcester Mar 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/desktop-test-scroll.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Desktop scroll regression tests
name: Desktop scroll cypress tests

on:
pull_request:
Expand Down Expand Up @@ -52,11 +52,11 @@ jobs:
if: steps.filter.outputs.desktop == 'true'
with:
install: false
command: npm run regression-test:ci
command: npm run cypress:run:ci
working-directory: packages/desktop
cache-key: os-${{ runner.os }}-hash-${{ hashFiles('package-lock.json') }}

- name: Archive test screenshots
- name: Archive test screenshots # we are no longer using cypress snapshots so this can be removed/ignored
if: steps.filter.outputs.desktop == 'true'
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### New features

* Adds sticky date markers to the chat view [#505](https://github.com/TryQuiet/quiet/issues/505)
* Adds a context menu in Quiet desktop for copying text ([#503](https://github.com/TryQuiet/quiet/issues/503)) and saving images ([#503](https://github.com/TryQuiet/quiet/issues/568)) Thanks @agiledev24!
* Generating LFA-ready invite links when a sigchain is configured ([#2627](https://github.com/TryQuiet/quiet/issues/2627))
* Add local-first/auth powered libp2p authentication service ([#2629](https://github.com/TryQuiet/quiet/issues/2629))
Expand Down
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
> **New to open source?** You can learn how from this _free_ series: [How to Contribute to an Open Source Project on GitHub](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github).

1. Fork the repo and create your branch from `develop` (a guide on [how to fork a repository](https://help.github.com/articles/fork-a-repo/)).
2. Being in the root directory, run `npm i` and then `lerna bootstrap`, to setup the development environment.
3. Check out [desktop](https://github.com/TryQuiet/quiet/blob/develop/packages/desktop/README.md) and [mobile](https://github.com/TryQuiet/quiet/blob/develop/packages/mobile/README.md) README.md for more instructions.
2. See the [desktop](https://github.com/TryQuiet/quiet/blob/develop/packages/desktop/README.md) and [mobile](https://github.com/TryQuiet/quiet/blob/develop/packages/mobile/README.md) README.md to get started.

## Commit message convention

Expand Down
162 changes: 86 additions & 76 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/desktop/.eslintignore
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
src/**/*cy.tsx
11 changes: 11 additions & 0 deletions packages/desktop/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
module.exports = {
root: true,
extends: ['@quiet/eslint-config'],
parserOptions: {
project: ['./tsconfig.json', './tsconfig.cypress.json'],
},
overrides: [
{
files: ['**/*.cy.ts', '**/*.cy.tsx'],
rules: {
'@typescript-eslint/no-namespace': 'off', // Allow namespaces in Cypress files
},
},
],
}
Loading
Loading