UI for when read receipts are turned off
This commit is contained in:
parent
7632f31cf2
commit
39143015c5
8 changed files with 135 additions and 33 deletions
|
@ -7487,6 +7487,10 @@
|
|||
"message": "Unmute",
|
||||
"description": "Aria label for unmuting stories"
|
||||
},
|
||||
"StoryViewer__views-off": {
|
||||
"message": "Views off",
|
||||
"description": "When the user has read receipts turned off"
|
||||
},
|
||||
"StoryDetailsModal__sent-time": {
|
||||
"message": "Sent $time$",
|
||||
"description": "Sent timestamp",
|
||||
|
@ -7511,6 +7515,10 @@
|
|||
"message": "Copy timestamp",
|
||||
"description": "Context menu item to help debugging"
|
||||
},
|
||||
"StoryViewsNRepliesModal__read-receipts-off": {
|
||||
"message": "Enable read receipts to see who's viewed your stories. Open the Signal app on your mobile device and navigate to Settings > Privacy.",
|
||||
"description": "Instructions on how to enable read receipts"
|
||||
},
|
||||
"StoryViewsNRepliesModal__no-replies": {
|
||||
"message": "No replies yet",
|
||||
"description": "Placeholder text for when there are no replies"
|
||||
|
|
|
@ -208,6 +208,11 @@
|
|||
&__copy-icon {
|
||||
@include color-svg('../images/icons/v2/copy-outline-24.svg', $color-white);
|
||||
}
|
||||
|
||||
&__read-receipts-off {
|
||||
color: $color-gray-25;
|
||||
margin: 160px 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.Tabs.StoryViewsNRepliesModal__tabs {
|
||||
|
|
|
@ -31,6 +31,9 @@ export default {
|
|||
hasAllStoriesMuted: {
|
||||
defaultValue: false,
|
||||
},
|
||||
hasReadReceiptSetting: {
|
||||
defaultValue: true,
|
||||
},
|
||||
i18n: {
|
||||
defaultValue: i18n,
|
||||
},
|
||||
|
@ -168,3 +171,35 @@ export const YourStory = Template.bind({});
|
|||
};
|
||||
YourStory.storyName = 'Your story';
|
||||
}
|
||||
|
||||
export const ReadReceiptsOff = Template.bind({});
|
||||
{
|
||||
const storyView = getFakeStoryView(
|
||||
'/fixtures/nathan-anderson-316188-unsplash.jpg'
|
||||
);
|
||||
ReadReceiptsOff.args = {
|
||||
hasReadReceiptSetting: false,
|
||||
story: {
|
||||
...storyView,
|
||||
sender: {
|
||||
...storyView.sender,
|
||||
isMe: true,
|
||||
},
|
||||
sendState: [
|
||||
{
|
||||
recipient: getDefaultConversation(),
|
||||
status: SendStatus.Viewed,
|
||||
},
|
||||
{
|
||||
recipient: getDefaultConversation(),
|
||||
status: SendStatus.Delivered,
|
||||
},
|
||||
{
|
||||
recipient: getDefaultConversation(),
|
||||
status: SendStatus.Pending,
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
}
|
||||
ReadReceiptsOff.storyName = 'Read receipts turned off';
|
||||
|
|
|
@ -59,6 +59,7 @@ export type PropsType = {
|
|||
>;
|
||||
hasActiveCall?: boolean;
|
||||
hasAllStoriesMuted: boolean;
|
||||
hasReadReceiptSetting: boolean;
|
||||
i18n: LocalizerType;
|
||||
loadStoryReplies: (conversationId: string, messageId: string) => unknown;
|
||||
markStoryRead: (mId: string) => unknown;
|
||||
|
@ -107,6 +108,7 @@ export const StoryViewer = ({
|
|||
group,
|
||||
hasActiveCall,
|
||||
hasAllStoriesMuted,
|
||||
hasReadReceiptSetting,
|
||||
i18n,
|
||||
loadStoryReplies,
|
||||
markStoryRead,
|
||||
|
@ -661,7 +663,11 @@ export const StoryViewer = ({
|
|||
<>
|
||||
{sendState || replyCount > 0 ? (
|
||||
<span className="StoryViewer__reply__chevron">
|
||||
{sendState && !hasReadReceiptSetting && !replyCount && (
|
||||
<>{i18n('StoryViewer__views-off')}</>
|
||||
)}
|
||||
{sendState &&
|
||||
hasReadReceiptSetting &&
|
||||
(viewCount === 1 ? (
|
||||
<Intl
|
||||
i18n={i18n}
|
||||
|
@ -749,6 +755,7 @@ export const StoryViewer = ({
|
|||
authorTitle={firstName || title}
|
||||
canReply={Boolean(canReply)}
|
||||
getPreferredBadge={getPreferredBadge}
|
||||
hasReadReceiptSetting={hasReadReceiptSetting}
|
||||
i18n={i18n}
|
||||
isGroupStory={isGroupStory}
|
||||
onClose={() => setHasStoryViewsNRepliesModal(false)}
|
||||
|
|
|
@ -28,6 +28,9 @@ export default {
|
|||
defaultValue: true,
|
||||
},
|
||||
getPreferredBadge: { action: true },
|
||||
hasReadReceiptSetting: {
|
||||
defaultValue: true,
|
||||
},
|
||||
i18n: {
|
||||
defaultValue: i18n,
|
||||
},
|
||||
|
@ -202,3 +205,23 @@ export const InAGroupCantReply = Template.bind({});
|
|||
};
|
||||
}
|
||||
InAGroupCantReply.storyName = "In a group (can't reply)";
|
||||
|
||||
export const ReadReceiptsTurnedOff = Template.bind({});
|
||||
ReadReceiptsTurnedOff.args = {
|
||||
canReply: false,
|
||||
hasReadReceiptSetting: false,
|
||||
views: getViewsAndReplies().views,
|
||||
};
|
||||
ReadReceiptsTurnedOff.storyName = 'Read receipts turned off';
|
||||
|
||||
export const GroupReadReceiptsOff = Template.bind({});
|
||||
{
|
||||
const { views, replies } = getViewsAndReplies();
|
||||
GroupReadReceiptsOff.args = {
|
||||
hasReadReceiptSetting: false,
|
||||
isGroupStory: true,
|
||||
replies,
|
||||
views,
|
||||
};
|
||||
}
|
||||
GroupReadReceiptsOff.storyName = 'Read receipts turned off (group)';
|
||||
|
|
|
@ -87,6 +87,7 @@ export type PropsType = {
|
|||
authorTitle: string;
|
||||
canReply: boolean;
|
||||
getPreferredBadge: PreferredBadgeSelectorType;
|
||||
hasReadReceiptSetting: boolean;
|
||||
i18n: LocalizerType;
|
||||
isGroupStory?: boolean;
|
||||
onClose: () => unknown;
|
||||
|
@ -113,6 +114,7 @@ export const StoryViewsNRepliesModal = ({
|
|||
authorTitle,
|
||||
canReply,
|
||||
getPreferredBadge,
|
||||
hasReadReceiptSetting,
|
||||
i18n,
|
||||
isGroupStory,
|
||||
onClose,
|
||||
|
@ -353,10 +355,21 @@ export const StoryViewsNRepliesModal = ({
|
|||
);
|
||||
}
|
||||
|
||||
const viewsElement = views.length ? (
|
||||
let viewsElement: JSX.Element | undefined;
|
||||
if (!hasReadReceiptSetting) {
|
||||
viewsElement = (
|
||||
<div className="StoryViewsNRepliesModal__read-receipts-off">
|
||||
{i18n('StoryViewsNRepliesModal__read-receipts-off')}
|
||||
</div>
|
||||
);
|
||||
} else if (views.length) {
|
||||
viewsElement = (
|
||||
<div className="StoryViewsNRepliesModal__views">
|
||||
{views.map(view => (
|
||||
<div className="StoryViewsNRepliesModal__view" key={view.recipient.id}>
|
||||
<div
|
||||
className="StoryViewsNRepliesModal__view"
|
||||
key={view.recipient.id}
|
||||
>
|
||||
<div>
|
||||
<Avatar
|
||||
acceptedMessageRequest={view.recipient.acceptedMessageRequest}
|
||||
|
@ -386,7 +399,8 @@ export const StoryViewsNRepliesModal = ({
|
|||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : undefined;
|
||||
);
|
||||
}
|
||||
|
||||
const tabsElement =
|
||||
views.length && replies.length ? (
|
||||
|
|
|
@ -130,3 +130,8 @@ export const getHasSetMyStoriesPrivacy = createSelector(
|
|||
getItems,
|
||||
(state: ItemsStateType): boolean => Boolean(state.hasSetMyStoriesPrivacy)
|
||||
);
|
||||
|
||||
export const getHasReadReceiptSetting = createSelector(
|
||||
getItems,
|
||||
(state: ItemsStateType): boolean => Boolean(state['read-receipt-setting'])
|
||||
);
|
||||
|
|
|
@ -14,6 +14,7 @@ import { getConversationSelector } from '../selectors/conversations';
|
|||
import {
|
||||
getEmojiSkinTone,
|
||||
getHasAllStoriesMuted,
|
||||
getHasReadReceiptSetting,
|
||||
getPreferredReactionEmoji,
|
||||
} from '../selectors/items';
|
||||
import { getIntl } from '../selectors/user';
|
||||
|
@ -76,6 +77,9 @@ export function SmartStoryViewer(): JSX.Element | null {
|
|||
);
|
||||
|
||||
const hasActiveCall = useSelector(isInFullScreenCall);
|
||||
const hasReadReceiptSetting = useSelector<StateType, boolean>(
|
||||
getHasReadReceiptSetting
|
||||
);
|
||||
|
||||
return (
|
||||
<StoryViewer
|
||||
|
@ -84,6 +88,7 @@ export function SmartStoryViewer(): JSX.Element | null {
|
|||
group={conversationStory.group}
|
||||
hasActiveCall={hasActiveCall}
|
||||
hasAllStoriesMuted={hasAllStoriesMuted}
|
||||
hasReadReceiptSetting={hasReadReceiptSetting}
|
||||
i18n={i18n}
|
||||
numStories={selectedStoryData.numStories}
|
||||
onHideStory={toggleHideStories}
|
||||
|
|
Loading…
Reference in a new issue