fix(resolve): fix resolve merge

src/types/api/api-general.d.ts

@@ -97,27 +97,27 @@ export type flags =
   | 'FINISHER'
   | 'OVK';
 
-export type ApprovalsLine = {
-  action_by?: string;
-  date?: string;
-  notes?: string;
-  role?: string;
-  status: 'approved' | 'rejected' | 'waiting';
-}[];
-
 export type BaseApproval = {
   step_number: number;
   step_name: string;
   action: string;
-  notes: string | null;
+  notes?: string | null;
   action_by: CreatedUser;
   action_at: string;
 };
 
-export type ApproveAction = 'APPROVED' | 'REJECTED';
+export type BaseGroupedApproval = {
+  step_number: number;
+  step_name: string;
+  approvals: BaseApproval[];
+};
 
 export type FormStepStatus = {
   name: string;
   isCompleted: boolean;
   isCurrent: boolean;
 };
+
+export type Approvals = BaseApiResponse<BaseApproval>;
+
+export type GroupedApprovals = BaseApiResponse<BaseGroupedApproval[]>;