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
2 changes: 1 addition & 1 deletion packages/shared/src/features/messages/access.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export enum DmAccess {
PeerUnavailable = 'peer_unavailable',
// The peer asked to message the viewer, who hasn't answered yet.
RequestReceived = 'request_received',
// The users don't follow each other, so the viewer has to ask first.
// The peer doesn't follow the viewer, so the viewer has to ask first.
RequestRequired = 'request_required',
RequestPending = 'request_pending',
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { DM_REQUEST_MAX_LENGTH } from '../types';

const genericError = "Couldn't send your request. Please try again.";

// Users who don't follow each other start with one short note the peer
// A sender the peer doesn't follow starts with one short note the peer
// accepts or declines; the chat opens once they accept.
export const MessageRequestComposer = ({
peer,
Expand Down Expand Up @@ -78,8 +78,8 @@ export const MessageRequestComposer = ({
type={TypographyType.Footnote}
color={TypographyColor.Tertiary}
>
You and @{peer.username} don't follow each other, so send a short
message request first. You can chat once they accept.
@{peer.username} doesn't follow you, so send a short message

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Non-blocking, about merge order: this copy is only true once dailydotdev/daily-api#4389 is deployed. If apps ships first, a viewer the peer does follow, but who doesn't follow the peer back, still gets request_required from the current API and would read "@peer doesn't follow you", which is wrong for them. The two PRs aren't fully independent: please merge this after the API change is live (or together with it).

Reviewed by AI.

request first. You can chat once they accept.
</Typography>
<textarea
id="dm-request-composer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ export const RequestList = ({
type={TypographyType.Footnote}
color={TypographyColor.Tertiary}
>
People you don&apos;t follow back land here first, so you decide who
can message you.
People you don&apos;t follow land here first, so you decide who can
message you.
</Typography>
</FlexCol>
);
Expand Down
Loading