feat: resolved upstream rebase conflict

This commit is contained in:
Akhil Mohan
2024-03-28 19:55:12 +05:30
parent e850b82fb3
commit f551a4158d
6 changed files with 8 additions and 12 deletions
@@ -11,7 +11,7 @@ import { format } from "date-fns";
import { motion } from "framer-motion";
import { twMerge } from "tailwind-merge";
import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
import { createNotification } from "@app/components/notifications";
import { ProjectPermissionCan } from "@app/components/permissions";
import {
Button,
@@ -38,7 +38,7 @@ import { IdentityRoles } from "./components/IdentityRoles";
export const IdentityTab = withProjectPermission(
() => {
const { createNotification } = useNotificationContext();
const { currentWorkspace } = useWorkspace();
const workspaceId = currentWorkspace?.id ?? "";