From 5a36250a7b1f441aa776d9a7929939c88d892b1c Mon Sep 17 00:00:00 2001 From: Hariom Balhara Date: Sat, 5 Nov 2022 18:20:22 +0530 Subject: [PATCH 1/2] Fix viewer.me avatar size --- packages/trpc/server/routers/viewer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/trpc/server/routers/viewer.tsx b/packages/trpc/server/routers/viewer.tsx index cf0fd618150098..c7c022946904c3 100644 --- a/packages/trpc/server/routers/viewer.tsx +++ b/packages/trpc/server/routers/viewer.tsx @@ -152,7 +152,7 @@ const loggedInViewerRouter = createProtectedRouter() locale: user.locale, timeFormat: user.timeFormat, timeZone: user.timeZone, - avatar: user.avatar, + avatar: `${CAL_URL}/${user.username}/avatar.png`, createdDate: user.createdDate, trialEndsAt: user.trialEndsAt, completedOnboarding: user.completedOnboarding, From 2d6ba84d93f13097c8f1acf70ea8a8749a3d3120 Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Sat, 5 Nov 2022 13:33:41 -0400 Subject: [PATCH 2/2] Fix for i18n-next typecheck --- apps/web/lib/app-providers.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/web/lib/app-providers.tsx b/apps/web/lib/app-providers.tsx index 3f3eda9d5bb7c6..c5c55a97def25e 100644 --- a/apps/web/lib/app-providers.tsx +++ b/apps/web/lib/app-providers.tsx @@ -1,7 +1,7 @@ import { TooltipProvider } from "@radix-ui/react-tooltip"; import { SessionProvider } from "next-auth/react"; import { EventCollectionProvider } from "next-collect/client"; -import { appWithTranslation } from "next-i18next"; +import { appWithTranslation, SSRConfig } from "next-i18next"; import { ThemeProvider } from "next-themes"; import type { AppProps as NextAppProps, AppProps as NextJsAppProps } from "next/app"; import { NextRouter } from "next/router"; @@ -14,9 +14,9 @@ import { MetaProvider } from "@calcom/ui/v2/core/Meta"; import usePublicPage from "@lib/hooks/usePublicPage"; -const I18nextAdapter = appWithTranslation(({ children }) => ( - <>{children} -)); +const I18nextAdapter = appWithTranslation & { children: React.ReactNode }>( + ({ children }) => <>{children} +); // Workaround for https://github.com/vercel/next.js/issues/8592 export type AppProps = Omit & {