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

feat: Remove default add btn in advanced settings, add block btn on u… #4075

Merged
merged 4 commits into from
Jan 17, 2025

Conversation

AmarTrebinjac
Copy link
Contributor

@AmarTrebinjac AmarTrebinjac commented Jan 16, 2025

Changes

Custom feed design has the unblock button:
image

But currently, all tabs look like this:
image
And they function as a follow button. So I updated it to be as in the design

Events

Did you introduce any new tracking events?

Experiment

Did you introduce any new experiments?

Manual Testing

Caution

Please make sure existing components are not breaking/affected by this PR

Preview domain

https://mi-758.preview.app.daily.dev

Copy link

vercel bot commented Jan 16, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
daily-webapp ✅ Ready (Inspect) Visit Preview Jan 17, 2025 1:06pm
1 Skipped Deployment
Name Status Preview Updated (UTC)
storybook ⬜️ Ignored (Inspect) Jan 17, 2025 1:06pm

return (
<Button
onClick={(e) => {
e.preventDefault();
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we need to prevent default? If this button is submitting some form we can add type="button" and prevent it :)

Copy link
Contributor Author

@AmarTrebinjac AmarTrebinjac Jan 17, 2025

Choose a reason for hiding this comment

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

It's wrapped inside a link in another component. Unfortunately not much to be done about other than this

Copy link
Contributor

Choose a reason for hiding this comment

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

IMO it's a major mistake have a button inside a link, so I've opened a PR fixing this issue

Copy link
Member

Choose a reason for hiding this comment

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

I agree with the wrapping concern. Normally, React automatically detecs those kind of nesting and prompts a warning in the console.

Copy link
Contributor

@ilasw ilasw left a comment

Choose a reason for hiding this comment

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

Just some minor feedback, overall GJ ✔️

Copy link
Member

@sshanzel sshanzel left a comment

Choose a reason for hiding this comment

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

🚀

@AmarTrebinjac AmarTrebinjac merged commit f783008 into MI-655-report-and-block-user Jan 17, 2025
10 checks passed
@AmarTrebinjac AmarTrebinjac deleted the MI-758 branch January 17, 2025 13:07
AmarTrebinjac added a commit that referenced this pull request Jan 20, 2025
* feat: ReportUserModal (#4051)

* feat: ReportUserModal

* formatting

* lint

* remove unnecessary check

* update conditional

* remove need to pass onClose

* capitalize values

* feat: Add block and report to user profile (#4054)

* feat: ReportUserModal

* formatting

* lint

* remove unnecessary check

* update conditional

* remove need to pass onClose

* capitalize values

* feat: Add block and report to user profile

* feat: Block, report, share on profile available for everyone (#4059)

* feat: Block, report, share on profile available for everyone

* update copy

* update to still show share button when only 1 opt available

* fix: Should not show following when blocked (#4064)

* fix: Should not show following when blocked

* update syntax

* fix: No longer open report modal when reporting user (#4069)

* fix: No longer open report modal when reporting user

* add block request key to status map

* feat: add block user option on post context menu (#4053)

* feat: ReportUserModal

* formatting

* lint

* remove unnecessary check

* update conditional

* feat: add block user option in post context menu

* remove need to pass onClose

* capitalize values

* feat: add optimistic update on unblock

* feat: refactor avoiding additional query

* fix: ssr error

* feat: add contentPreference data for author

* feat: hide follow option for blocked users, change source block label;

* feat: clear cache on block

* feat: block on custom feed feature

* test: update label for block/unblock

* refactor: invalidate cache is not a utility

* feat: added new labels and block directly without report modal

* feat: hide post from feed and add undo action to toast

---------

Co-authored-by: Amar Trebinjac <amartrebinjac@gmail.com>

* update hateful key

* Update packages/shared/src/components/modals/report/ReportUserModal.tsx

Co-authored-by: Lee Hansel Solevilla <13744167+sshanzel@users.noreply.github.com>

* fix: cache invalidation (#4078)

* move query invalidation

* remove unused hook

* remove follow button on profile when blocked

* feat: Remove default add btn in advanced settings, add block btn on u… (#4075)

* feat: Remove default add btn in advanced settings, add block btn on users

* make reusable component

* invalidate specific feed

* undo feed key

* use onsettled to close

* add author block

* use username instead of name

* try invalidate userblocked request key

* use correct username

* remove unnecessary feed invalidation

* fix: block button inside link in source list (#4077)

* feat: Remove default add btn in advanced settings, add block btn on users

* make reusable component

* fix: button inside link

* fix: lint unused var

* fix: moved key from children to parent

* fix: UserList open in new tab

---------

Co-authored-by: Amar Trebinjac <amartrebinjac@gmail.com>
Co-authored-by: Amar Trebinjac <36768584+AmarTrebinjac@users.noreply.github.com>

* fix: invalidation of blocked users for settings

---------

Co-authored-by: Luca Pagliaro <pagliaroluca@gmail.com>
Co-authored-by: Lee Hansel Solevilla <13744167+sshanzel@users.noreply.github.com>
Co-authored-by: capJavert <dev@kickass.website>
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.

4 participants