move isRegisterSlackCredentials

src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettings.jsx

@@ -25,23 +25,23 @@ const CustomBotWithoutProxySettings = (props) => {
   const [isConnectedToSlack, setIsConnectedToSlack] = useState(null);
   const [isSendTestMessage, setIsSendTestMessage] = useState(false);
 
-  const fetchData = useCallback(async() => {
-    try {
-      await adminAppContainer.retrieveAppSettingsData();
-      const res = await appContainer.apiv3.get('/slack-integration/');
-      const { isSetupSlackBot, isConnectedToSlack } = res.data.slackBotSettingParams.customBotWithoutProxySettings;
-      setSiteName(adminAppContainer.state.title);
-      setIsSetupSlackBot(isSetupSlackBot);
-      setIsConnectedToSlack(isConnectedToSlack);
-      setIsRgisterSlackCredentials(false);
-      if ((slackBotToken && slackSigningSecret) || (slackBotTokenEnv && slackSigningSecretEnv)) {
-        setIsRgisterSlackCredentials(true);
-      }
-    }
-    catch (err) {
-      toastError(err);
-    }
-  }, [appContainer, adminAppContainer, slackSigningSecretEnv, slackBotTokenEnv]);
+  // const fetchData = useCallback(async() => {
+  //   try {
+  //     await adminAppContainer.retrieveAppSettingsData();
+  //     const res = await appContainer.apiv3.get('/slack-integration/');
+  //     const { isSetupSlackBot, isConnectedToSlack } = res.data.slackBotSettingParams.customBotWithoutProxySettings;
+  //     setSiteName(adminAppContainer.state.title);
+  //     setIsSetupSlackBot(isSetupSlackBot);
+  //     setIsConnectedToSlack(isConnectedToSlack);
+  //     setIsRgisterSlackCredentials(false);
+  //     if ((slackBotToken && slackSigningSecret) || (slackBotTokenEnv && slackSigningSecretEnv)) {
+  //       setIsRgisterSlackCredentials(true);
+  //     }
+  //   }
+  //   catch (err) {
+  //     toastError(err);
+  //   }
+  // }, [appContainer, adminAppContainer, slackSigningSecretEnv, slackBotTokenEnv]);
 
   useEffect(() => {
     const getSlackWorkSpaceName = async() => {

src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx

@@ -24,6 +24,8 @@ const SlackIntegration = (props) => {
   const [slackBotToken, setSlackBotToken] = useState('');
   const [slackSigningSecretEnv, setSlackSigningSecretEnv] = useState('');
   const [slackBotTokenEnv, setSlackBotTokenEnv] = useState('');
+  const [isRgisterSlackCredentials, setIsRgisterSlackCredentials] = useState(false);
+
 
   const fetchData = useCallback(async() => {
     try {
@@ -39,11 +41,14 @@ const SlackIntegration = (props) => {
       setSlackBotToken(slackBotToken);
       setSlackSigningSecretEnv(slackSigningSecretEnvVars);
       setSlackBotTokenEnv(slackBotTokenEnvVars);
+      if ((slackBotToken && slackSigningSecret) || (slackBotTokenEnv && slackSigningSecretEnv)) {
+        setIsRgisterSlackCredentials(true);
+      }
     }
     catch (err) {
       toastError(err);
     }
-  }, [appContainer.apiv3]);
+  }, [appContainer.apiv3, slackBotTokenEnv, slackSigningSecretEnv]);
 
   useEffect(() => {
     fetchData();
@@ -115,6 +120,7 @@ const SlackIntegration = (props) => {
                 slackBotTokenEnv,
                 slackSigningSecret,
                 slackSigningSecretEnv,
+                isRgisterSlackCredentials,
               }
             }
         />