From a8c4a9c4c2418f461bc80e9373468510fb8a3655 Mon Sep 17 00:00:00 2001 From: Hariom Balhara Date: Sat, 5 Nov 2022 23:30:10 +0530 Subject: [PATCH] Fix viewer.me avatar size (#5392) * Fix viewer.me avatar size * Fix for i18n-next typecheck Co-authored-by: Alex van Andel --- apps/web/lib/app-providers.tsx | 8 ++++---- packages/trpc/server/routers/viewer.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/web/lib/app-providers.tsx b/apps/web/lib/app-providers.tsx index 3f3eda9d5b..c5c55a97de 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 & { diff --git a/packages/trpc/server/routers/viewer.tsx b/packages/trpc/server/routers/viewer.tsx index cf0fd61815..c7c0229469 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,