Skip to content

Personal details list migration: fix type error related ot avatar of anon users #20748

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

Merged
Beamanator merged 1 commit into from
Jun 14, 2023
Merged

Personal details list migration: fix type error related ot avatar of anon users #20748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/components/ReportWelcomeText.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ const personalDetailsPropTypes = PropTypes.shape({
login: PropTypes.string.isRequired,

/** The URL of the person's avatar (there should already be a default avatar if
the person doesn't have their own avatar uploaded yet) */
avatar: PropTypes.string.isRequired,
the person doesn't have their own avatar uploaded yet, except for anon users) */
avatar: PropTypes.string,

/** This is either the user's full name, or their login if full name is an empty string */
displayName: PropTypes.string.isRequired,
displayName: PropTypes.string,
});

const propTypes = {
Expand Down Expand Up @@ -82,6 +82,7 @@ function ReportWelcomeText(props) {
)}
{isChatRoom && (
<>
<Text>{props.translate('reportActionsView.beginningOfChatHistory')}</Text>
<Text>{roomWelcomeMessage.phrase1}</Text>
<Text
style={[styles.textStrong]}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/workspace/WorkspaceInviteMessagePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ const personalDetailsPropTypes = PropTypes.shape({
login: PropTypes.string.isRequired,

/** The URL of the person's avatar (there should already be a default avatar if
the person doesn't have their own avatar uploaded yet) */
avatar: PropTypes.string.isRequired,
the person doesn't have their own avatar uploaded yet, except for anon users) */
avatar: PropTypes.string,

/** This is either the user's full name, or their login if full name is an empty string */
displayName: PropTypes.string.isRequired,
displayName: PropTypes.string,
});

const propTypes = {
Expand Down
6 changes: 3 additions & 3 deletions src/pages/workspace/WorkspaceInvitePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ const personalDetailsPropTypes = PropTypes.shape({
login: PropTypes.string.isRequired,

/** The URL of the person's avatar (there should already be a default avatar if
the person doesn't have their own avatar uploaded yet) */
avatar: PropTypes.string.isRequired,
the person doesn't have their own avatar uploaded yet, except for anon users) */
avatar: PropTypes.string,

/** This is either the user's full name, or their login if full name is an empty string */
displayName: PropTypes.string.isRequired,
displayName: PropTypes.string,
});

const propTypes = {
Expand Down