Merge branch 'dev' into configurable-walk-options

opentripplanner · Oct 10, 2023 · e6dff22 · e6dff22
2 parents ddf8156 + f27e945
commit e6dff22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/components/app/app-menu-item.tsx b/lib/components/app/app-menu-item.tsx
@@ -68,7 +68,9 @@ export default class AppMenuItem extends Component<Props, State> {
   render(): JSX.Element {
     const { icon, id, onClick, subItems, text, ...otherProps } = this.props
     const { isExpanded } = this.state
-    const Element = otherProps.href ? 'a' : 'button'
+    const hasHref = !!otherProps.href
+    const isAbsolute = otherProps.href?.startsWith('http')
+    const Element = hasHref ? 'a' : 'button'
     const containerId = `${id}-container`
     return (
       <>
@@ -80,6 +82,7 @@ export default class AppMenuItem extends Component<Props, State> {
           onClick={subItems ? this._toggleSubmenu : onClick}
           onKeyDown={this._handleKeyDown}
           {...otherProps}
+          target={hasHref && isAbsolute ? '_blank' : undefined}
         >
           <span aria-hidden>{icon}</span>
           <span>{text}</span>

diff --git a/lib/components/user/user-account-screen.js b/lib/components/user/user-account-screen.js
@@ -54,7 +54,7 @@ class UserAccountScreen extends Component {
     ) {
       passedUserData.notificationChannel = notificationChannel.join(',')
     }
-    const result = await createOrUpdateUser(userData, intl)
+    const result = await createOrUpdateUser(passedUserData, intl)
 
     // If needed, display a toast notification on success.
     if (result === userActions.UserActionResult.SUCCESS && !silentOnSucceed) {