chore: solve conflicts with main branch

components/ui/sidebar/SidebarWrap.tsx

@@ -35,7 +35,7 @@ export const SidebarWrap = () => {
   return (
     <div
       className={clsx(
-        "relative flex h-screen flex-col !border-r-small border-divider  transition-width",
+        "relative flex h-screen flex-col !border-r-small border-divider transition-width",
         {
           "w-72 p-6": !isCompact,
           "w-16 items-center px-2 py-6": isCompact,

components/ui/table/StatusBadge.tsx

@@ -1,14 +1,25 @@
 import { Chip } from "@nextui-org/react";
 import React from "react";
 
-type Status = "completed" | "pending" | "cancelled";
+type Status =
+  | "completed"
+  | "pending"
+  | "cancelled"
+  | "fail"
+  | "success"
+  | "muted";
 
-export const statusColorMap: Record<Status, "success" | "danger" | "warning"> =
-  {
-    completed: "success",
-    pending: "warning",
-    cancelled: "danger",
-  };
+export const statusColorMap: Record<
+  Status,
+  "success" | "danger" | "warning" | "default"
+> = {
+  completed: "success",
+  pending: "warning",
+  cancelled: "danger",
+  fail: "danger",
+  success: "success",
+  muted: "default",
+};
 
 export const StatusBadge = ({ status }: { status: Status }) => {
   return (