@capillarytech/creatives-library 8.0.153-beta.1 → 8.0.154

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.153-beta.1",
+  "version": "8.0.154",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -55,4 +55,4 @@
     "webpack-bugsnag-plugins": "^1.4.3",
     "whatwg-fetch": "3.0.0"
   }
-}
+}

package/services/api.js

@@ -386,12 +386,13 @@ export const uploadFile = ({
     data.append('appSecret', wechatParams.appSecret);
   }
   if (whatsappParams) {
-    const { source, wabaId, accessToken, access_token, phoneId, hostName } = whatsappParams;
+    const { source, wabaId, accessToken, access_token, phoneId, hostName, baseUrl } = whatsappParams;
     data.append('source', source);
     data.append('wabaId', wabaId);
     data.append('accessToken', accessToken || access_token);
     data.append('phoneId', phoneId);
     data.append('hostName', hostName);
+    data.append('baseUrl', baseUrl);
   }
   const url = `${API_ENDPOINT}/assets/${assetType}`;
   // return API.post(url, data, true);

package/services/tests/api.test.js

@@ -69,6 +69,7 @@ describe('uploadFile -- whatsapp image upload', () => {
           wabaId: '107499611940863',
           accessToken: 'Bearer gDwEuRIm9icV6phixociSw==',
           hostName: 'karixwhatsappbulk',
+          baseUrl: 'https://api.whatsapp.com/v1',
         },
       }),
     ).toEqual(Promise.resolve()));

package/services/tests/haptic-api.test.js

