Merge pull request #1331 from opentripplanner/remove-companion-update…

…-toast Fix toast for companion updates
opentripplanner · Jan 9, 2025 · 64780b6 · 64780b6
2 parents d6f8374 + d9a00f4
commit 64780b6
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 deletions.
diff --git a/i18n/en-US.yml b/i18n/en-US.yml
@@ -771,6 +771,7 @@ components:
     errorUpdatingProfile: Error updating profile.
     fieldUpdated: This setting has been updated.
     fields:
+      add-companion-form: Travel Companions
       storeTripHistory: Store trip history
     updating: Updating
   UserSettings:

diff --git a/i18n/fr.yml b/i18n/fr.yml
@@ -802,6 +802,7 @@ components:
     errorUpdatingProfile: Erreur dans la mise à jour de votre profil.
     fieldUpdated: Ce paramètre a été mis à jour.
     fields:
+      add-companion-form: Accompagnateurs
       storeTripHistory: Enregistrement des recherches
     updating: Mise à jour
   UserSettings:

diff --git a/i18n/i18n-exceptions.json b/i18n/i18n-exceptions.json
@@ -6,6 +6,7 @@
       "push"
     ],
     "components.UserAccountScreen.fields.*": [
+      "add-companion-form",
       "storeTripHistory"
     ],
     "components.OTP2ErrorRenderer.*.body": [

diff --git a/lib/actions/user.js b/lib/actions/user.js
@@ -17,6 +17,7 @@ import {
 } from '../util/user'
 import { isBlank } from '../util/ui'
 import { secureFetch } from '../util/middleware'
+import { toastSuccess } from '../components/util/toasts'
 import { TRIPS_PATH } from '../util/constants'
 
 import { routeTo, setLocale } from './ui'
@@ -500,7 +501,14 @@ export function createOrUpdateUserMonitoredTrip(
 
     if (status === 'success' && data) {
       if (!silentOnSuccess && intl) {
-        toast.success(
+        toastSuccess(
+          isNew
+            ? intl.formatMessage({
+                id: 'components.SavedTripEditor.saveNewTrip'
+              })
+            : intl.formatMessage({
+                id: 'components.SavedTripEditor.editSavedTrip'
+              }),
           intl.formatMessage({ id: 'actions.user.preferencesSaved' })
         )
       }

diff --git a/lib/components/user/common/add-email-form.tsx b/lib/components/user/common/add-email-form.tsx
@@ -10,7 +10,7 @@ import { Field, Form, Formik } from 'formik'
 import React, { ReactNode } from 'react'
 import styled from 'styled-components'
 
-import { ControlStrip, phoneFieldStyle } from '../styled'
+import { phoneFieldStyle } from '../styled'
 import SubmitButton from '../../util/submit-button'
 
 interface Props {
@@ -64,7 +64,7 @@ const AddEmailForm = ({
         <FormGroup validationState={showError ? 'error' : null}>
           <ControlLabel>{label}</ControlLabel>
           <Controls>
-            <Form id={id} noValidate />
+            <Form id={id} name={id} noValidate />
             <Field
               aria-invalid={showError}
               aria-required

diff --git a/lib/components/user/mobility-profile/mobility-wizard.tsx b/lib/components/user/mobility-profile/mobility-wizard.tsx
@@ -10,7 +10,7 @@ const MobilityWizard = ({ formikProps }: WizardProps): JSX.Element => {
   const intl = useIntl()
 
   const title = intl.formatMessage({
-    id: 'components.MobilityProfile.title'
+    id: 'components.MobilityProfile.MobilityPane.header'
   })
 
   return (

diff --git a/lib/components/user/wizard.tsx b/lib/components/user/wizard.tsx
@@ -5,11 +5,11 @@ import { FormattedMessage, injectIntl, IntlShape } from 'react-intl'
 import { push, replace } from 'connected-react-router'
 import React, { Component, MouseEvent } from 'react'
 import styled from 'styled-components'
-import toast from 'react-hot-toast'
 
 import * as uiActions from '../../actions/ui'
 import { AppReduxState } from '../../util/state-types'
 import { GREY_ON_WHITE } from '../util/colors'
+import { toastSuccess } from '../util/toasts'
 import PageTitle from '../util/page-title'
 
 import { EditedUser } from './types'
@@ -69,7 +69,8 @@ class Wizard extends Component<Props> {
       onNext,
       pages,
       returnTo = '/',
-      routeTo
+      routeTo,
+      title
     } = this.props
 
     if (activePaneIndex < pages.length - 1) {
@@ -94,7 +95,10 @@ class Wizard extends Component<Props> {
     } else {
       // Display a toast to acknowledge saved changes
       // (although in reality, changes quietly took effect in previous screens).
-      toast.success(intl.formatMessage({ id: 'actions.user.preferencesSaved' }))
+      toastSuccess(
+        title,
+        intl.formatMessage({ id: 'actions.user.preferencesSaved' })
+      )
       routeTo(returnTo)
     }
   }