Fix merge conflicts

2026-10-14 13:22:08 +00:00 · 2023-04-09 09:55:34 +03:00
parent cbf05b7c31 5855c859e5
commit f6e23127ac
67 changed files with 3557 additions and 1330 deletions
@@ -8,6 +8,7 @@ import { QueryClientProvider } from '@tanstack/react-query';

 import NotificationProvider from '@app/components/context/Notifications/NotificationProvider';
 import Telemetry from '@app/components/utilities/telemetry/Telemetry';
+import { TooltipProvider } from '@app/components/v2';
 import { publicPaths } from '@app/const';
 import {
  AuthProvider,
@@ -73,21 +74,23 @@ const App = ({ Component, pageProps, ...appProps }: NextAppProp): JSX.Element =>

  return (
    <QueryClientProvider client={queryClient}>
-      <AuthProvider>
-        <WorkspaceProvider>
-          <OrgProvider>
-            <SubscriptionProvider>
-              <UserProvider>
-                <NotificationProvider>
-                  <AppLayout>
-                    <Component {...pageProps} />
-                  </AppLayout>
-                </NotificationProvider>
-              </UserProvider>
-            </SubscriptionProvider>
-          </OrgProvider>
-        </WorkspaceProvider>
-      </AuthProvider>
+      <TooltipProvider>
+        <AuthProvider>
+          <WorkspaceProvider>
+            <OrgProvider>
+              <SubscriptionProvider>
+                <UserProvider>
+                  <NotificationProvider>
+                    <AppLayout>
+                      <Component {...pageProps} />
+                    </AppLayout>
+                  </NotificationProvider>
+                </UserProvider>
+              </SubscriptionProvider>
+            </OrgProvider>
+          </WorkspaceProvider>
+        </AuthProvider>
+      </TooltipProvider>
    </QueryClientProvider>
  );
 };