diff --git a/src/components/RecurringExpense/RecurringExpenseList.jsx b/src/components/RecurringExpense/RecurringExpenseList.jsx index 8fb81227..f83d3767 100644 --- a/src/components/RecurringExpense/RecurringExpenseList.jsx +++ b/src/components/RecurringExpense/RecurringExpenseList.jsx @@ -16,9 +16,9 @@ import { useRecurringExpenseContext } from "../../pages/RecurringExpense/Recurri import { useRecurringExpenseList } from "../../hooks/useExpense"; const RecurringExpenseList = ({ search, filterStatuses }) => { - const { setManageRequest, setVieRequest } = useRecurringExpenseContext(); + const { setManageRequest, setVieRequest , setViewRecurring} = useRecurringExpenseContext(); const navigate = useNavigate(); - const [IsDeleteModalOpen, setIsDeleteModalOpen] = useState(false); + const [IsDeleteModalOpen, setIsDeleteModalOpen,] = useState(false); const [deletingId, setDeletingId] = useState(null); const SelfId = useSelector( @@ -191,12 +191,12 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
- // setVieRequest({ - // requestId: recurringExpense.id, - // view: true, - // }) - // } + onClick={() => + setViewRecurring({ + recurringId: recurringExpense?.id, + view: true, + }) + } >
diff --git a/src/components/RecurringExpense/ViewRecurringExpense.jsx b/src/components/RecurringExpense/ViewRecurringExpense.jsx new file mode 100644 index 00000000..e1187867 --- /dev/null +++ b/src/components/RecurringExpense/ViewRecurringExpense.jsx @@ -0,0 +1,14 @@ +import React from 'react' + +const ViewRecurringExpense = () => { + return ( +
+
Detail Recurring
+
+

Under the Working!

+
+
+ ) +} + +export default ViewRecurringExpense diff --git a/src/pages/RecurringExpense/RecurringExpensePage.jsx b/src/pages/RecurringExpense/RecurringExpensePage.jsx index 1c90dd19..02121b04 100644 --- a/src/pages/RecurringExpense/RecurringExpensePage.jsx +++ b/src/pages/RecurringExpense/RecurringExpensePage.jsx @@ -7,6 +7,7 @@ import ManageRecurringExpense from "../../components/RecurringExpense/ManageRecu import RecurringExpenseList from "../../components/RecurringExpense/RecurringExpenseList"; import { PAYEE_RECURRING_EXPENSE } from "../../utils/constants"; import { SearchRecurringExpenseSchema } from "../../components/RecurringExpense/RecurringExpenseSchema"; +import ViewRecurringExpense from "../../components/RecurringExpense/ViewRecurringExpense"; export const RecurringExpenseContext = createContext(); export const useRecurringExpenseContext = () => { @@ -21,7 +22,7 @@ const RecurringExpensePage = () => { IsOpen: null, RecurringId: null, }); - const [ViewRequest, setVieRequest] = useState({ view: false, requestId: null }) + const [viewRecurring, setViewRecurring] = useState({ view: false, recurringId: null }) const [selectedStatuses, setSelectedStatuses] = useState( PAYEE_RECURRING_EXPENSE.map((s) => s.id) @@ -31,7 +32,7 @@ const RecurringExpensePage = () => { const contextValue = { setManageRequest, - setVieRequest + setViewRecurring }; const handleStatusChange = (id) => { @@ -134,6 +135,24 @@ const RecurringExpensePage = () => { /> )} + {viewRecurring.view && ( + + setViewRecurring({ IsOpen: null, recurringId: null }) + } + > + + setViewRecurring({ IsOpen: null, recurringId: null }) + } + recurringId={viewRecurring.recurringId} + /> + + + )} {/* {ViewRequest.view && (