diff --git a/Composer/packages/client/src/components/ManageService/ManageService.tsx b/Composer/packages/client/src/components/ManageService/ManageService.tsx index c10338ff44..e5520c9a57 100644 --- a/Composer/packages/client/src/components/ManageService/ManageService.tsx +++ b/Composer/packages/client/src/components/ManageService/ManageService.tsx @@ -135,7 +135,7 @@ export const ManageService: React.FC = (props: ManageService }; useEffect(() => { - if (isAuthenticated) { + if (isAuthenticated && !props.hidden) { setAvailableSubscriptions([]); setSubscriptionsErrorMessage(undefined); getSubscriptions(currentUser.token) @@ -153,7 +153,7 @@ export const ManageService: React.FC = (props: ManageService setSubscriptionsErrorMessage(err.message); }); } - }, [isAuthenticated]); + }, [isAuthenticated, props.hidden]); useEffect(() => { // reset the ui diff --git a/Composer/packages/client/src/components/QnA/CreateQnAModal.tsx b/Composer/packages/client/src/components/QnA/CreateQnAModal.tsx index 11ff695849..83ffbbc86e 100644 --- a/Composer/packages/client/src/components/QnA/CreateQnAModal.tsx +++ b/Composer/packages/client/src/components/QnA/CreateQnAModal.tsx @@ -155,7 +155,7 @@ export const CreateQnAModal: React.FC = (props) => { }, []); useEffect(() => { - if (isAuthenticated) { + if (isAuthenticated && showCreateQnAFrom) { setAvailableSubscriptions([]); setSubscriptionsErrorMessage(undefined); getSubscriptions(currentUser.token) @@ -173,7 +173,7 @@ export const CreateQnAModal: React.FC = (props) => { setSubscriptionsErrorMessage(err.message); }); } - }, [currentUser, isAuthenticated]); + }, [currentUser, isAuthenticated, showCreateQnAFrom]); useEffect(() => { // reset the ui diff --git a/Composer/packages/client/src/components/QnA/ReplaceQnAFromModal.tsx b/Composer/packages/client/src/components/QnA/ReplaceQnAFromModal.tsx index 1d37e2ccdb..f623f40be5 100644 --- a/Composer/packages/client/src/components/QnA/ReplaceQnAFromModal.tsx +++ b/Composer/packages/client/src/components/QnA/ReplaceQnAFromModal.tsx @@ -136,7 +136,7 @@ export const ReplaceQnAFromModal: React.FC = (props) => { }, []); useEffect(() => { - if (isAuthenticated) { + if (isAuthenticated && !hidden) { setAvailableSubscriptions([]); setSubscriptionsErrorMessage(undefined); getSubscriptions(currentUser.token) @@ -154,7 +154,7 @@ export const ReplaceQnAFromModal: React.FC = (props) => { setSubscriptionsErrorMessage(err.message); }); } - }, [currentUser, isAuthenticated]); + }, [currentUser, isAuthenticated, hidden]); useEffect(() => { // reset the ui