@@ -18,6 +18,7 @@ describe('HAPTIC API Integration Tests', () => {
         access_token: 'haptic-token',
         phoneId: 'phone-456',
         hostName: 'hapticwhatsappbulk',
+        baseUrl: 'https://api.whatsapp.com/v1',
       };
 
       // Mock successful response
@@ -55,6 +56,7 @@ describe('HAPTIC API Integration Tests', () => {
       expect(formData.get('accessToken')).toBe('haptic-token'); // Note: API converts access_token to accessToken
       expect(formData.get('phoneId')).toBe('phone-456');
       expect(formData.get('hostName')).toBe('hapticwhatsappbulk');
+      expect(formData.get('baseUrl')).toBe('https://api.whatsapp.com/v1');
     });
 
     it('should handle missing HAPTIC parameters gracefully', () => {
@@ -83,6 +85,7 @@ describe('HAPTIC API Integration Tests', () => {
       expect(formData.get('accessToken')).toBe('undefined');
       expect(formData.get('phoneId')).toBe('undefined');
       expect(formData.get('hostName')).toBe('undefined');
+      expect(formData.get('baseUrl')).toBe('undefined');
     });
 
     it('should handle undefined whatsappParams', () => {
@@ -109,6 +112,7 @@ describe('HAPTIC API Integration Tests', () => {
       expect(formData.get('accessToken')).toBeNull();
       expect(formData.get('phoneId')).toBeNull();
       expect(formData.get('hostName')).toBeNull();
+      expect(formData.get('baseUrl')).toBeNull();
     });
 
     it('should handle empty string parameters', () => {
@@ -119,6 +123,7 @@ describe('HAPTIC API Integration Tests', () => {
         access_token: '',
         phoneId: '',
         hostName: '',
+        baseUrl: '',
       };
 
       fetch.mockResolvedValueOnce({
@@ -139,6 +144,7 @@ describe('HAPTIC API Integration Tests', () => {
       expect(formData.get('accessToken')).toBe('');
       expect(formData.get('phoneId')).toBe('');
       expect(formData.get('hostName')).toBe('');
+      expect(formData.get('baseUrl')).toBe('');
     });
 
     it('should handle null parameters', () => {
@@ -149,6 +155,7 @@ describe('HAPTIC API Integration Tests', () => {
         access_token: null,
         phoneId: null,
         hostName: null,
+        baseUrl: null,
       };
 
       fetch.mockResolvedValueOnce({

package/services/tests/mockData.js

@@ -37,6 +37,7 @@ export const mockData = {
             accountId: '2000222347',
             accessToken: 'DTpZEh4VK',
             hostName: 'gupshupwhatsappbulk',
+            baseUrl: 'https://api.gupshup.io/whatsapp/v1',
           },
         },
       },

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -33,22 +33,6 @@ function SlideBoxFooter(props) {
     shouldShowContinueFooter,
   } = props;
 
-  console.log("SlideBoxFooter", {
-    slidBoxContent,
-    onSave,
-    onEditTemplate,
-    onCreateNextStep,
-    isFullMode,
-    fetchingCmsData,
-    isTemplateNameEmpty,
-    errorMessages,
-    isLiquidValidationError,
-    currentTab,
-    onTestAndPreview,
-    showTestAndPreviewButton,
-    shouldShowContinueFooter: shouldShowContinueFooter(),
-    shouldShowDoneFooter: shouldShowDoneFooter(),
-  });
   return (
     <div className='template-footer-width'>
       {isLiquidValidationError && (<ErrorInfoNote errorMessages={errorMessages} currentTab={currentTab?.toUpperCase()} />)}

package/v2Containers/CreativesContainer/index.js

@@ -200,19 +200,12 @@ export class Creatives extends React.Component {
   }
 
   onCreateNextStep = () => {
-    console.log("onCreateNextStep 1");
     this.setState((prevState) => {
       let templateStep = prevState.templateStep + 1;
       const { emailCreateMode, currentChannel } = prevState;
       if ((currentChannel.toUpperCase() === constants.EMAIL && emailCreateMode === "upload") || [constants.MOBILE_PUSH, constants.WECHAT, constants.INAPP].includes(currentChannel.toUpperCase())) {
         templateStep = prevState.templateStep + 2;
       }
-      console.log("onCreateNextStep 2", {
-        templateStep,
-        currentChannel,
-        emailCreateMode,
-        prevState,
-      });
       return {
         templateStep,
       };
@@ -1360,17 +1353,7 @@ export class Creatives extends React.Component {
       }
     }
 
-    console.log("shouldShowDoneFooter", {
-      showDone,
-      channel,
-      currentStep,
-      slidBoxContent,
-      templateStep,
-      currentChannel,
-      templateData,
-      isFullMode,
-      isEmail: channel === constants.EMAIL,
-    });
+
     return showDone;
   }
 
@@ -1449,19 +1432,7 @@ export class Creatives extends React.Component {
     } else if (currentChannel.toUpperCase() === constants.INAPP) {
       isShowContinueFooter = !isEmpty(inAppCreateMode) && currentChannel === "modeSelection";
     }
-    console.log("shouldShowContinueFooter", {
-      isShowContinueFooter,
-      mobilePushCreateMode,
-      weChatTemplateType,
-      inAppCreateMode,
-      currentStep,
-      currentChannel,
-      slidBoxContent,
-      templateStep,
-      emailCreateMode,
-      emailLayout: this.props?.EmailLayout,
-      isEmail: channel === constants.EMAIL,
-    });
+
     return isShowContinueFooter;
   }
 

package/v2Containers/EmailWrapper/hooks/useEmailWrapper.js

@@ -1,4 +1,4 @@
-import { useState, useEffect, useMemo, useCallback, useRef } from 'react';
+import { useState, useEffect, useMemo, useCallback } from 'react';
 import isEmpty from 'lodash/isEmpty';
 import get from 'lodash/get';
 import find from 'lodash/find';
@@ -66,9 +66,6 @@ const useEmailWrapper = ({
     query: { module: 'library', type: 'embedded' },
   });
 
-  // Prevent duplicate uploads from rapid/double onChange events
-  const isUploadingRef = useRef(false);
-
   // Cleanup effect
   useEffect(() => {
     return () => {
@@ -117,11 +114,6 @@ const useEmailWrapper = ({
   }, [formatMessage]);
 
   const handleFileUpload = useCallback((file = {}) => {
-    // Guard against duplicate triggers (e.g., multiple onChange emissions)
-    if (isUploadingRef.current || isUploading) {
-      return;
-    }
-
     if (!isUploading) {
       // Validate file object
       if (!file || !file.name) {
@@ -155,20 +147,11 @@ const useEmailWrapper = ({
           return;
         }
 
-        // Mark uploading to prevent duplicate dispatches before Redux state updates
-        isUploadingRef.current = true;
-
         templatesActions.handleZipUpload(file.originFileObj, () => { // Handle upload success
           stopTimerGA();
           setModeContent({ file });
-          // Clear local uploading guard before navigating to next step
-          isUploadingRef.current = false;
           showNextStep();
-        }, () => {
-          // Clear local uploading guard on error as well
-          isUploadingRef.current = false;
-          handleZipUploadError();
-        });
+        }, handleZipUploadError);
       } else if (fileExtension === 'html' || fileExtension === 'htm') {
         // Verify originFileObj exists
         if (!file.originFileObj) {
@@ -176,16 +159,12 @@ const useEmailWrapper = ({
           return;
         }
 
-        // Guard during HTML processing to avoid duplicate reads
-        isUploadingRef.current = true;
-
         const reader = new FileReader();
         reader.onload = () => {
           const text = reader.result;
           // Add defensive check for empty or invalid content
           if (!text || typeof text !== 'string') {
             handleZipUploadError();
-            isUploadingRef.current = false;
             return;
           }
           
@@ -194,12 +173,9 @@ const useEmailWrapper = ({
           
           setModeContent({ file });
           templatesActions.handleHtmlUpload(text);
-          // Clear uploading guard after handing off HTML upload
-          isUploadingRef.current = false;
         };
         reader.onerror = () => {
           handleZipUploadError();
-          isUploadingRef.current = false;
         };
         reader.readAsText(file.originFileObj);
       } else {

package/v2Containers/Templates/tests/mockData.js

@@ -81,6 +81,7 @@ export const senderDetailsWhatsapp = {
       wabaId: "testSourceAccount",
       userid: "testSourceAccount",
       sourceAccountIdentifier: "testSourceAccount",
+      baseUrl: "https://api.whatsapp.com/v1",
     },
     hostname: "testWhatsappHost",
   },

package/v2Containers/Whatsapp/index.js

@@ -39,6 +39,7 @@ import {
   CAP_WHITE,
 } from '@capillarytech/cap-ui-library/styled/variables';
 import { makeSelectWhatsapp, makeSelectAccount } from './selectors';
+import { makeSelectTemplates } from '../Templates/selectors';
 import {
   isLoadingMetaEntities,
   makeSelectMetaEntities,
@@ -135,6 +136,23 @@ let editContent = {};
 let tagValidationResponse = {};
 let headerTagValidationResponse = {};
 
+// Function to extract baseUrl from domainProperties
+export const extractBaseUrlFromDomainProperties = (selectedSourceAccountIdentifier, domainPropertiesData = []) => {
+  if (!selectedSourceAccountIdentifier || isEmpty(domainPropertiesData)) {
+    return '';
+  }
+
+  // Handle both API response structure and processed Redux state
+  const whatsappDomainProperties = domainPropertiesData?.entity?.WHATSAPP || domainPropertiesData;
+
+  const domainProperty = whatsappDomainProperties?.find(({ domainProperties }) => {
+    const { connectionProperties: { sourceAccountIdentifier } = {} } = domainProperties || {};
+    return sourceAccountIdentifier === selectedSourceAccountIdentifier;
+  });
+
+  return domainProperty?.domainProperties?.connectionProperties?.baseUrl || '';
+};
+
 export const Whatsapp = (props) => {
   const {
     intl,
@@ -184,6 +202,7 @@ export const Whatsapp = (props) => {
   const [accessToken, setAccessToken] = useState('');
   const [accountName, setAccountName] = useState('');
   const [host, setHost] = useState('');
+  const [baseUrl, setBaseUrl] = useState('');
   const [spin, setSpin] = useState(false);
   const [unsubscribeRequired, setUnsubscribeRequired] = useState(false);
   const [securityWarningReqd, setSecurityWarningReqd] = useState(false);
@@ -276,8 +295,14 @@ export const Whatsapp = (props) => {
       setAccessToken(configs.accessToken || '');
       setAccountName(name);
       setHost(hostName);
+
+      // Extract baseUrl from domainProperties
+      const { senderDetails = {} } = props.Templates || {};
+      const { domainProperties = [] } = senderDetails;
+      const extractedBaseUrl = extractBaseUrlFromDomainProperties(sourceAccountIdentifier, domainProperties);
+      setBaseUrl(extractedBaseUrl);
     }
-  }, [accountData.selectedWhatsappAccount]);
+  }, [accountData.selectedWhatsappAccount, props.Templates?.senderDetails]);
 
   //gets template details
   const paramObj = params || {};
@@ -1073,6 +1098,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
       wabaId: accountId,
       phoneId,
       hostName: host,
+      baseUrl: baseUrl,
     };
 
     // Add the correct access token field based on host
@@ -1613,6 +1639,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
                     accessToken,
                   }),
               hostName: host,
+              baseUrl: baseUrl,
               ...(isBtnTypeQuickReply && {
                 buttonType,
                 buttons: getQuickReplyData(),
@@ -2981,6 +3008,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
 const mapStateToProps = createStructuredSelector({
   editData: makeSelectWhatsapp(),
   accountData: makeSelectAccount(),
+  Templates: makeSelectTemplates(),
   metaEntities: makeSelectMetaEntities(),
   loadingTags: isLoadingMetaEntities(),
   injectedTags: setInjectedTags(),

package/v2Containers/Whatsapp/tests/__snapshots__/index.test.js.snap

@@ -2297,6 +2297,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -19188,6 +19205,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -36043,6 +36077,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -54818,6 +54869,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -73811,6 +73879,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -93561,6 +93646,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -110426,6 +110528,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -127281,6 +127400,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -146608,6 +146744,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -166153,6 +166306,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -186455,6 +186625,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={Object {}}
     actions={
       Object {
@@ -206969,6 +207156,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -217817,6 +218021,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -225949,6 +226170,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -234517,6 +234755,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -247808,6 +248063,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -262449,6 +262721,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -273630,6 +273919,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -290485,6 +290791,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -309812,6 +310135,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -326667,6 +327007,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -343748,6 +344105,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -361069,6 +361443,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -378616,6 +379007,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -396404,6 +396812,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -414432,6 +414857,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -432697,6 +433139,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -451199,6 +451658,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -469939,6 +470415,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -487041,6 +487534,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -504376,6 +504886,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -521968,6 +522495,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     accountData={
       Object {
         "selectedWhatsappAccount": Object {
@@ -538823,6 +539367,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     actions={
       Object {
         "clearCreateResponse": [MockFunction],
@@ -557929,6 +558490,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     actions={
       Object {
         "clearCreateResponse": [MockFunction] {
@@ -557954,6 +558532,7 @@ new message content.",
                       "whatsapp": Object {
                         "accessToken": "",
                         "accountId": "",
+                        "baseUrl": "",
                         "category": "APPOINTMENT_UPDATE",
                         "codeExpiryMinutes": 0,
                         "hostName": "",
@@ -577116,6 +577695,23 @@ new message content.",
   }
 >
   <Whatsapp
+    Templates={
+      Object {
+        "senderDetails": Object {
+          "domainProperties": Array [
+            Object {
+              "domainProperties": Object {
+                "connectionProperties": Object {
+                  "baseUrl": "https://api.gupshup.io/whatsapp/v1",
+                  "sourceAccountIdentifier": "2000222347",
+                },
+              },
+            },
+          ],
+          "status": "SUCCESS",
+        },
+      }
+    }
     actions={
       Object {
         "clearCreateResponse": [MockFunction] {
@@ -577141,6 +577737,7 @@ new message content.",
                       "whatsapp": Object {
                         "accessToken": "",
                         "accountId": "",
+                        "baseUrl": "",
                         "category": "APPOINTMENT_UPDATE",
                         "codeExpiryMinutes": 0,
                         "hostName": "",

package/v2Containers/Whatsapp/tests/actions.test.js

@@ -22,6 +22,7 @@ describe('Test whatsapp actions', () => {
               accountId: '2000222347',
               accessToken: 'DTpZEh4VK',
               hostName: 'gupshupwhatsappbulk',
+              baseUrl: 'https://api.gupshup.io/whatsapp/v1',
             },
           },
         },

package/v2Containers/Whatsapp/tests/haptic.test.js

@@ -2,7 +2,6 @@ import {
   HOST_HAPTIC,
   HAPTIC_CATEGORY_OPTIONS,
   CATEGORY_OPTIONS_MAP,
-  mediaTypeOptions,
 } from '../constants';
 
 // Mock API calls

package/v2Containers/Whatsapp/tests/index.test.js

@@ -84,6 +84,21 @@ describe('Creatives Whatsapp test1/>', () => {
           loadingTags={args.loadingTags}
           metaEntities={[]}
           getDefaultTags={true}
+          Templates={{
+            senderDetails: {
+              status: 'SUCCESS',
+              domainProperties: [
+                {
+                  domainProperties: {
+                    connectionProperties: {
+                      sourceAccountIdentifier: '2000222347',
+                      baseUrl: 'https://api.gupshup.io/whatsapp/v1',
+                    },
+                  },
+                },
+              ],
+            },
+          }}
         />
       </Provider>,
     );
@@ -240,7 +255,7 @@ describe('Creatives Whatsapp test1/>', () => {
 
   it('test addVariable in create mode', () => {
 
-    
+
     renderHelper({});
     renderedComponent.update();
     renderedComponent.find('[data-testid="suffix-button"]').at(1).props().onClick();
@@ -365,6 +380,21 @@ describe('Creatives Whatsapp test2/>', () => {
           loadingTags={args.loadingTags}
           metaEntities={[]}
           getDefaultTags={true}
+          Templates={{
+            senderDetails: {
+              status: 'SUCCESS',
+              domainProperties: [
+                {
+                  domainProperties: {
+                    connectionProperties: {
+                      sourceAccountIdentifier: '2000222347',
+                      baseUrl: 'https://api.gupshup.io/whatsapp/v1',
+                    },
+                  },
+                },
+              ],
+            },
+          }}
         />
       </Provider>,
     );
@@ -530,7 +560,7 @@ describe('mediaTypeOptions', () => {
       templateCategory: WHATSAPP_CATEGORIES.marketing,
     });
     const hasCarousel = options.some(
-      (opt) => Array.isArray(opt) 
+      (opt) => Array.isArray(opt)
         ? opt.some((o) => o.key === 'CAROUSEL')
         : opt.key === 'CAROUSEL'
     ) || options.flat().some((o) => o.key === 'CAROUSEL');
@@ -543,7 +573,7 @@ describe('mediaTypeOptions', () => {
       templateCategory: WHATSAPP_CATEGORIES.marketing,
     });
     const hasCarousel = options.some(
-      (opt) => Array.isArray(opt) 
+      (opt) => Array.isArray(opt)
         ? opt.some((o) => o.key === 'CAROUSEL')
         : opt.key === 'CAROUSEL'
     ) || options.flat().some((o) => o.key === 'CAROUSEL');
@@ -556,7 +586,7 @@ describe('mediaTypeOptions', () => {
       templateCategory: WHATSAPP_CATEGORIES.utility,
     });
     const hasCarousel = options.some(
-      (opt) => Array.isArray(opt) 
+      (opt) => Array.isArray(opt)
         ? opt.some((o) => o.key === 'CAROUSEL')
         : opt.key === 'CAROUSEL'
     ) || options.flat().some((o) => o.key === 'CAROUSEL');
@@ -569,7 +599,7 @@ describe('mediaTypeOptions', () => {
       templateCategory: WHATSAPP_CATEGORIES.utility,
     });
     const hasCarousel = options.some(
-      (opt) => Array.isArray(opt) 
+      (opt) => Array.isArray(opt)
         ? opt.some((o) => o.key === 'CAROUSEL')
         : opt.key === 'CAROUSEL'
     ) || options.flat().some((o) => o.key === 'CAROUSEL');

package/v2Containers/mockdata.js

@@ -85,7 +85,8 @@ export default {
                     "authToken": "Bearer abcd",
                     "sourceAccountIdentifier": "12345",
                     "wabaId": "12345",
-                    "whatsapp_pool_id": "CAP001"
+                    "whatsapp_pool_id": "CAP001",
+                    "baseUrl": "https://api.whatsapp.com/v1"
                 },
                 "hostName": "karixwhatsappbulk"
             },
@@ -128,7 +129,8 @@ export default {
                 "connectionProperties": {
                     "password": "qrtCAJCz",
                     "sourceAccountIdentifier": "123456",
-                    "userid": "123456"
+                    "userid": "123456",
+                    "baseUrl": "https://api.gupshup.io/whatsapp/v1"
                 },
                 "hostName": "gupshupwhatsappbulk"
             },
@@ -2587,7 +2589,7 @@ export default {
   loyaltyMetaData: {
     actionName: "SEND_COMMUNICATION_ACTION",
   },
-  getWhatsappAutoFillData: 
+  getWhatsappAutoFillData:
     < CapLabel
       className="whatsapp-autofill-btn"
       type="label21"