Merge pull request #2588 from cozy/fix/use-helpers-for-account-and-gr…

…oup-labels-in-notification-settings Localize account and group labels in notification settings by using the dedicated helpers
cozy · Dec 30, 2022 · 73c7a9b · 73c7a9b
2 parents e1a2b54 + 07e968a
commit 73c7a9b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/ducks/groups/helpers.js b/src/ducks/groups/helpers.js
@@ -22,7 +22,9 @@ export const isReimbursementsVirtualGroup = group =>
   Boolean(group.virtual && group._id === 'Reimbursements')
 
 export const getGroupLabel = (group, t) => {
-  if (isReimbursementsVirtualGroup(group)) {
+  if (group == null) {
+    return ''
+  } else if (isReimbursementsVirtualGroup(group)) {
     return t(`Data.accountTypes.Reimbursements`, { _: 'other' })
   } else if (group.virtual) {
     return (

diff --git a/src/ducks/settings/CategoryAlerts/AccountOrGroupLabel.jsx b/src/ducks/settings/CategoryAlerts/AccountOrGroupLabel.jsx
@@ -1,19 +1,23 @@
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+
 import { getGroupsById, getAccountsById } from 'selectors'
 import { connect } from 'react-redux'
 import { ACCOUNT_DOCTYPE, GROUP_DOCTYPE } from 'doctypes'
+import { getGroupLabel } from 'ducks/groups/helpers'
+import { getAccountLabel } from 'ducks/account/helpers.js'
 
 /**
  * From a partial doc { _id, _type }, finds the account/group from the redux store
  * and displays its label
  */
 const AccountOrGroupLabel = ({ groupsById, accountsById, doc }) => {
-  let docInfo
+  const { t } = useI18n()
   if (doc._type == ACCOUNT_DOCTYPE) {
-    docInfo = accountsById[doc._id]
+    return getAccountLabel(accountsById[doc._id], t)
   } else if (doc._type == GROUP_DOCTYPE) {
-    docInfo = groupsById[doc._id]
+    return getGroupLabel(groupsById[doc._id], t)
   }
-  return docInfo ? docInfo.label : null
+  return ''
 }
 
 export default connect(state => ({