fix(ActionsMenu actions): Stop spreading t, f, lang into child

cozy · Apr 27, 2023 · 4fa0cc0 · 4fa0cc0
1 parent 9dafd8c
commit 4fa0cc0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git 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 (
           <ActionsMenuItem {...props} ref={ref}>
             <ListItemIcon>

diff --git 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 (
           <ActionsMenuItem {...props} ref={ref}>
             <ListItemIcon>

diff --git 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
@@ -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 (
           <ActionsMenuItem ref={ref} {...props}>
             <ListItemIcon>

diff --git 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 (
           <ActionsMenuItem {...props} ref={ref}>
             <ListItemIcon>

diff --git 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 (
           <ActionsMenuItem ref={ref} {...props}>
             <ListItemIcon>