From 999988dd88366c9649000951ef0015aa452bf00b Mon Sep 17 00:00:00 2001 From: ayesha waris <73840786+ayesha-waris@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:12:27 +0500 Subject: [PATCH 1/5] fix: fixed support urls (#1155) --- .env | 2 +- .env.development | 2 +- .env.test | 2 +- src/account-settings/delete-account/DeleteAccount.jsx | 4 ++-- .../__snapshots__/DeleteAccount.test.jsx.snap | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.env b/.env index 1f0b6434d..ff9614e38 100644 --- a/.env +++ b/.env @@ -32,4 +32,4 @@ APP_ID= MFE_CONFIG_API_URL= PASSWORD_RESET_SUPPORT_LINK='' LEARNER_FEEDBACK_URL='' -SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://support.edx.org/hc/en-us/articles/207206067' +SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://help.edx.org/edxlearner/s/article/How-do-I-link-or-unlink-my-edX-account-to-a-social-media-account' diff --git a/.env.development b/.env.development index c3c003740..8e866555f 100644 --- a/.env.development +++ b/.env.development @@ -33,4 +33,4 @@ APP_ID= MFE_CONFIG_API_URL= PASSWORD_RESET_SUPPORT_LINK='mailto:support@example.com' LEARNER_FEEDBACK_URL='' -SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://support.edx.org/hc/en-us/articles/207206067' +SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://help.edx.org/edxlearner/s/article/How-do-I-link-or-unlink-my-edX-account-to-a-social-media-account' diff --git a/.env.test b/.env.test index b9078fc77..ab43a461e 100644 --- a/.env.test +++ b/.env.test @@ -30,4 +30,4 @@ MARKETING_EMAILS_OPT_IN='' APP_ID= MFE_CONFIG_API_URL= LEARNER_FEEDBACK_URL='' -SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://support.edx.org/hc/en-us/articles/207206067' +SUPPORT_URL_TO_UNLINK_SOCIAL_MEDIA_ACCOUNT='https://help.edx.org/edxlearner/s/article/How-do-I-link-or-unlink-my-edX-account-to-a-social-media-account' diff --git a/src/account-settings/delete-account/DeleteAccount.jsx b/src/account-settings/delete-account/DeleteAccount.jsx index 189fd8e53..6c04cb989 100644 --- a/src/account-settings/delete-account/DeleteAccount.jsx +++ b/src/account-settings/delete-account/DeleteAccount.jsx @@ -99,7 +99,7 @@ export class DeleteAccount extends React.Component { )}

- + {intl.formatMessage(messages['account.settings.delete.account.text.change.instead'])}

@@ -116,7 +116,7 @@ export class DeleteAccount extends React.Component { {isVerifiedAccount ? null : ( )} diff --git a/src/account-settings/delete-account/__snapshots__/DeleteAccount.test.jsx.snap b/src/account-settings/delete-account/__snapshots__/DeleteAccount.test.jsx.snap index 802c6eb8f..3ebd85b37 100644 --- a/src/account-settings/delete-account/__snapshots__/DeleteAccount.test.jsx.snap +++ b/src/account-settings/delete-account/__snapshots__/DeleteAccount.test.jsx.snap @@ -27,7 +27,7 @@ exports[`DeleteAccount should match default section snapshot 1`] = `

@@ -74,7 +74,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = `

@@ -117,7 +117,7 @@ exports[`DeleteAccount should match unverified account section snapshot 1`] = ` Before proceeding, please @@ -156,7 +156,7 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = `

@@ -199,7 +199,7 @@ exports[`DeleteAccount should match unverified account section snapshot 2`] = ` Before proceeding, please From f44e03c7c857c78471e4724bd24e7cb432177d20 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 07:11:39 +0000 Subject: [PATCH 2/5] fix(deps): update dependency @edx/frontend-component-header to v5.7.1 (#1156) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 09173cb40..e8b0a51a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2010,9 +2010,9 @@ } }, "node_modules/@edx/frontend-component-header": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-5.7.0.tgz", - "integrity": "sha512-a7ErsU0m6yaU8VGLN4JYC1Y43W5L/zSCZSmpDZw534LiPK43k4eyU8u5Ep1yxp+8sOvB49qED4huIq+1oVDJsA==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-5.7.1.tgz", + "integrity": "sha512-3a7JcoqW1jUGbOoEoi8+COlxKLAd+DigAPiUNwcuefmGKYN05pF/vRc6yt0W03rHLYkq7A23CFyoqhZC44GTZg==", "license": "AGPL-3.0", "dependencies": { "@fortawesome/fontawesome-svg-core": "6.6.0", From 925bcce81cea569b5727bc39aeb03d80d746bed6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 07:12:06 +0000 Subject: [PATCH 3/5] fix(deps): update dependency @openedx/frontend-slot-footer to v1.0.6 (#1157) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e8b0a51a5..5163d6bab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3367,9 +3367,9 @@ } }, "node_modules/@openedx/frontend-slot-footer": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@openedx/frontend-slot-footer/-/frontend-slot-footer-1.0.5.tgz", - "integrity": "sha512-hlKj2p7zgAHfPTbmW4rAMUCCj35uCbm9VfRkZYPEIX2bdhkPjc4OIGTE5CKGkyWG5+zL+aap1ywwcKEjEgOMOQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@openedx/frontend-slot-footer/-/frontend-slot-footer-1.0.6.tgz", + "integrity": "sha512-6wdbxYeSzpUOaZrnglkAI0PJ/CB8pMP3xbYXQNQ+VR4U8pkH8EFwEQjwak4OVmodS8//eW9xgYv79YB4H7mGEQ==", "license": "AGPL-3.0", "dependencies": { "@openedx/frontend-plugin-framework": "^1.1.2" From 4eb5d4effc293f5b27fe06baf009f1a3834bd489 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 06:49:32 +0000 Subject: [PATCH 4/5] fix(deps): update dependency @edx/frontend-component-header to v5.7.2 (#1160) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5163d6bab..f2c1be13d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2010,9 +2010,9 @@ } }, "node_modules/@edx/frontend-component-header": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-5.7.1.tgz", - "integrity": "sha512-3a7JcoqW1jUGbOoEoi8+COlxKLAd+DigAPiUNwcuefmGKYN05pF/vRc6yt0W03rHLYkq7A23CFyoqhZC44GTZg==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-5.7.2.tgz", + "integrity": "sha512-2+OHwdZ4X3wYsIIKwPhhPxO0MRvNK+NB373XrncHjuM7S8Cv7dO+/vBML5sISUQE/+pMmvV0yKk+MTQKmbubYA==", "license": "AGPL-3.0", "dependencies": { "@fortawesome/fontawesome-svg-core": "6.6.0", From a9f061f10caeba3d95653bb3634e6c7572d86a10 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 06:51:21 +0000 Subject: [PATCH 5/5] fix(deps): update dependency qs to v6.13.1 (#1161) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f2c1be13d..dae94a466 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "long": "5.2.3", "memoize-one": "^6.0.0", "prop-types": "15.8.1", - "qs": "6.13.0", + "qs": "6.13.1", "react": "17.0.2", "react-dom": "17.0.2", "react-helmet": "6.1.0", @@ -13107,9 +13107,10 @@ } }, "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz", + "integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==", + "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.6" }, diff --git a/package.json b/package.json index b261e88fb..91ac69ef0 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "long": "5.2.3", "memoize-one": "^6.0.0", "prop-types": "15.8.1", - "qs": "6.13.0", + "qs": "6.13.1", "react": "17.0.2", "react-dom": "17.0.2", "react-helmet": "6.1.0",