From b24a21b178db28072810b4e004bfeea01eafc2be Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 13 Jul 2021 16:25:54 -0500
Subject: [PATCH 1/2] before fetching subscriptions, ensure modal is visible

---
 .../client/src/components/ManageService/ManageService.tsx    | 5 +++--
 .../packages/client/src/components/QnA/CreateQnAModal.tsx    | 4 ++--
 .../client/src/components/QnA/ReplaceQnAFromModal.tsx        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Composer/packages/client/src/components/ManageService/ManageService.tsx b/Composer/packages/client/src/components/ManageService/ManageService.tsx
index c10338ff44..54a9edc980 100644
--- a/Composer/packages/client/src/components/ManageService/ManageService.tsx
+++ b/Composer/packages/client/src/components/ManageService/ManageService.tsx
@@ -124,6 +124,7 @@ export const ManageService: React.FC<ManageServiceProps> = (props: ManageService
   const getSubscriptions = async (token: string): Promise<Array<Subscription>> => {
     const tokenCredentials = new TokenCredentials(token);
     try {
+      console.log('get subscriptions for manageservice');
       const subscriptionClient = new SubscriptionClient(tokenCredentials);
       const subscriptionsResult = await subscriptionClient.subscriptions.list();
       // eslint-disable-next-line no-underscore-dangle
@@ -135,7 +136,7 @@ export const ManageService: React.FC<ManageServiceProps> = (props: ManageService
   };
 
   useEffect(() => {
-    if (isAuthenticated) {
+    if (isAuthenticated && !props.hidden) {
       setAvailableSubscriptions([]);
       setSubscriptionsErrorMessage(undefined);
       getSubscriptions(currentUser.token)
@@ -153,7 +154,7 @@ export const ManageService: React.FC<ManageServiceProps> = (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 9a5fd0c969..495f49888e 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<CreateQnAModalProps> = (props) => {
   }, []);
 
   useEffect(() => {
-    if (isAuthenticated) {
+    if (isAuthenticated && showCreateQnAFrom) {
       setAvailableSubscriptions([]);
       setSubscriptionsErrorMessage(undefined);
       getSubscriptions(currentUser.token)
@@ -173,7 +173,7 @@ export const CreateQnAModal: React.FC<CreateQnAModalProps> = (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 d2e6faab42..64a74f544c 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<ReplaceQnAModalProps> = (props) => {
   }, []);
 
   useEffect(() => {
-    if (isAuthenticated) {
+    if (isAuthenticated && !hidden) {
       setAvailableSubscriptions([]);
       setSubscriptionsErrorMessage(undefined);
       getSubscriptions(currentUser.token)
@@ -154,7 +154,7 @@ export const ReplaceQnAFromModal: React.FC<ReplaceQnAModalProps> = (props) => {
           setSubscriptionsErrorMessage(err.message);
         });
     }
-  }, [currentUser, isAuthenticated]);
+  }, [currentUser, isAuthenticated, hidden]);
 
   useEffect(() => {
     // reset the ui

From ac71f40c89b340d822f34004cd15d6c03f4f230f Mon Sep 17 00:00:00 2001
From: Ben Brown <benbro@microsoft.com>
Date: Tue, 13 Jul 2021 16:28:13 -0500
Subject: [PATCH 2/2] remove comment

---
 .../client/src/components/ManageService/ManageService.tsx        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Composer/packages/client/src/components/ManageService/ManageService.tsx b/Composer/packages/client/src/components/ManageService/ManageService.tsx
index 54a9edc980..e5520c9a57 100644
--- a/Composer/packages/client/src/components/ManageService/ManageService.tsx
+++ b/Composer/packages/client/src/components/ManageService/ManageService.tsx
@@ -124,7 +124,6 @@ export const ManageService: React.FC<ManageServiceProps> = (props: ManageService
   const getSubscriptions = async (token: string): Promise<Array<Subscription>> => {
     const tokenCredentials = new TokenCredentials(token);
     try {
-      console.log('get subscriptions for manageservice');
       const subscriptionClient = new SubscriptionClient(tokenCredentials);
       const subscriptionsResult = await subscriptionClient.subscriptions.list();
       // eslint-disable-next-line no-underscore-dangle