Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 27 additions & 1 deletion src/__tests__/lib/exampleData.js
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,20 @@ export const unicodeEmojiReaction: Reaction = deepFreeze({
emoji_name: 'thumbs_up',
});

export const zulipExtraEmojiReaction: Reaction = deepFreeze({
user_id: randUserId(),
reaction_type: 'zulip_extra_emoji',
emoji_code: 'zulip',
emoji_name: 'zulip',
});

export const realmEmojiReaction: Reaction = deepFreeze({
user_id: randUserId(),
reaction_type: 'realm_emoji',
emoji_code: '80',
emoji_name: 'github_parrot',
});

export const displayRecipientFromUser = (user: User): PmRecipientUser => {
const { email, full_name, user_id: id } = user;
return deepFreeze({
Expand Down Expand Up @@ -583,7 +597,19 @@ export const plusReduxState: GlobalState & PerAccountState = reduxState({
lastDismissedServerPushSetupNotice: null,
},
],
realm: { ...baseReduxState.realm, user_id: selfUser.user_id, email: selfUser.email },
realm: {
...baseReduxState.realm,
user_id: selfUser.user_id,
email: selfUser.email,
emoji: {
[realmEmojiReaction.emoji_code]: {
deactivated: false,
code: realmEmojiReaction.emoji_code,
name: realmEmojiReaction.emoji_name,
source_url: `/user_avatars/2/emoji/images/${realmEmojiReaction.emoji_code}.gif`,
},
},
},
// TODO add crossRealmBot
users: [selfUser, otherUser, thirdUser],
streams: [stream, otherStream],
Expand Down
2 changes: 1 addition & 1 deletion src/action-sheets/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ export const constructPmConversationActionButtons = ({
|}): Button<PmArgs>[] => {
const buttons = [];

// TODO: If 1:1 PM, give a mute/unmute-user button, with a confirmation
// TODO(#4655): If 1:1 PM, give a mute/unmute-user button, with a confirmation
// dialog saying that it also affects the muted users' stream messages,
// and linking to https://zulip.com/help/mute-a-user

Expand Down
Loading