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

Fix: Dismiss all toasts in a single container #1069

Merged
merged 2 commits into from Mar 2, 2024
Merged

Conversation

simgar98
Copy link
Contributor

Fix for issue #1068

Now how the heck do I squash these 3 ugly commits into 1 proper commit?

Copy link
Owner

@fkhadra fkhadra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR 🙏. You can run interactive rebase to squash your commits:

git rebase -i origin/main

From there you can squash your commits, you'll have to force push to your branch after that :) Hope it helps

@coveralls
Copy link

coveralls commented Feb 22, 2024

Coverage Status

coverage: 89.106% (+0.01%) from 89.093%
when pulling 1c25533 on simgar98:main
into edb231d on fkhadra:main.

@simgar98
Copy link
Contributor Author

Thanks for the PR 🙏. You can run interactive rebase to squash your commits:

git rebase -i origin/main

From there you can squash your commits, you'll have to force push to your branch after that :) Hope it helps

Done!
I have been spoiled by gitlab's merge-request squashing for too long :P
Test coverage falling by 0.2% is not an issue for you?

Fix: Dismiss all toasts in a single container (re-apply)
Run yarn prettier
@simgar98
Copy link
Contributor Author

First rebase went wrong cause I'm a scrub, darn force pushes bite me every time.
Change re-applied, and added a small test to increase coverage again (clearing with a non-existing container ID used to clear all toasts, kept that 'feature' and expanded the test for it in toast.cy.tsx line ~453)

@fkhadra fkhadra merged commit aea0bd9 into fkhadra:main Mar 2, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants