From 25477b6df1fed7d34a22604852d5de92c7c2a265 Mon Sep 17 00:00:00 2001
From: Iris Scholten <ischolten.is@gmail.com>
Date: Mon, 8 Apr 2019 16:39:25 -0700
Subject: [PATCH] feat(ui): Add org name to home page title

---
 ui/src/me/components/UserPageHeader.tsx |  5 +++--
 ui/src/me/containers/MePage.tsx         | 13 +++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ui/src/me/components/UserPageHeader.tsx b/ui/src/me/components/UserPageHeader.tsx
index a49d25fd14..0275a83f99 100644
--- a/ui/src/me/components/UserPageHeader.tsx
+++ b/ui/src/me/components/UserPageHeader.tsx
@@ -9,6 +9,7 @@ import {generateRandomGreeting} from 'src/me/constants'
 
 interface Props {
   userName: string
+  orgName: string
 }
 
 export default class UserPageHeader extends PureComponent<Props> {
@@ -22,11 +23,11 @@ export default class UserPageHeader extends PureComponent<Props> {
   }
 
   private get title(): JSX.Element {
-    const {userName} = this.props
+    const {userName, orgName} = this.props
 
     const {text, language} = generateRandomGreeting()
 
-    const title = `${text}, ${userName}!`
+    const title = `${text}, ${userName}! Welcome to ${orgName}!`
     const altText = `That's how you say hello in ${language}`
 
     return <Page.Title title={title} altText={altText} />
diff --git a/ui/src/me/containers/MePage.tsx b/ui/src/me/containers/MePage.tsx
index 2c9d544874..8c9418790e 100644
--- a/ui/src/me/containers/MePage.tsx
+++ b/ui/src/me/containers/MePage.tsx
@@ -1,6 +1,7 @@
 // Libraries
 import React, {PureComponent} from 'react'
 import {connect} from 'react-redux'
+import {get} from 'lodash'
 
 // Components
 import {
@@ -26,16 +27,17 @@ import {ErrorHandling} from 'src/shared/decorators/errors'
 
 interface StateProps {
   me: AppState['me']
+  orgName: string
 }
 
 @ErrorHandling
 export class MePage extends PureComponent<StateProps> {
   public render() {
-    const {me} = this.props
+    const {me, orgName} = this.props
 
     return (
       <Page className="user-page" titleTag="My Account">
-        <Header userName={me.name} />
+        <Header userName={me.name} orgName={orgName} />
         <Page.Contents fullWidth={false} scrollable={true}>
           <div className="col-xs-12">
             <Grid>
@@ -69,9 +71,12 @@ export class MePage extends PureComponent<StateProps> {
 }
 
 const mstp = (state: AppState): StateProps => {
-  const {me} = state
+  const {
+    me,
+    orgs: {org},
+  } = state
 
-  return {me}
+  return {me, orgName: get(org, 'name', '')}
 }
 
 export default connect<StateProps>(