From 9d118d4e34f1b8eaecd90eeef7bf8ca6dbe3704b Mon Sep 17 00:00:00 2001 From: Nafees Nazik <84864519+G3root@users.noreply.github.com> Date: Tue, 31 Jan 2023 23:35:18 +0530 Subject: [PATCH] fix: flash of i18n in teams page (#6818) --- apps/web/components/team/screens/Team.tsx | 2 +- apps/web/pages/team/[slug].tsx | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/web/components/team/screens/Team.tsx b/apps/web/components/team/screens/Team.tsx index 9ba8899833..0d9904ca45 100644 --- a/apps/web/components/team/screens/Team.tsx +++ b/apps/web/components/team/screens/Team.tsx @@ -60,7 +60,7 @@ const Members = ({ members, teamName }: { members: MembersType; teamName: string ); }; -const Team = ({ team }: TeamPageProps) => { +const Team = ({ team }: Omit) => { return (
diff --git a/apps/web/pages/team/[slug].tsx b/apps/web/pages/team/[slug].tsx index 6325e53d03..f6de4d2033 100644 --- a/apps/web/pages/team/[slug].tsx +++ b/apps/web/pages/team/[slug].tsx @@ -21,6 +21,8 @@ import { inferSSRProps } from "@lib/types/inferSSRProps"; import Team from "@components/team/screens/Team"; +import { ssrInit } from "@server/lib/ssr"; + const md = new MarkdownIt("default", { html: true, breaks: true, linkify: true }); export type TeamPageProps = inferSSRProps; @@ -143,6 +145,7 @@ function TeamPage({ team }: TeamPageProps) { } export const getServerSideProps = async (context: GetServerSidePropsContext) => { + const ssr = await ssrInit(context); const slug = Array.isArray(context.query?.slug) ? context.query.slug.pop() : context.query.slug; const team = await getTeamWithMembers(undefined, slug); @@ -160,6 +163,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => return { props: { team, + trpcState: ssr.dehydrate(), }, }; };