diff --git a/frontend/components/CreateAccountForm.tsx b/frontend/components/CreateAccountForm.tsx
index e9dbb3bdf..2bc62910b 100644
--- a/frontend/components/CreateAccountForm.tsx
+++ b/frontend/components/CreateAccountForm.tsx
@@ -3,6 +3,7 @@ import { Component } from "react"
import Link from "next/link"
import { NextRouter, withRouter } from "next/router"
+import { ApolloClient } from "@apollo/client"
import { CircularProgress, Paper, TextField, Typography } from "@mui/material"
import { styled } from "@mui/material/styles"
@@ -60,6 +61,7 @@ export function capitalizeFirstLetter(string: string) {
export interface CreateAccountFormProps {
onComplete: (...args: any[]) => any
+ apolloClient?: ApolloClient
)}
diff --git a/frontend/pages/profile/index.tsx b/frontend/pages/profile/index.tsx
index b5dda5ff5..3b99cde62 100644
--- a/frontend/pages/profile/index.tsx
+++ b/frontend/pages/profile/index.tsx
@@ -69,7 +69,8 @@ function Profile() {
if (error) {
return
}
- if (loading) {
+ if (loading || !data?.currentUser) {
+ // don't show flash of "no first name" content
return
}
diff --git a/frontend/pages/sign-up.tsx b/frontend/pages/sign-up.tsx
index 7fd919b16..ab19da5ef 100644
--- a/frontend/pages/sign-up.tsx
+++ b/frontend/pages/sign-up.tsx
@@ -1,5 +1,7 @@
import Router from "next/router"
+import { useApolloClient } from "@apollo/client"
+
import { RegularContainer } from "/components/Container"
import CreateAccountForm from "/components/CreateAccountForm"
import { useAlertContext } from "/contexts/AlertContext"
@@ -11,6 +13,7 @@ import { useTranslator } from "/util/useTranslator"
const SignUpPage = () => {
const t = useTranslator(SignUpTranslations)
+ const client = useApolloClient()
useBreadcrumbs([
{
@@ -40,7 +43,7 @@ const SignUpPage = () => {
return (
-
+
)