@capillarytech/creatives-library 7.17.61-alpha.0 → 7.17.62

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.17.61-alpha.0",
+  "version": "7.17.62",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Containers/Zalo/constants.js

@@ -17,6 +17,7 @@ export const DEFAULT = 'default';
 export const LIBRARY = 'library';
 export const FULL = 'full';
 export const ALL = 'all';
+export const OUTBOUND = 'outbound';
 
 const prefix = 'app/v2Containers/Zalo';
 export const ZALO_TEMPLATE_INFO_REQUEST = `${prefix}/ZALO_TEMPLATE_INFO_REQUEST`;

package/v2Containers/Zalo/index.js

@@ -35,6 +35,7 @@ import {
   TAG,
   FULL,
   ALL,
+  OUTBOUND,
   LIBRARY,
   ERROR_ALERT,
   WARNING_ALERT,
@@ -55,7 +56,7 @@ export const Zalo = (props) => {
     isFullMode,
     templateData = {},
     editData = {},
-    accountData = {},
+    accountData: { selectedZaloAccount = {} } = {},
     globalActions,
     location,
     getDefaultTags,
@@ -80,7 +81,14 @@ export const Zalo = (props) => {
   const [textAreaId, updateTextAreaId] = useState('');
   const { zaloTemplateInfoValue = {}, zaloTemplateInfoStatus = REQUEST } =
     editData;
-  const { _id = '', templateConfigs: { id = '', varMapped = {} } = {} } = templateData;
+  const {
+    _id = '',
+    accountId = '',
+    zaloAccountId = '',
+    accountName = '',
+    templateConfigs: { id = '', varMapped = {} } = {},
+    token: zaloToken = '',
+  } = templateData;
   const zaloTempId = _id || id;
   const ZaloFooter = styled.div`
     background-color: ${CAP_WHITE};
@@ -98,18 +106,18 @@ export const Zalo = (props) => {
 `;
   //gets account details
   useEffect(() => {
-    const accountObj = accountData.selectedZaloAccount || {};
-    if (!isEmpty(accountObj)) {
+    if (!isEmpty(selectedZaloAccount) || !isEmpty(templateData)) {
       const {
         sourceAccountIdentifier = '',
         configs: { token: accessToken = '' } = {},
         name = '',
-      } = accountObj;
-      setOaId(sourceAccountIdentifier);
-      setToken(accessToken);
-      setUsername(name);
+      } = selectedZaloAccount;
+      const oaId = getDefaultTags === OUTBOUND ? zaloAccountId : accountId;
+      setOaId(sourceAccountIdentifier || oaId);
+      setToken(accessToken || zaloToken);
+      setUsername(name || accountName);
     }
-  }, [accountData.selectedZaloAccount]);
+  }, [selectedZaloAccount, templateData]);
 
   //gets template details
   useEffect(() => {
@@ -170,7 +178,7 @@ export const Zalo = (props) => {
     if (!isEmpty(varMapped)) {
       setDataForEdit(true);
     }
-  }, [varMapped]);
+  }, [varMapped, zaloTemplateInfoValue]);
 
   useEffect(() => {
     let tag = get(metaEntities, `tags.standard`, []);
@@ -351,6 +359,9 @@ export const Zalo = (props) => {
     const payload = {
       channel: ZALO,
       accountId: oa_id,
+      ...(getDefaultTags === OUTBOUND && {
+        zaloAccountId: oa_id,
+      }),
       accountName: username,
       templateConfigs: {
         id: templateId?.toString(),