| @@ -1,6 +1,6 @@ | |||
| { | |||
| "name": "web", | |||
| "version": "4.0.31test", | |||
| "version": "4.0.32", | |||
| "private": true, | |||
| "dependencies": { | |||
| "@emotion/react": "^11.5.0", | |||
| @@ -48,7 +48,14 @@ const DeleteCategory = (props) => { | |||
| }; | |||
| console.log(props); | |||
| const handleSubmit = () => { | |||
| if (!props.type === "payment") { | |||
| if (props.type === "payment") { | |||
| dispatch( | |||
| deletePayment({ | |||
| id: props.id, | |||
| handleApiDeletePaymentResponseSuccess, | |||
| }) | |||
| ); | |||
| } else { | |||
| dispatch( | |||
| fetchAdminMethod({ | |||
| type: props.type, | |||
| @@ -59,13 +66,6 @@ const DeleteCategory = (props) => { | |||
| handleApiResponseSuccess, | |||
| }) | |||
| ); | |||
| } else { | |||
| dispatch( | |||
| deletePayment({ | |||
| id: props.id, | |||
| handleApiDeletePaymentResponseSuccess, | |||
| }) | |||
| ); | |||
| } | |||
| }; | |||
| return ( | |||
| @@ -52,12 +52,7 @@ const UserReviews = (props) => { | |||
| ) | |||
| ); | |||
| useEffect(() => { | |||
| setRecivedReviews( | |||
| reviews.filter( | |||
| (review) => | |||
| review.exchange.buyer.user._id !== routeMatch.params.profileId | |||
| ) | |||
| ); | |||
| setRecivedReviews(reviews.filter((review) => review.user._id !== userId)); | |||
| }, [reviews]); | |||
| useEffect(() => { | |||
| @@ -66,10 +61,7 @@ const UserReviews = (props) => { | |||
| if (positiveReviews) | |||
| setFilteredReviews( | |||
| recivedReviews | |||
| .filter( | |||
| (review) => | |||
| review.exchange.buyer.user._id !== routeMatch.params.profileId | |||
| ) | |||
| .filter((review) => review.user._id !== userId) | |||
| .filter( | |||
| (review) => | |||
| review.succeeded === reviewEnum.YES.backendText && | |||
| @@ -104,7 +96,6 @@ const UserReviews = (props) => { | |||
| }, [props.givingReview, userId]); | |||
| const lastThreeReviews = useMemo(() => { | |||
| console.log("profile Reviews", reviews); | |||
| if (props.givingReview) return [props.givingReview]; | |||
| if (Array.isArray(reviews) && !props.isAdmin) { | |||
| return reviews.filter((singleReview) => { | |||
| @@ -44,7 +44,7 @@ function* validateExchange(payload) { | |||
| } | |||
| function* acceptExchange({ payload }) { | |||
| try { | |||
| console.log("accept salje i prima 2 POZVANA ACCEPT SAGA") | |||
| console.log("accept salje i prima 2 POZVANA ACCEPT SAGA"); | |||
| const userId = yield select(selectUserId); | |||
| yield call(attemptAcceptExchange, userId, payload.exchangeId); | |||
| const data = yield call(attemptFetchExchange, payload.exchangeId); | |||