Skip to content

[PronounsPage] sort pronouns list alphabetically #17558

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
danieldoglas merged 1 commit into from
Apr 18, 2023
Merged

[PronounsPage] sort pronouns list alphabetically #17558

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
41 changes: 22 additions & 19 deletions src/pages/settings/Profile/PronounsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,29 +81,32 @@ class PronounsPage extends Component {
loadPronouns() {
const currentPronouns = lodashGet(this.props.currentUserPersonalDetails, 'pronouns', '');

this.pronounsList = _.map(this.props.translate('pronouns'), (value, key) => {
const fullPronounKey = `${CONST.PRONOUNS.PREFIX}${key}`;
const isCurrentPronouns = fullPronounKey === currentPronouns;

if (isCurrentPronouns) {
this.initiallyFocusedOption = {
this.pronounsList = _.chain(this.props.translate('pronouns'))
.map((value, key) => {
const fullPronounKey = `${CONST.PRONOUNS.PREFIX}${key}`;
const isCurrentPronouns = fullPronounKey === currentPronouns;

if (isCurrentPronouns) {
this.initiallyFocusedOption = {
text: value,
keyForList: key,
};
}

return {
text: value,
value: fullPronounKey,
keyForList: key,
};
}

return {
text: value,
value: fullPronounKey,
keyForList: key,
// Include the green checkmark icon to indicate the currently selected value
customIcon: isCurrentPronouns ? greenCheckmark : undefined,

// Include the green checkmark icon to indicate the currently selected value
customIcon: isCurrentPronouns ? greenCheckmark : undefined,

// This property will make the currently selected value have bold text
boldStyle: isCurrentPronouns,
};
});
// This property will make the currently selected value have bold text
boldStyle: isCurrentPronouns,
};
})
.sortBy(pronoun => pronoun.text.toLowerCase())
.value();
}

/**
Expand Down