From 2accc0561220e6b391961e8fbd76c5d3f7dbe9f6 Mon Sep 17 00:00:00 2001 From: Kristian Ruben <56469224+rubenkristian@users.noreply.github.com> Date: Wed, 19 Apr 2023 17:01:20 +0700 Subject: [PATCH] fix: behaviour subscribe/unsubscribe discoverd (#1808) - prevent parent element event (prevent event bubbling) - update fetch user experience expereince data --- src/components/Expericence/Experience.tsx | 12 ++++++++---- src/reducers/user/reducer.ts | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/Expericence/Experience.tsx b/src/components/Expericence/Experience.tsx index 521dae5a6..055c50935 100644 --- a/src/components/Expericence/Experience.tsx +++ b/src/components/Expericence/Experience.tsx @@ -285,7 +285,9 @@ export const Experience: React.FC = props => { size="small" variant="contained" color="primary" - onClick={() => { + onClick={e => { + e.stopPropagation(); + router.push(`/experience/${experienceId}/edit`); }}> {i18n.t('Experience.Preview.Button.Edit')} @@ -296,11 +298,13 @@ export const Experience: React.FC = props => { variant="contained" color="primary" size="small" - onClick={() => + onClick={e => { + e.stopPropagation(); + isSubscribed ? confirmUnsubscribe() - : handleSubscribeExperience() - }> + : handleSubscribeExperience(); + }}> {isSubscribed ? i18n.t('Experience.Preview.Button.Unsubscribe') : i18n.t('Experience.Preview.Button.Subscribe')} diff --git a/src/reducers/user/reducer.ts b/src/reducers/user/reducer.ts index 5280cb855..6edf860a8 100644 --- a/src/reducers/user/reducer.ts +++ b/src/reducers/user/reducer.ts @@ -123,7 +123,7 @@ export const UserReducer: Redux.Reducer = ( return { ...state, experiences: { - data: [...state.experiences.data, ...action.experiences], + data: [...action.experiences], meta: action.meta, }, };