Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

H

holi-frontends
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Package registry
- Terraform modules
- Contributor analytics

Snippets Groups Projects

f927be6b

Commit f927be6b authored 3 days ago by Stefano Cerelli

Downloads
- Plain Diff

Merge branch 'holi-10901-block-user-okuna-chat' into 'main'

HOLI-10901 - Block user as well in Okuna and in Matrix

See merge request app/holi-frontends!3080

parents 95cd566a 17fca2ae

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

core/hooks/__tests__/useBlockUser.test.tsx 74 additions, 0 deletions

core/hooks/__tests__/useBlockUser.test.tsx
core/hooks/useBlockUser.ts 44 additions, 17 deletions

core/hooks/useBlockUser.ts
core/screens/chat/ChatRoomView/PrivateRoomView.tsx 2 additions, 2 deletions

core/screens/chat/ChatRoomView/PrivateRoomView.tsx
core/screens/userprofile/UserProfile.tsx 8 additions, 6 deletions

core/screens/userprofile/UserProfile.tsx
core/screens/userprofile/components/StartChatButton.tsx 1 addition, 0 deletions

core/screens/userprofile/components/StartChatButton.tsx
packages/chat/src/components/ChatRoomActionDrawer.tsx 8 additions, 6 deletions

packages/chat/src/components/ChatRoomActionDrawer.tsx
packages/chat/src/store/store.ts 1 addition, 1 deletion

packages/chat/src/store/store.ts

with 138 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment