fix(inbox): integrations loading bug when create

erxes · Dec 11, 2023 · b0e44da · b0e44da
1 parent 2a53763
commit b0e44da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/plugin-inbox-ui/src/settings/integrations/components/messenger/Form.tsx b/packages/plugin-inbox-ui/src/settings/integrations/components/messenger/Form.tsx
@@ -226,11 +226,15 @@ class CreateMessenger extends React.Component<Props, State> {
 
     if (messengerApps.websites && messengerApps.websites.length > 0) {
       for (const website of messengerApps.websites) {
-        if (website.url === '') return Alert.error(`Set Website URL`);
-        if (website.description === '')
+        if (website.url === '') {
+          return Alert.error(`Set Website URL`);
+        }
+        if (website.description === '') {
           return Alert.error(`Set Website Description`);
-        if (website.buttonText === '')
+        }
+        if (website.buttonText === '') {
           return Alert.error(`Set Website Button Text`);
+        }
       }
     }
 

diff --git a/packages/plugin-inbox-ui/src/settings/integrations/containers/messenger/Create.tsx b/packages/plugin-inbox-ui/src/settings/integrations/containers/messenger/Create.tsx
@@ -79,13 +79,13 @@ const CreateMessenger = (props: FinalProps) => {
       messengerApps
     } = doc;
 
-    setIsLoading(true);
-
     let id = '';
     saveMessengerMutation({
       variables: { name, brandId, languageCode, channelIds }
     })
       .then(({ data }) => {
+        setIsLoading(true);
+
         const integrationId = data.integrationsCreateMessengerIntegration._id;
         id = integrationId;
         return saveConfigsMutation({