Merge pull request #1639 from zetkin/survey-user-email

Add email:string to ZetkinUser
zetkin · Nov 12, 2023 · 5e5fe7f · 5e5fe7f
2 parents 3b95618 + a4a725a
commit 5e5fe7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/integrationTesting/mockData/users/RosaLuxemburgUser.ts b/integrationTesting/mockData/users/RosaLuxemburgUser.ts
@@ -1,6 +1,7 @@
 import { ZetkinUser } from 'utils/types/zetkin';
 
 const RosaLuxemburgUser: ZetkinUser = {
+  email: '[email protected]',
   first_name: 'Rosa',
   id: 1,
   lang: null,

diff --git a/src/pages/o/[orgId]/surveys/[surveyId]/index.tsx b/src/pages/o/[orgId]/surveys/[surveyId]/index.tsx
@@ -211,7 +211,7 @@ const Page: FC<PageProps> = ({ orgId, surveyId }) => {
                 <Msg
                   id={messageIds.surveyForm.authenticatedOption}
                   values={{
-                    email: '', // currentUser?.email,
+                    email: currentUser?.email ?? '',
                     person: currentUser?.first_name ?? '',
                   }}
                 />

diff --git a/src/utils/types/zetkin.ts b/src/utils/types/zetkin.ts
@@ -135,6 +135,7 @@ export interface ZetkinUser {
   lang: string | null;
   last_name: string;
   username: string;
+  email: string;
 }
 
 export interface ZetkinOrganization {