Merge pull request #2927 from glific/fix/interactive-messages

Fixed validation of url in interactive messages
glific · Jun 12, 2024 · 95affd6 · 95affd6
2 parents 1074282 + 99721b3
commit 95affd6
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/containers/InteractiveMessage/InteractiveMessage.tsx b/src/containers/InteractiveMessage/InteractiveMessage.tsx
@@ -20,7 +20,13 @@ import { EmojiInput } from 'components/UI/Form/EmojiInput/EmojiInput';
 import { AutoComplete } from 'components/UI/Form/AutoComplete/AutoComplete';
 import { Simulator } from 'components/simulator/Simulator';
 import { LanguageBar } from 'components/UI/LanguageBar/LanguageBar';
-import { LIST, LOCATION_REQUEST, MEDIA_MESSAGE_TYPES, QUICK_REPLY } from 'common/constants';
+import {
+  LIST,
+  LOCATION_REQUEST,
+  MEDIA_MESSAGE_TYPES,
+  QUICK_REPLY,
+  VALID_URL_REGEX,
+} from 'common/constants';
 import { validateMedia } from 'common/utils';
 import { Loading } from 'components/UI/Layout/Loading/Loading';
 import { InteractiveOptions } from './InteractiveOptions/InteractiveOptions';
@@ -254,7 +260,10 @@ export const InteractiveMessage = () => {
     }
 
     if (isEditing && data.attachmentURL) {
-      setDynamicMedia(!isUrlValid);
+      const testForValidUrl = new RegExp(VALID_URL_REGEX, 'gi');
+      if (!testForValidUrl.test(data.attachmentURL)) {
+        setDynamicMedia(true);
+      }
     }
 
     if (translationsVal) {
@@ -286,7 +295,7 @@ export const InteractiveMessage = () => {
     if (!dynamicMedia && (type === '' || type) && attachmentURL) {
       validateURL(attachmentURL);
     }
-  }, [type, attachmentURL]);
+  }, [type, attachmentURL, dynamicMedia]);
 
   const handleAddInteractiveTemplate = (
     addFromTemplate: boolean,