Skip to content

Commit 044001d

Browse files
committed
feat: resolve merge conflicts for recordings table
1 parent 2d1c74e commit 044001d

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

src/components/molecules/RecordingsTable.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ import {
3131
import { Add } from "@mui/icons-material";
3232
import { useNavigate } from "react-router-dom";
3333
import { stopRecording } from "../../api/recording";
34-
import { GenericModal } from "../atoms/GenericModal";
34+
import { GenericModal } from '../ui/GenericModal';
35+
3536

3637
/** TODO:
3738
* 1. allow editing existing robot after persisting browser steps
@@ -76,15 +77,7 @@ interface RecordingsTableProps {
7677
handleDuplicateRobot: (id: string, name: string, params: string[]) => void;
7778
}
7879

79-
export const RecordingsTable = ({
80-
handleEditRecording,
81-
handleRunRecording,
82-
handleScheduleRecording,
83-
handleIntegrateRecording,
84-
handleSettingsRecording,
85-
handleEditRobot,
86-
handleDuplicateRobot,
87-
}: RecordingsTableProps) => {
80+
export const RecordingsTable = ({ handleEditRecording, handleRunRecording, handleScheduleRecording, handleIntegrateRecording, handleSettingsRecording, handleEditRobot, handleDuplicateRobot }: RecordingsTableProps) => {
8881
const { t } = useTranslation();
8982
const [page, setPage] = React.useState(0);
9083
const [rowsPerPage, setRowsPerPage] = React.useState(10);

0 commit comments

Comments
 (0)