diff --git a/src/components/Products/Product.jsx b/src/components/Products/Product.jsx
index a36f7af..c7513b4 100644
--- a/src/components/Products/Product.jsx
+++ b/src/components/Products/Product.jsx
@@ -1,10 +1,9 @@
import React, { useContext, useEffect } from "react";
-import { UserContext } from "../../providers/index";
+import { UserContext, HistoryContext } from "../../providers/index";
import { coin, buy } from "../../assets/index";
import { SuccessModal, FailureModal, CoinsModal } from "../Modals/index";
import { useModal } from "../../hooks/index";
import { redeemProduct } from "../../services/productsService";
-
import "./products.scss";
const Product = ({
@@ -15,9 +14,10 @@ const Product = ({
cost,
img: { url },
},
- onFetch,
+ setProductResponse,
}) => {
const { user, setUserResponse } = useContext(UserContext);
+ const { setHistoryResponse } = useContext(HistoryContext);
useEffect(() => {
if (!user) return;
@@ -38,7 +38,8 @@ const Product = ({
.then((res) => {
toggleSuccessModal();
setUserResponse(res);
- onFetch(res);
+ setHistoryResponse(res);
+ setProductResponse(res);
})
.catch((err) => {
toggleErrorModal();
diff --git a/src/components/Products/ProductsList.jsx b/src/components/Products/ProductsList.jsx
index 8ffdc90..b7d339a 100644
--- a/src/components/Products/ProductsList.jsx
+++ b/src/components/Products/ProductsList.jsx
@@ -39,7 +39,11 @@ const ProductsList = () => {
{currentData().map((item, key) => {
return (
-
+
);
})}
diff --git a/src/components/ProductsHistory/ProductsHistory.jsx b/src/components/ProductsHistory/ProductsHistory.jsx
index 4d720c1..6703d02 100644
--- a/src/components/ProductsHistory/ProductsHistory.jsx
+++ b/src/components/ProductsHistory/ProductsHistory.jsx
@@ -9,14 +9,14 @@ import "./history.scss";
const ITEMS_PER_PAGE = 16;
const ProductsHistory = () => {
- const { products } = useContext(HistoryContext);
+ const { history } = useContext(HistoryContext);
- const [filteredProducts, setProducts] = useState([]);
+ const [filteredProducts, setHistory] = useState([]);
useEffect(() => {
- if (!products) return;
- setProducts(products);
- }, [products]);
+ if (!history) return;
+ setHistory(history);
+ }, [history]);
const { next, prev, currentData, currentAmount, jump } = usePagination(
filteredProducts,
@@ -24,7 +24,7 @@ const ProductsHistory = () => {
);
const handleFilter = (event) => {
- setProducts(products.filter(priceFilter(event.target.value)));
+ setHistory(history.filter(priceFilter(event.target.value)));
jump(1);
};
diff --git a/src/providers/HistoryProvider.jsx b/src/providers/HistoryProvider.jsx
index 2d152c8..fdef64b 100644
--- a/src/providers/HistoryProvider.jsx
+++ b/src/providers/HistoryProvider.jsx
@@ -4,18 +4,17 @@ import { getHistory } from "../services/userService";
export const HistoryContext = React.createContext();
const HistoryProvider = ({ children }) => {
- const [products, setProducts] = useState({});
+ const [history, setHistory] = useState({});
- const [productResponse, setProductResponse] = useState([]);
+ const [historyResponse, setHistoryResponse] = useState([]);
useEffect(() => {
getHistory().then((products) => {
- setProducts(products);
+ setHistory(products);
});
- }, [productResponse]);
-
+ }, [historyResponse]);
return (
-
+
{children}
);