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.

Sign up for GitHub

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

Jump to bottom

feat: Improvements for Delivered state and add tests #17611

Merged
merged 4 commits into from
Jun 19, 2024
Merged

feat: Improvements for Delivered state and add tests #17611

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d16f2b6
runfix: Missing OutlineCheck Icon (#17609)
przemvs Jun 19, 2024
b2953ce
Merge branch 'dev' of github.com:wireapp/wire-webapp into dev
przemvs Jun 19, 2024
adde9ce
feat: add dataUieValue for delivered state
przemvs Jun 19, 2024
009b1e7
fix cr changes and add tests
przemvs Jun 19, 2024
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: 5 additions & 1 deletion src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,11 @@ export const ContentMessageComponent = ({

<div css={deliveredMessageIndicator}>
{showDeliveredMessageIcon && (
<div data-uie-name="status-message-read-receipt-delivered" title={t('conversationMessageDelivered')}>
<div
data-uie-name="status-message-read-receipt-delivered"
title={showDeliveredMessageIcon ? t('conversationMessageDelivered') : ''}
data-uie-value={showDeliveredMessageIcon ? 'Delivered' : ''}
przemvs marked this conversation as resolved.
Show resolved Hide resolved
>
<OutlineCheck />
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion ...pt/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const messageBodyActions: CSSObject = {
minHeight: '32px',
minWidth: '40px',
position: 'absolute',
right: '16px',
right: '-40px',
Copy link
Contributor

Choose a reason for hiding this comment

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

can you explain what is happening here 🤔
Feels like a weird value

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's like that there, because there is added new container, and this MessageActions is displayed on message-body, not on whole container.

top: '-34px',
userSelect: 'none',
'@media (max-width: @screen-md-min)': {
Expand Down
7 changes: 6 additions & 1 deletion src/script/components/MessagesList/Message/PingMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ const PingMessage = ({message, is1to1Conversation, isLastDeliveredMessage}: Ping
</p>

{showDeliveredMessageIcon ? (
<div className="message-ping-delivered-icon" title={t('conversationMessageDelivered')}>
<div
className="message-ping-delivered-icon"
data-uie-name="status-message-read-receipt-delivered"
title={showDeliveredMessageIcon ? t('conversationMessageDelivered') : ''}
data-uie-value={showDeliveredMessageIcon ? 'Delivered' : ''}
>
<OutlineCheck />
</div>
) : (
Expand Down
Loading