diff --git a/src/profile/ProfilePage.test.jsx b/src/profile/ProfilePage.test.jsx index 0b7c6be6e..be4b0a5ba 100644 --- a/src/profile/ProfilePage.test.jsx +++ b/src/profile/ProfilePage.test.jsx @@ -168,7 +168,7 @@ describe('', () => { courseCertificates: ['course certificates'], levelOfEducation: 'some level', languageProficiencies: ['some lang'], - socialLinks: ['twitter'], + socialLinks: ['x'], timeZone: 'time zone', accountPrivacy: 'all_users', }, diff --git a/src/profile/__mocks__/savingEditedBio.mockStore.js b/src/profile/__mocks__/savingEditedBio.mockStore.js index 63551e823..ce0543aa6 100644 --- a/src/profile/__mocks__/savingEditedBio.mockStore.js +++ b/src/profile/__mocks__/savingEditedBio.mockStore.js @@ -13,8 +13,8 @@ module.exports = { socialLink: 'https://www.facebook.com/aloha' }, { - platform: 'twitter', - socialLink: 'https://www.twitter.com/ALOHA' + platform: 'x', + socialLink: 'https://www.x.com/ALOHA' } ], profileImage: { @@ -85,8 +85,8 @@ module.exports = { socialLink: 'https://www.facebook.com/aloha' }, { - platform: 'twitter', - socialLink: 'https://www.twitter.com/ALOHA' + platform: 'x', + socialLink: 'https://www.x.com/ALOHA' } ], timeZone: null, diff --git a/src/profile/__mocks__/viewOtherProfile.mockStore.js b/src/profile/__mocks__/viewOtherProfile.mockStore.js index e894d483e..b992c8cf3 100644 --- a/src/profile/__mocks__/viewOtherProfile.mockStore.js +++ b/src/profile/__mocks__/viewOtherProfile.mockStore.js @@ -13,8 +13,8 @@ module.exports = { socialLink: 'https://www.facebook.com/aloha' }, { - platform: 'twitter', - socialLink: 'https://www.twitter.com/ALOHA' + platform: 'x', + socialLink: 'https://www.x.com/ALOHA' } ], profileImage: { diff --git a/src/profile/__mocks__/viewOwnProfile.mockStore.js b/src/profile/__mocks__/viewOwnProfile.mockStore.js index 9e9419eb0..ad037a34f 100644 --- a/src/profile/__mocks__/viewOwnProfile.mockStore.js +++ b/src/profile/__mocks__/viewOwnProfile.mockStore.js @@ -13,8 +13,8 @@ module.exports = { socialLink: 'https://www.facebook.com/aloha' }, { - platform: 'twitter', - socialLink: 'https://www.twitter.com/ALOHA' + platform: 'x', + socialLink: 'https://www.x.com/ALOHA' } ], profileImage: { @@ -85,8 +85,8 @@ module.exports = { socialLink: 'https://www.facebook.com/aloha' }, { - platform: 'twitter', - socialLink: 'https://www.twitter.com/ALOHA' + platform: 'x', + socialLink: 'https://www.x.com/ALOHA' } ], timeZone: null, diff --git a/src/profile/__snapshots__/ProfilePage.test.jsx.snap b/src/profile/__snapshots__/ProfilePage.test.jsx.snap index e43a2e185..ec6269892 100644 --- a/src/profile/__snapshots__/ProfilePage.test.jsx.snap +++ b/src/profile/__snapshots__/ProfilePage.test.jsx.snap @@ -65,10 +65,9 @@ exports[` Renders correctly in various states successfully redire Upload Photo - @@ -508,7 +507,7 @@ exports[` Renders correctly in various states successfully redire xmlns="http://www.w3.org/2000/svg" > @@ -536,7 +535,7 @@ exports[` Renders correctly in various states successfully redire xmlns="http://www.w3.org/2000/svg" > @@ -583,7 +582,7 @@ exports[` Renders correctly in various states successfully redire xmlns="http://www.w3.org/2000/svg" > @@ -621,7 +620,7 @@ exports[` Renders correctly in various states successfully redire xmlns="http://www.w3.org/2000/svg" > @@ -899,7 +898,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -923,7 +922,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -2372,7 +2371,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -2442,7 +2441,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -2466,7 +2465,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -2512,7 +2511,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -2553,12 +2552,12 @@ exports[` Renders correctly in various states test country edit w > Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > - Twitter + X (Twitter)
  • Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -2663,7 +2662,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -2733,7 +2732,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -3104,7 +3103,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3128,7 +3127,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3179,7 +3178,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3249,7 +3248,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3406,7 +3405,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3511,7 +3510,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3552,12 +3551,12 @@ exports[` Renders correctly in various states test education edit > Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > - Twitter + X (Twitter)
  • Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3662,7 +3661,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3732,7 +3731,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -4103,7 +4102,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -4127,7 +4126,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -4178,7 +4177,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5315,7 +5314,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5339,7 +5338,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5385,7 +5384,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5426,12 +5425,12 @@ exports[` Renders correctly in various states test preferreded la > Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > - Twitter + X (Twitter)
  • Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5536,7 +5535,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5606,7 +5605,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5768,10 +5767,9 @@ exports[` Renders correctly in various states viewing other profi
    -
  • Renders correctly in various states viewing own profile xmlns="http://www.w3.org/2000/svg" > @@ -6819,7 +6817,7 @@ exports[` Renders correctly in various states viewing own profile xmlns="http://www.w3.org/2000/svg" > @@ -6889,7 +6887,7 @@ exports[` Renders correctly in various states viewing own profile xmlns="http://www.w3.org/2000/svg" > @@ -7260,7 +7258,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7284,7 +7282,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7335,7 +7333,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7405,7 +7403,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7475,7 +7473,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7499,7 +7497,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7545,7 +7543,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7586,12 +7584,12 @@ exports[` Renders correctly in various states while saving an edi > Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > - Twitter + X (Twitter)
  • Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7830,7 +7828,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8201,7 +8199,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8225,7 +8223,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8276,7 +8274,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8346,7 +8344,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8416,7 +8414,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8440,7 +8438,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8486,7 +8484,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8527,12 +8525,12 @@ exports[` Renders correctly in various states while saving an edi > Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > - Twitter + X (Twitter)
  • Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8779,7 +8777,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -9070,7 +9068,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > @@ -9094,7 +9092,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > @@ -9145,7 +9143,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > @@ -9215,7 +9213,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > @@ -9285,7 +9283,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > @@ -9309,7 +9307,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > @@ -9355,7 +9353,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > @@ -9396,12 +9394,12 @@ exports[` Renders correctly in various states without credentials > Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > - Twitter + X (Twitter)
  • Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > @@ -9506,7 +9504,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > @@ -9576,7 +9574,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > diff --git a/src/profile/data/constants.js b/src/profile/data/constants.js index 1db167380..17ad5ada7 100644 --- a/src/profile/data/constants.js +++ b/src/profile/data/constants.js @@ -14,8 +14,8 @@ const SOCIAL = { linkedin: { title: 'LinkedIn', }, - twitter: { - title: 'Twitter', + x: { + title: 'X', }, facebook: { title: 'Facebook', diff --git a/src/profile/data/selectors.js b/src/profile/data/selectors.js index b04493e6e..6d33e8b6a 100644 --- a/src/profile/data/selectors.js +++ b/src/profile/data/selectors.js @@ -201,7 +201,7 @@ export const formSocialLinksSelector = createSelector( socialLinksByPlatformSelector, draftSocialLinksByPlatformSelector, (linksByPlatform, draftLinksByPlatform) => { - const knownPlatforms = ['twitter', 'facebook', 'linkedin']; + const knownPlatforms = ['x', 'facebook', 'linkedin']; const socialLinks = []; // For each known platform knownPlatforms.forEach((platform) => { diff --git a/src/profile/forms/SocialLinks.jsx b/src/profile/forms/SocialLinks.jsx index f7d178ecd..26833917b 100644 --- a/src/profile/forms/SocialLinks.jsx +++ b/src/profile/forms/SocialLinks.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { Alert } from '@openedx/paragon'; import { connect } from 'react-redux'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { faTwitter, faFacebook, faLinkedin } from '@fortawesome/free-brands-svg-icons'; +import { faXTwitter, faFacebook, faLinkedin } from '@fortawesome/free-brands-svg-icons'; import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n'; import classNames from 'classnames'; @@ -23,9 +23,9 @@ const platformDisplayInfo = { icon: faFacebook, name: 'Facebook', }, - twitter: { - icon: faTwitter, - name: 'Twitter', + x: { + icon: faXTwitter, + name: 'X (Twitter)', }, linkedin: { icon: faLinkedin, @@ -108,7 +108,7 @@ const EmptyListItem = ({ onClick, name }) => ( values={{ network: name, }} - description="{network} is the name of a social network such as Facebook or Twitter" + description="{network} is the name of a social network such as Facebook or X" />
    • @@ -181,7 +181,7 @@ class SocialLinks extends React.Component { } mergeWithDrafts(newSocialLink) { - const knownPlatforms = ['twitter', 'facebook', 'linkedin']; + const knownPlatforms = ['x', 'facebook', 'linkedin']; const updated = []; knownPlatforms.forEach((platform) => { if (newSocialLink.platform === platform) { diff --git a/src/profile/forms/SocialLinks.test.jsx b/src/profile/forms/SocialLinks.test.jsx index 0392d063f..7f3c3bbce 100644 --- a/src/profile/forms/SocialLinks.test.jsx +++ b/src/profile/forms/SocialLinks.test.jsx @@ -22,8 +22,8 @@ const defaultProps = { socialLink: 'https://www.facebook.com/aloha', }, { - platform: 'twitter', - socialLink: 'https://www.twitter.com/ALOHA', + platform: 'x', + socialLink: 'https://www.x.com/ALOHA', }, ], drafts: {}, diff --git a/src/profile/forms/__snapshots__/SocialLinks.test.jsx.snap b/src/profile/forms/__snapshots__/SocialLinks.test.jsx.snap index 22ba79c8c..e6240a07b 100644 --- a/src/profile/forms/__snapshots__/SocialLinks.test.jsx.snap +++ b/src/profile/forms/__snapshots__/SocialLinks.test.jsx.snap @@ -52,17 +52,17 @@ exports[` calls social links with edit mode bio 1`] = ` class="form-group" > @@ -96,7 +96,7 @@ exports[` calls social links with edit mode bio 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -206,7 +206,7 @@ exports[` calls social links with edit mode certificates 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -230,7 +230,7 @@ exports[` calls social links with edit mode certificates 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -272,12 +272,12 @@ exports[` calls social links with edit mode certificates 1`] = ` > calls social links with edit mode certificates 1`] = ` xmlns="http://www.w3.org/2000/svg" > - Twitter + X (Twitter) @@ -338,7 +338,7 @@ exports[` calls social links with edit mode goals 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -366,11 +366,11 @@ exports[` calls social links with edit mode goals 1`] = ` xmlns="http://www.w3.org/2000/svg" > - Add Twitter + Add X (Twitter) @@ -411,7 +411,7 @@ exports[` calls social links with edit mode socialLinks 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -435,7 +435,7 @@ exports[` calls social links with edit mode socialLinks 1`] = ` xmlns="http://www.w3.org/2000/svg" > @@ -477,12 +477,12 @@ exports[` calls social links with edit mode socialLinks 1`] = ` > calls social links with edit mode socialLinks 1`] = ` xmlns="http://www.w3.org/2000/svg" > - Twitter + X (Twitter)