From 4fa0cc0a8b075c332be78a88a6bbb8b55b9a45bc Mon Sep 17 00:00:00 2001 From: JF-Cozy Date: Thu, 27 Apr 2023 12:49:42 +0200 Subject: [PATCH] fix(ActionsMenu actions): Stop spreading `t`, `f`, `lang` into child --- react/ActionsMenu/Actions/call.js | 3 ++- react/ActionsMenu/Actions/emailTo.js | 3 ++- react/ActionsMenu/Actions/locales/withActionsLocales.jsx | 5 +++++ react/ActionsMenu/Actions/modify.js | 3 ++- react/ActionsMenu/Actions/smsTo.js | 3 ++- react/ActionsMenu/Actions/viewInContacts.js | 3 ++- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/react/ActionsMenu/Actions/call.js b/react/ActionsMenu/Actions/call.js index 84bc1c69f4..c3370107fe 100644 --- a/react/ActionsMenu/Actions/call.js +++ b/react/ActionsMenu/Actions/call.js @@ -15,7 +15,8 @@ export const call = () => { !!phoneNumber && window.open(`tel:${phoneNumber}`, '_self') }, Component: withActionsLocales( - forwardRef(({ t, ...props }, ref) => { + // eslint-disable-next-line no-unused-vars + forwardRef(({ t, f, lang, ...props }, ref) => { return ( diff --git a/react/ActionsMenu/Actions/emailTo.js b/react/ActionsMenu/Actions/emailTo.js index 8e3a7114cf..99ffc655a9 100644 --- a/react/ActionsMenu/Actions/emailTo.js +++ b/react/ActionsMenu/Actions/emailTo.js @@ -15,7 +15,8 @@ export const emailTo = () => { !!emailAddress && window.open(`mailto:${emailAddress}`, '_self') }, Component: withActionsLocales( - forwardRef(({ t, ...props }, ref) => { + // eslint-disable-next-line no-unused-vars + forwardRef(({ t, f, lang, ...props }, ref) => { return ( diff --git a/react/ActionsMenu/Actions/locales/withActionsLocales.jsx b/react/ActionsMenu/Actions/locales/withActionsLocales.jsx index e4b8a54318..90736e59b7 100644 --- a/react/ActionsMenu/Actions/locales/withActionsLocales.jsx +++ b/react/ActionsMenu/Actions/locales/withActionsLocales.jsx @@ -8,4 +8,9 @@ export const locales = { fr } +/** + * TODO: We should use something else than withLocales here. Because it's an HOC + * so it spreads t, f, lang into child props. + * We don't use HOC anymore, so we just want to use new I18n context with new locales + */ export default withLocales(locales) diff --git a/react/ActionsMenu/Actions/modify.js b/react/ActionsMenu/Actions/modify.js index a448adc1d7..4f55ca092a 100644 --- a/react/ActionsMenu/Actions/modify.js +++ b/react/ActionsMenu/Actions/modify.js @@ -26,7 +26,8 @@ export const modify = () => { window.open(webLink, '_blank') }, Component: withActionsLocales( - forwardRef(({ t, ...props }, ref) => { + // eslint-disable-next-line no-unused-vars + forwardRef(({ t, f, lang, ...props }, ref) => { return ( diff --git a/react/ActionsMenu/Actions/smsTo.js b/react/ActionsMenu/Actions/smsTo.js index 34340f9f50..0d42592368 100644 --- a/react/ActionsMenu/Actions/smsTo.js +++ b/react/ActionsMenu/Actions/smsTo.js @@ -15,7 +15,8 @@ export const smsTo = () => { !!phoneNumber && window.open(`sms:${phoneNumber}`, '_self') }, Component: withActionsLocales( - forwardRef(({ t, ...props }, ref) => { + // eslint-disable-next-line no-unused-vars + forwardRef(({ t, f, lang, ...props }, ref) => { return ( diff --git a/react/ActionsMenu/Actions/viewInContacts.js b/react/ActionsMenu/Actions/viewInContacts.js index 46d66e66cb..1a1f8eef8e 100644 --- a/react/ActionsMenu/Actions/viewInContacts.js +++ b/react/ActionsMenu/Actions/viewInContacts.js @@ -26,7 +26,8 @@ export const viewInContacts = () => { window.open(webLink, '_blank') }, Component: withActionsLocales( - forwardRef(({ t, ...props }, ref) => { + // eslint-disable-next-line no-unused-vars + forwardRef(({ t, f, lang, ...props }, ref) => { return (