Merge branch 'main' into enterprise-license

staging
kodiakhq[bot] 2022-04-12 18:42:58 +00:00 committed by GitHub
commit 59d09c3316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions

View File

@ -1,10 +1,7 @@
import { IdProvider } from "@radix-ui/react-id";
import { SessionProvider } from "next-auth/react";
import { appWithTranslation } from "next-i18next";
import type { AppProps as NextAppProps } from "next/app";
import React, { ComponentProps, ReactNode } from "react";
import { LiveChatLoaderProvider } from "react-live-chat-loader";
import { HelpScout } from "react-live-chat-loader";
import { ComponentProps, ReactNode } from "react";
import DynamicHelpscoutProvider from "@ee/lib/helpscout/providerDynamic";
import DynamicIntercomProvider from "@ee/lib/intercom/providerDynamic";
@ -55,15 +52,13 @@ const AppProviders = (props: AppPropsWithChildren) => {
return (
<TelemetryProvider value={createTelemetryClient()}>
<IdProvider>
{isPublicPage ? (
RemainingProviders
) : (
<DynamicHelpscoutProvider>
<DynamicIntercomProvider>{RemainingProviders}</DynamicIntercomProvider>
</DynamicHelpscoutProvider>
)}
</IdProvider>
{isPublicPage ? (
RemainingProviders
) : (
<DynamicHelpscoutProvider>
<DynamicIntercomProvider>{RemainingProviders}</DynamicIntercomProvider>
</DynamicHelpscoutProvider>
)}
</TelemetryProvider>
);
};