@capillarytech/creatives-library 7.12.65 → 7.12.67

package/package.json

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

package/v2Components/CapImageUpload/index.js

@@ -242,7 +242,7 @@ function CapImageUpload(props) {
       />
       </form>
       <div className="image-info-wrapper">
-        {channel === WHATSAPP ? (
+        {channel === WHATSAPP && (
           <>
             <CapHeadingSpan type="label2">
               <FormattedMessage {...messages.whatsappImageSize} />
@@ -251,12 +251,12 @@ function CapImageUpload(props) {
               <FormattedMessage {...messages.whatsappAspectRatio} />
             </CapHeadingSpan>
           </>
-        ) : (
+        )}
+        {channel !== WHATSAPP && (
           <CapHeadingSpan type="label2" className="image-dimension">
             <FormattedMessage {...messages.imageDimenstionDescription} values={{ width: imgWidth, height: imgHeight }} />
           </CapHeadingSpan>
-        )
-        }
+        )}
         {channel === FACEBOOK && (
           <CapHeadingSpan type="label2" className="image-aspect-ratio">
             <FormattedMessage {...messages.aspectRatio} />

package/v2Components/CapWhatsappCTA/index.js

@@ -62,12 +62,14 @@ export const CapWhatsappCTA = (props) => {
       ...clonedCta,
       [type]: value,
     };
-    if (type === 'urlType' && value === STATIC_URL) {
-      clonedCta.url = '';
-      setUrlError(false);
-    } else if (type === 'urlType' && value === DYNAMIC_URL) {
-      clonedCta.url = '{{1}}';
-      setUrlError(formatMessage(messages.ctaWebsiteUrlErrorMessage));
+    if (type === 'urlType') {
+      if (value === STATIC_URL) {
+        clonedCta.url = '';
+        setUrlError(false);
+      } else if (value === DYNAMIC_URL) {
+        clonedCta.url = '{{1}}';
+        setUrlError(formatMessage(messages.ctaWebsiteUrlErrorMessage));
+      }
     }
     updateHandler(clonedCta, index);
   };
@@ -164,7 +166,10 @@ export const CapWhatsappCTA = (props) => {
     let errorMessage = false;
     if (!isUrl(value)) {
       errorMessage = formatMessage(messages.ctaWebsiteUrlErrorMessage);
-    } else if (urlType === STATIC_URL && value.match(invalidVarRegex)?.length > 0) {
+    } else if (
+      urlType === STATIC_URL &&
+      value.match(invalidVarRegex)?.length > 0
+    ) {
       errorMessage = formatMessage(messages.staticUrlWithVarErrorMessage);
     }
     setUrlError(errorMessage);
@@ -196,6 +201,7 @@ export const CapWhatsappCTA = (props) => {
     ctaData.forEach((cta) => {
       const { index, ctaType, text, phone_number, urlType, url, isSaved } =
         cta || {};
+      //this is to display buttons after they are saved, in both create and edit mode.
       if (isSaved) {
         const ctaIsPhone = ctaType === PHONE_NUMBER;
         const urlTypeIsDynamic = urlType === DYNAMIC_URL;
@@ -284,6 +290,7 @@ export const CapWhatsappCTA = (props) => {
           </CapRow>,
         );
       } else {
+        //this is to display buttons before they are saved, only in create mode.
         renderArray.push(
           <CapRow
             className="cap-whatsapp-cta margin-t-16"

package/v2Containers/Templates/sagas.js

@@ -157,7 +157,7 @@ export function* getSenderDetails({
     if (!apiResponse?.errors?.length) {
       yield put({
         type: types.GET_SENDER_DETAILS_SUCCESS,
-        payload: apiResponse.entity.WHATSAPP[0].domainProperties.hostName,
+        payload: apiResponse?.entity?.WHATSAPP[0]?.domainProperties?.hostName || '',
       });
     } else {
       yield put({

package/v2Containers/Whatsapp/index.js

@@ -871,13 +871,7 @@ export const Whatsapp = (props) => {
   });
 
   const actionCallback = ({ errorMessage }) => {
-    let error = '';
-    if (host === HOST_KARIX) {
-      error = JSON.parse(errorMessage.errorMessage).error.message || 'Error';
-    } else {
-      error = errorMessage?.message || errorMessage;
-    }
-    if (!error) {
+    if (!errorMessage) {
       CapNotification.success({
         message: formatMessage(messages.whatsappCreateNotification, {
           name: templateName,
@@ -886,7 +880,7 @@ export const Whatsapp = (props) => {
       actions.clearCreateResponse();
     } else {
       CapNotification.error({
-        message: error,
+        message: JSON.stringify(errorMessage),
       });
     }
   };
@@ -1379,7 +1373,7 @@ export const Whatsapp = (props) => {
             <CapTooltip
               title={
                 isDisableDone()
-                  ? formatMessage(messages.sendForApprovalToolTip)
+                  ? formatMessage(messages.btnDisabledTooltip)
                   : ''
               }
               placement={'right'}
@@ -1404,7 +1398,14 @@ export const Whatsapp = (props) => {
           </>
         )}
         {!isFullMode && isEditFlow && (
-          <>
+          <CapTooltip
+            title={
+              isEditDoneDisabled()
+                ? formatMessage(messages.btnDisabledTooltip)
+                : ''
+            }
+            placement={'right'}
+          >
             <CapButton
               onClick={saveToMessage}
               disabled={isEditDoneDisabled()}
@@ -1412,7 +1413,7 @@ export const Whatsapp = (props) => {
             >
               <FormattedMessage {...globalMessages.done} />
             </CapButton>
-          </>
+          </CapTooltip>
         )}
       </WhatsappFooter>
     </CapSpin>

package/v2Containers/Whatsapp/messages.js

@@ -185,8 +185,8 @@ export default defineMessages({
     id: `${prefix}.sendForApprovalButtonLabel`,
     defaultMessage: 'Send for approval',
   },
-  sendForApprovalToolTip: {
-    id: `${prefix}.sendForApprovalToolTip`,
+  btnDisabledTooltip: {
+    id: `${prefix}.btnDisabledTooltip`,
     defaultMessage: 'Please add all mandatory fields to proceed further',
   },
   cancelButtonLabel: {
@@ -286,7 +286,7 @@ export default defineMessages({
   },
   btnTypeQuickReply: {
     id: `${prefix}.btnTypeQuickReply`,
-    defaultMessage: 'Quik reply',
+    defaultMessage: 'Quick reply',
   },
   quickReplyDesc: {
     id: `${prefix}.quickReplyDesc`,