change to reviewer to select submitter, not any current user

app/components/submission-wizard/CreatePage.jsx

@@ -178,7 +178,7 @@ class Created extends React.Component {
     const currentUser = this.context
     const { currentStep, status, error, checked } = this.state
     const { manuscript } = this.props
-    const { id: mId, meta, journal, files: allfiles } = manuscript
+    const { id: mId, meta, journal, files: allfiles, teams } = manuscript
     const { notes, fundingGroup: grants } = meta
     const files = allfiles
       ? allfiles.filter(
@@ -195,6 +195,8 @@ class Created extends React.Component {
           return n
         })
       : []
+    const submitter =
+      teams && teams.find(team => team.role === 'submitter').teamMembers[0]
     return (
       <SplitPage>
         <StepPanel>
@@ -266,6 +268,7 @@ class Created extends React.Component {
                     ? notes.find(n => n.notesType === 'selectedReviewer')
                     : null
                 }
+                submitter={submitter}
               />
             )}
             <Buttons>

app/components/submission-wizard/SelectReviewer.jsx

@@ -48,14 +48,21 @@ class SelectReviewer extends React.Component {
     emailErr: '',
   }
   componentDidMount() {
-    const { funding, currentUser, selectedReviewer: note } = this.props
+    const {
+      funding,
+      submitter,
+      currentUser,
+      selectedReviewer: note,
+    } = this.props
     const selectedReviewer = note ? JSON.parse(note.content) : null
-    const { name: username } = currentUser.identities[0]
+    const { name: username } = submitter.alias
     if (funding && funding.length > 0) {
       let options = [
         {
           value: 'self',
-          label: `Me (${username.title ? `${username.title} ` : ''}${
+          label: `${
+            submitter.user.id === currentUser.id ? 'Me' : 'Manuscript Submitter'
+          } (${username.title ? `${username.title} ` : ''}${
             username.givenNames
           } ${username.surname})`,
         },

app/components/submission-wizard/SubmitPage.jsx

@@ -288,6 +288,7 @@ class Submit extends React.Component {
             selectedReviewer={
               notes ? notes.find(n => n.notesType === 'selectedReviewer') : null
             }
+            submitter={submitter}
           />
         ),
         error: !reviewer && (