Merge branch 'main' into feature/0612_sentry_fr_merge
# Conflicts: # apps/as/src/pages/instl-sncn/ui/cnfm-view-page.tsx # pnpm-lock.yaml
This commit is contained in:
@@ -6,7 +6,7 @@ import { BaseLayout } from "@common/components";
|
||||
import type { MenuItem } from "@/entities/menu";
|
||||
import { useMenuStore } from "@/shared/lib";
|
||||
import { PageLayout } from "@/shared/ui/page-layout";
|
||||
import { tokenManager } from "@/entities/auth";
|
||||
import { authService } from "@/entities/auth";
|
||||
|
||||
export default function WithBaseLayout({
|
||||
children,
|
||||
@@ -27,7 +27,7 @@ export default function WithBaseLayout({
|
||||
return (
|
||||
<BaseLayout
|
||||
queryClient={queryClient}
|
||||
tokenManager={tokenManager}
|
||||
authService={authService}
|
||||
currentPath={pathname ?? ""}
|
||||
handleMenuClick={handleMenuClick}
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user