@capillarytech/creatives-library 8.0.345-alpha.15 → 8.0.345-alpha.16

package/v2Containers/SmsWrapper/index.js

@@ -10,14 +10,12 @@ import { isTraiDLTEnable } from '../../utils/common';
 import SmsEdit from '../Sms/Edit';
 import SmsTraiCreate from '../SmsTrai/Create';
 import SmsTraiEdit from '../SmsTrai/Edit';
-
 const SmsWrapper = (props) => {
   const {
     isCreateSms,
     isEditSms,
     setIsLoadingContent,
     location,
-    route: routeFromProps,
     isGetFormData,
     getFormSubscriptionData,
     isFullMode,
@@ -40,33 +38,15 @@ const SmsWrapper = (props) => {
     handleCloseTestAndPreview,
     isTestAndPreviewMode,
     onValidationFail,
-    embeddedSmsFallback = false,
-    onEmbeddedSmsFooterValidity,
-    forceFullTagContext = false,
     } = props;
 
-  /** FormBuilder / SMS Create assume `location.query`; connected-router shapes may omit it. */
-  const smsLocation = (() => {
-    const loc = location || {};
-    const q = loc.query;
-    if (q && typeof q === 'object') {
-      return { ...loc, query: { ...q } };
-    }
-    return {
-      pathname: loc.pathname || '/sms/create',
-      search: loc.search || '',
-      query: { type: 'embedded', module: 'library' },
-    };
-  })();
-
   const smsProps = {
     onCreateComplete,
     setIsLoadingContent,
-    location: smsLocation,
-    route: routeFromProps || { name: 'sms' },
+    location,
+    route: { name: 'sms' },
     isGetFormData,
     getFormSubscriptionData,
-    templateData,
     getDefaultTags,
     isFullMode,
     forwardedTags,
@@ -82,33 +62,24 @@ const SmsWrapper = (props) => {
     handleCloseTestAndPreview,
     isTestAndPreviewMode,
     onValidationFail,
-    forceFullTagContext,
-    embeddedSmsFallback,
-    onEmbeddedSmsFooterValidity,
-    ...(embeddedSmsFallback
-      ? {
-        tagListGetPopupContainer: () => document.body,
-        tagListPopoverOverlayStyle: { zIndex: 10020 },
-        tagListPopoverOverlayClassName: 'sms-fallback-taglist-popover rcs-sms-fallback-taglist-popover',
-      }
-      : {}),
   };
-  const useTraiSmsFlow = isTraiDLTEnable(isFullMode, smsRegister);
+  const isTraiDlt = isTraiDLTEnable(isFullMode, smsRegister);
   return <>
     {
-      isCreateSms && (useTraiSmsFlow ?
+      isCreateSms && (isTraiDlt ?
         <SmsTraiCreate
           isComponent
           {...smsProps}
           onShowTemplates={onShowTemplates}
           /> :
           <SmsCreate
-            isComponent
-            {...smsProps}
+            isComponent {
+              ...smsProps
+            }
           />
       )
     }
-    {isEditSms && (useTraiSmsFlow ?
+    {isEditSms && (isTraiDlt ?
       <SmsTraiEdit
         {...smsProps}
         params={{id: templateData._id}}

package/v2Containers/TagList/index.js

@@ -477,9 +477,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
           disableTooltipMsg={tooltipMsg}
           fetchingSchemaError={this?.state?.tagsError}
           popoverPlacement={this.props.popoverPlacement}
-          overlayStyle={this.props.popoverOverlayStyle}
-          overlayClassName={this.props.popoverOverlayClassName}
-          getPopupContainer={this.props.getPopupContainer}
         />
       </div>
     );
@@ -516,9 +513,6 @@ TagList.propTypes = {
   // message to show when Add Label button is disabled (e.g. personalization restriction)
   disableTooltipMsg: PropTypes.string,
   restrictPersonalization: PropTypes.bool,
-  popoverOverlayStyle: PropTypes.object,
-  popoverOverlayClassName: PropTypes.string,
-  getPopupContainer: PropTypes.func,
   intl: PropTypes.shape({
     formatMessage: PropTypes.func.isRequired,
     locale: PropTypes.string,

package/v2Containers/Templates/_templates.scss

@@ -2,13 +2,10 @@
 
 .ant-tabs-content{
     margin-top: 16px;
-  // .creatives-templates-list.full-mode{
-    .v2-pagination-container, .v2-pagination-container-half {
     .ant-tabs-tabpane-active{
       padding: unset;
     }
   }
-}
 
 @media screen and (max-width: 1172px) {
   .creatives-templates-list.full-mode{
@@ -23,11 +20,8 @@
     }
   }
 }
-// }
 
 @media screen and (min-width: 1172px) {
-  .creatives-templates-list.full-mode{
-    .v2-pagination-container, .v2-pagination-container-half {
   .creatives-templates-list.full-mode{
     .v2-pagination-container {
       .cap-custom-card-list-row {
@@ -39,21 +33,16 @@
       }
     }
   }
-    }
-  }
 }
 
-
 .creatives-templates-list {
 
   .delete-template-confirm {
     .ant-modal-footer {
       padding: $CAP_SPACE_16 $CAP_SPACE_24 $CAP_SPACE_24 $CAP_SPACE_24;
     }
-}
 
     .ant-modal-header {
-  .v2-pagination-container, .v2-pagination-container-half {
       padding: $CAP_SPACE_24 $CAP_SPACE_24 $CAP_SPACE_08 $CAP_SPACE_24;
     }
 
@@ -192,13 +181,10 @@
               .whatsapp-container {
                 background-color: $CAP_WHITE;
                 padding: $CAP_SPACE_12;
-                overflow-y: hidden;
               }
               .scroll-container {
                 overflow-x: auto;
                 display: flex;
-                flex-wrap: nowrap;
-                width: 100%;
                 padding-top: $CAP_SPACE_06;
                 padding-right: $CAP_SPACE_06;
                 white-space: nowrap;
@@ -232,92 +218,6 @@
       }
     }
 
-    // RCS template listing preview: match WhatsApp carousel "peek" behavior
-    .RCS {
-      .cap-custom-card {
-        .ant-card-body {
-          .ant-card-meta {
-            background-color: $CAP_G09;
-            padding: 0;
-            .ant-card-meta-description {
-             .whatsapp-container,.cap-rcs-creatives {
-                background-color: $CAP_WHITE;
-                padding: $CAP_SPACE_12;
-                border-radius: 0.25rem;
-                .cap-divider-v2{
-                  margin: $CAP_SPACE_12 0;
-                }
-              }
-              .scroll-container {
-                overflow-x: auto;
-                overflow-y: hidden;
-                display: flex;
-                flex-wrap: nowrap;
-                padding-top: $CAP_SPACE_06;
-                padding-right: $CAP_SPACE_06;
-                white-space: nowrap;
-                scrollbar-width: none; // Hide scrollbar in Firefox
-                &::-webkit-scrollbar {
-                  display: none; // Hide scrollbar in Chrome/Safari/Opera
-                }
-                .whatsapp-carousel-container {
-                  padding: $CAP_SPACE_04 0px $CAP_SPACE_08;
-                  border-radius: $CAP_SPACE_06;
-                  background-color: $CAP_WHITE;
-                  width: 80%;
-                  flex-shrink: 0;
-                  margin-right: $CAP_SPACE_04;
-                  white-space: pre-wrap;
-                  word-break: break-word;
-                  overflow: auto;
-                  text-align: left;
-                  .whatsapp-carousel-card {
-                    margin: $CAP_SPACE_02 $CAP_SPACE_06 $CAP_SPACE_01 $CAP_SPACE_08;
-                    .whatsapp-carousel-body {
-                      margin-bottom: $CAP_SPACE_08;
-                      white-space: pre-wrap;
-                    }
-                  }
-                }
-              }
-
-              // RCS CTA buttons in listing (reuse WhatsApp-ish look)
-              .rcs-cta-preview {
-                margin: $CAP_SPACE_12 0;
-                display: flex;
-                justify-content: center;
-                font-size: $FONT_SIZE_M;
-                align-items: center;
-                color: #1970DA;
-                svg {
-                  margin-right: $CAP_SPACE_04;
-                }
-              }
-
-              .rcs-video-preview-placeholder {
-                background: #f5f5f5;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-              }
-
-              .rcs-video-preview-label {
-                color: #7a7a7a;
-              }
-
-              .rcs-listing-title {
-                font-weight: 600;
-              }
-
-              .whatsapp-divider {
-                margin: 0;
-              }
-            }
-          }
-        }
-      }
-    }
-
     .MOBILEPUSH {
         .ant-card-body {
           padding: 0;
@@ -759,29 +659,11 @@
 }
 
 .action-container{
-  margin-top: $CAP_SPACE_08;
-  margin-bottom: $CAP_SPACE_16;
+  margin-top: 8px;
+  margin-bottom: 16px;
   display: flex;
   justify-content: space-between;
   align-items: center;
-
-  &__toolbar-row {
-    display: flex;
-    align-items: center;
-    gap: 0.75rem;
-  }
-
-  &__toolbar-row .search-text {
-    width: 13.125rem;
-    min-width: 13.125rem;
-    flex: 1;
-  }
-
-  &__create-row {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
 }
 
 .popover-action-container:hover{
@@ -1219,47 +1101,4 @@
 .inapp-illustration-parent {
   height: "calc(100vh - 325px)";
   overflow: 'auto';
-}
-
-/* Local SMS / slidebox: viewport-based .v2-pagination-container-half height leaves empty space below and clips cards */
-.creatives-templates-container--local-sms.library-mode {
-  .creatives-templates-list.library-mode > .cap-row:first-of-type > div {
-    display: flex;
-    flex-direction: column;
-    flex: 1 1 auto;
-    min-height: 0;
-    overflow: hidden;
-  }
-
-  .creatives-templates-list.library-mode > .cap-row:first-of-type > div > div:first-child {
-    display: flex;
-    flex-direction: column;
-    flex: 1 1 auto;
-    min-height: 0;
-    overflow: hidden;
-  }
-
-  /* Block below search/filter: grid + skeletons — must grow to use space above footer */
-  .creatives-templates-list.library-mode > .cap-row:first-of-type > div > div:first-child > div:nth-child(2) {
-    flex: 1 1 auto;
-    min-height: 0;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-  }
-
-  /*
-   * Scroll needs a definite height. Pure flex + height:auto + max-height:100% often won’t bound (no % base), so no scrollbar.
-   * Use a taller slice than global 100vh-20rem so the grid uses space under search; still overflow-y:auto for long lists.
-   */
-  .v2-pagination-container,
-  .v2-pagination-container-half {
-    flex: 0 1 auto;
-    min-height: 0;
-    height: calc(100vh - 12rem);
-    max-height: calc(100vh - 12rem);
-    overflow-y: auto;
-    overflow-x: hidden;
-    -webkit-overflow-scrolling: touch;
-  }
 }

package/v2Containers/Templates/actions.js

@@ -15,17 +15,6 @@ export function getAllTemplates(channel, queryParams, intlCopyOf = '') {
   };
 }
 
-
-export function getLocalSmsTemplates(queryParams, intlCopyOf = '', onSuccess, onFailure) {
-  return {
-    type: types.GET_LOCAL_SMS_TEMPLATES_REQUEST,
-    queryParams,
-    intlCopyOf,
-    onSuccess,
-    onFailure,
-  };
-}
-
 export function resetTemplate() {
   return {
     type: types.RESET_TEMPLATE,

package/v2Containers/Templates/constants.js

@@ -10,8 +10,6 @@ export const GET_ALL_TEMPLATES_REQUEST = 'app/v2Containers/Templates/GET_ALL_TEM
 export const GET_ALL_TEMPLATES_SUCCESS = 'app/v2Containers/Templates/GET_ALL_TEMPLATES_SUCCESS';
 export const GET_ALL_TEMPLATES_FAILURE = 'app/v2Containers/Templates/GET_ALL_TEMPLATES_FAILURE';
 
-export const GET_LOCAL_SMS_TEMPLATES_REQUEST = 'app/v2Containers/Templates/GET_LOCAL_SMS_TEMPLATES_REQUEST';
-
 export const DELETE_TEMPLATE_REQUEST = 'app/v2Containers/Templates/DELETE_TEMPLATE_REQUEST';
 export const DELETE_RCS_TEMPLATE_REQUEST = 'app/v2Containers/Templates/DELETE_RCS_TEMPLATE_REQUEST';
 export const DELETE_TEMPLATE_SUCCESS = 'app/v2Containers/Templates/DELETE_TEMPLATE_SUCCESS';

package/v2Containers/Templates/index.js

@@ -132,7 +132,7 @@ import { INAPP_LAYOUT_DETAILS, INAPP_MESSAGE_LAYOUT_TYPES, INAPP_MEDIA_TYPES, BI
 import { ZALO_STATUS_OPTIONS, ZALO_STATUSES } from '../Zalo/constants';
 import { getWhatsappContent, getWhatsappStatus, getWhatsappCategory, getWhatsappCta, getWhatsappQuickReply, getWhatsappAutoFill, getWhatsappCarouselButtonView } from '../Whatsapp/utils';
 import { getRCSContent } from '../Rcs/utils';
-import { RCS_STATUSES, HOST_INFOBIP } from '../Rcs/constants';
+import {RCS_STATUSES} from '../Rcs/constants';
 import zaloMessages from '../Zalo/messages';
 import rcsMessages from '../Rcs/messages';
 import inAppMessages from '../InApp/messages';
@@ -468,13 +468,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (this.props.location.query.type === 'embedded') {
       this.props.actions.resetAccount();
     }
-    // When using local templates (e.g. SMS fallback selector), do not fetch from API or we overwrite global store and break background RCS list
-    const useLocalTemplates = get(
-      this.props,
-      'localTemplatesConfig.useLocalTemplates',
-      get(this.props, 'useLocalTemplates', false),
-    );
-    if (!useLocalTemplates && ['line', VIBER_CHANNEL, FACEBOOK_CHANNEL, 'sms', 'email', 'ebill'].includes((this.state.channel || '').toLowerCase())) {
+    if (['line', VIBER_CHANNEL, FACEBOOK_CHANNEL, 'sms', 'email', 'ebill'].includes((this.state.channel || '').toLowerCase())) {
       const queryParams = {
         // name: this.state.searchText,
         // sortBy: this.state.sortBy,
@@ -987,16 +981,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
   componentWillUnmount() {
     window.removeEventListener("message", this.handleFrameTasks);
-    // When using local templates (e.g. SMS fallback selector), do not clear global store or background RCS list is wiped
-    const useLocalTemplates = get(
-      this.props,
-      'localTemplatesConfig.useLocalTemplates',
-      get(this.props, 'useLocalTemplates', false),
-    );
-    if (!useLocalTemplates) {
-      this.props.actions.resetTemplateStoreData();
-      this.props.globalActions.clearMetaEntities();
-    }
+    this.props.actions.resetTemplateStoreData();
+    this.props.globalActions.clearMetaEntities();
     // Clear any pending timeouts to prevent memory leaks
     if (this._clearEditTimeout) {
       clearTimeout(this._clearEditTimeout);
@@ -1781,20 +1767,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   }
 
   filterRcsTemplates = (templates) => {
-    const selectedRcsAccountName = this.props?.Templates?.selectedRcsAccount?.name || '';
-    const hostName = this.state?.hostName;
-    let nextTemplates = templates || [];
-    if (selectedRcsAccountName) {
-      nextTemplates = nextTemplates.filter(
-        (t) => get(t, 'versions.base.content.RCS.rcsContent.accountName', '') === selectedRcsAccountName
-      );
+    let { selectedRcsStatus } = this.state;
+    selectedRcsStatus = !this.props.isFullMode ? RCS_STATUSES.approved : '';
+    if (selectedRcsStatus) {
+      return templates?.filter((template) => template?.versions?.base?.content?.RCS?.rcsContent?.cardContent?.[0]?.Status === selectedRcsStatus);
     }
-    if (!this.props.isFullMode && hostName !== HOST_INFOBIP) {
-      return nextTemplates.filter(
-        (t) => get(t, 'versions.base.content.RCS.rcsContent.cardContent[0].Status', 'unavailable') === RCS_STATUSES.approved
-      );
-    }
-    return nextTemplates;
+    return templates;
   }
 
   filterZaloTemplates = (templates) => {
@@ -1969,7 +1947,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                 style={{ marginRight: "16px" }}
                 type="eye"
                 onClick={() => {
-                  if (!this.props.isFullMode || this.props.isDltFromRcs || this.props.isSmsFallbackFromRcs) {
+                  if (!this.props.isFullMode || this.props.isDltFromRcs) {
                     if (!get(template, "versions.base.content.zalo.previewUrl", "")) {
                       this.setState({ zaloPreviewItemId: template?._id });
                     }
@@ -2429,14 +2407,13 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           templateData.title = (
             <CapRow>
               <CapLabel className="whatsapp-rcs-template-name">{name}</CapLabel>
-              {this.state.hostName !== HOST_INFOBIP && <CapRow type="flex" align="middle" className="rcs-status-container zalo-status-color">
+              <CapRow type="flex" align="middle" className="rcs-status-container zalo-status-color">
                 <CapStatus
                   type={statusDisplay}
-                    text={statusDisplay && this.props.intl.formatMessage(rcsMessages?.[`${statusDisplay}_STATUS`])}
-                    labelType="label3"
-                  />
-                </CapRow>
-              }
+                  text={statusDisplay && this.props.intl.formatMessage(rcsMessages?.[`${statusDisplay}_STATUS`])}
+                  labelType="label3"
+                />
+              </CapRow>
             </CapRow>
           );
         
@@ -2960,7 +2937,6 @@ return (<div>
     let routeParams = {};
     const {fbAdManager} = this.props;
     const isLibraryMode = this.isEnabledInLibraryModule("callCreateFromProps");
-
     if (!isLibraryMode) {
       timeTracker.startTimer(CHANNEL_CREATE_TRACK_MAPPING[channel]);
     }
@@ -3306,13 +3282,6 @@ return (<div>
       this.setState({modeType});
     }
     const { _id: id } = template;
-    const {
-      localTemplatesConfig,
-      fbAdManager,
-      isDltFromRcs,
-      isSmsFallbackFromRcs,
-      onSelectTemplate,
-    } = this.props;
     const type = this.props.location.query.type;
     const module = this.props.location.query.module;
     const isLanguageSupport = (this.props.location.query.isLanguageSupport) ? this.props.location.query.isLanguageSupport : false;
@@ -3398,12 +3367,10 @@ return (<div>
     }
     if (this.isEnabledInLibraryModule("callSelectFromProps")) {
       let data = id;
-      if (localTemplatesConfig?.useLocalTemplates) {
-        data = template;
-      } else if (fbAdManager || isDltFromRcs || isSmsFallbackFromRcs) {
+      if (this.props.fbAdManager || this.props.isDltFromRcs) {
         data = this.selectTemplate(id);
       }
-      onSelectTemplate(data, fbAdManager);
+      this.props.onSelectTemplate(data, this.props.fbAdManager);
     } else {
       timeTracker.startTimer(CHANNEL_EDIT_TRACK_MAPPING[this.state.channel.toLowerCase()]);
       if (this.state.channel.toLowerCase() === 'ebill') {
@@ -4219,14 +4186,9 @@ return (<div>
     const isWechatEmbedded = !this.props.isFullMode && channel.toUpperCase() === WECHAT;
     const channelLowerCase = (channel || '').toLowerCase();
     const isTraiDltFeature = this.checkDLTfeatureEnable();
+
     const createButton =
-      (
-        (
-          channelLowerCase === WHATSAPP_LOWERCASE
-          || channelLowerCase === RCS_LOWERCASE
-        )
-        && !this.props.isFullMode
-      )
+      ( (channelLowerCase === WHATSAPP_LOWERCASE || channelLowerCase === RCS_LOWERCASE) && !this.props.isFullMode )
       ? (
         <CapLink
           onClick={this.openCreativesFullMode}
@@ -4252,23 +4214,17 @@ return (<div>
     if (([WHATSAPP_LOWERCASE, ZALO_LOWERCASE, RCS_LOWERCASE].includes(this.state?.channel?.toLocaleLowerCase()) && isEmpty(this.state?.hostName))) {
       isfilterContentVisisble = false;
     }
-
-    const useLocalTemplates = this.props.localTemplatesConfig?.useLocalTemplates;
-    const builtFilterContent = ((isfilterContentVisisble || [WECHAT, MOBILE_PUSH, INAPP].includes(this.state.channel.toUpperCase())) && (
-      <div className="action-container">
-        <div className="action-container__toolbar-row">
-          {isfilterContentVisisble ? (
-            <CapInput.Search
-              className="search-text"
-              placeholder={this.props.intl.formatMessage(messages.searchText)}
-              value={this.state.searchText}
-              onChange={(e) => this.searchTemplate(e.target.value, this.state.channel)}
-              onSearch={() => this.searchTemplate(this.state.searchText, this.state.channel)}
-              onClear={() => this.searchTemplate('', this.state.channel)}
-              onScroll={(e) => e.stopPropagation()}
-              disabled={this.checkSearchDisabled()}
-            />
-          ) : null}
+    const filterContent = (( isfilterContentVisisble || [WECHAT, MOBILE_PUSH, INAPP].includes(this.state.channel.toUpperCase())) && <div className="action-container">
+      {isfilterContentVisisble && <CapInput.Search
+        className="search-text"
+        style={{width: '210px'}}
+        placeholder={this.props.intl.formatMessage(messages.searchText)}
+        value={this.state.searchText}
+        onChange={(e) => this.searchTemplate(e.target.value, this.state.channel)}
+        disabled={this.checkSearchDisabled()}
+        onClear={() => this.searchTemplate('', this.state.channel)}
+        onScroll={(e) => e.stopPropagation()}
+      />}
       {
         channel.toUpperCase() === WECHAT && <CapRadio.CapRadioGroup className="wechat-filters" defaultValue={wechatFilter} onChange={this.setWechatFilter}>
           <CapRadio.Button value={WECHAT_FILTERS.ALL}><CapLabel type="label2">
@@ -4414,27 +4370,20 @@ return (<div>
           </div>
         )
       }
-        </div>
-        <div>
-          <div className="action-container__create-row">
-            {
-              this.state?.channel?.toLowerCase() === WHATSAPP_LOWERCASE && (isWhatsappCountExeeded) ? (
-                <CapTooltip title={whatsappCountExceedText}>
-                  <div className="button-disabled-tooltip-wrapper">
-                    {createButton}
-                  </div>
-                </CapTooltip>
-              )
-                : isfilterContentVisisble && !isWechatEmbedded && !this.props.isDltFromRcs && !this.props.isSmsFallbackFromRcs && createButton
-            }
-          </div>
-        </div>
+      <div style={{display: "flex", justifyContent: "space-between", alignItems: 'center'}}>
+        {
+          this.state?.channel?.toLowerCase() === WHATSAPP_LOWERCASE && (isWhatsappCountExeeded)? (
+            <CapTooltip title={whatsappCountExceedText}>
+              <div className="button-disabled-tooltip-wrapper">
+                {createButton}
+              </div>
+            </CapTooltip>
+          )
+            : isfilterContentVisisble && !isWechatEmbedded && !this.props.isDltFromRcs && createButton
+        }
       </div>
-    ));
-    const localTemplatesFilterContent = get(this.props, 'localTemplatesConfig.localTemplatesFilterContent', null);
-    const filterContent = (useLocalTemplates && localTemplatesFilterContent) != null
-      ? localTemplatesFilterContent
-      : builtFilterContent;
+
+    </div>);
     let htmlPreviewContent = "";
     if (this.state.channel.toLowerCase() === 'ebill') {
       htmlPreviewContent = this.state.previewTemplate && this.state.previewTemplate.versions && this.state.previewTemplate.versions.base && this.state.previewTemplate.versions.base['ebill-editor'];
@@ -4444,10 +4393,7 @@ return (<div>
 
 
     const creativesParams = this.getCreativesParams();
-    const templates = useLocalTemplates
-      ? (this.props.localTemplatesConfig?.localTemplates || [])
-      : (this.props.TemplatesList || []);
-    const isLoadingWhenLocal = useLocalTemplates && !!this.props.localTemplatesConfig?.localTemplatesLoading;
+    const templates = this.props.TemplatesList || [];
     const {route} = this.props;
     const loadingTipMap = {
       sendingFile: 'uploadingFile',
@@ -4462,11 +4408,9 @@ return (<div>
         (deleteRcsTemplateInProgress && 'deletingTemplate') ||
         (this.props.EmailCreate.duplicateTemplateInProgress && 'duplicatingTemplate');
 
-    const loadingTip = useLocalTemplates && this.props.localTemplatesConfig?.localTemplatesLoadingTip
-      ? this.props.localTemplatesConfig.localTemplatesLoadingTip
-      : (messages[loadingTipIntl] ? this.props.intl.formatMessage(messages[loadingTipIntl]) : this.props.intl.formatMessage(messages.gettingAllTemplates));
+    const loadingTip = messages[loadingTipIntl] ? this.props.intl.formatMessage(messages[loadingTipIntl]) : this.props.intl.formatMessage(messages.gettingAllTemplates);
     const showNoTemplatesFoundZalo = this.state.channel.toUpperCase() === ZALO && isEmpty(this.state.searchedZaloTemplates) && this.state.searchingZaloTemplate;
-    const showNoTemplatesFoundOther = ![ZALO].includes(this.state.channel.toUpperCase()) && isEmpty(templates) && (useLocalTemplates ? !isLoadingWhenLocal : !this.props.Templates.getAllTemplatesInProgress) && (useLocalTemplates || !isEmpty(this.state.searchText));
+    const showNoTemplatesFoundOther = ![ZALO].includes(this.state.channel.toUpperCase()) && isEmpty(this.props.TemplatesList) && !this.props.Templates.getAllTemplatesInProgress && !isEmpty(this.state.searchText);
     const showNoTemplatesFound = showNoTemplatesFoundZalo || showNoTemplatesFoundOther;
 
     return (
@@ -4498,7 +4442,7 @@ return (<div>
             />
           ) : null}
           
-          {channel.toLowerCase() === RCS_LOWERCASE && !isFullMode && this.state?.hostName !== HOST_INFOBIP ? (
+          {channel.toLowerCase() === RCS_LOWERCASE && !isFullMode ? (
             <CapInfoNote
               message={formatMessage(messages.rcsOnlyApprovedTemplates)}
             />
@@ -4511,22 +4455,22 @@ return (<div>
           ) : null}
           <CapRow>
             <Pagination
-              templateInProgress={useLocalTemplates ? isLoadingWhenLocal : this.props.Templates.getAllTemplatesInProgress}
+              templateInProgress={
+                this.props.Templates.getAllTemplatesInProgress
+              }
               onPageChange={
-                templates.length
-                  ? (useLocalTemplates ? (this.props.localTemplatesConfig?.localTemplatesOnPageChange || (() => {})) : this.onPaginationChange)
-                  : () => {}
+                templates.length ? this.onPaginationChange : () => {}
               }
             >
               {this.getTemplateDataForGrid({
                 previewTemplateId: this.state.zaloPreviewItemId,
-                isLoading: useLocalTemplates ? isLoadingWhenLocal : isLoading,
-                isInitialLoading: useLocalTemplates ? isLoadingWhenLocal && templates.length === 0 : isInitialLoading,
+                isLoading,
+                isInitialLoading,
                 loadingTip,
                 channel: this.state.channel,
                 templates: this.state.searchingZaloTemplate
                   ? this.state.searchedZaloTemplates
-                  : templates,
+                  : this.props.TemplatesList,
                 filterContent,
                 handlers: {
                   handlePreviewClick: this.handlePreviewClick,
@@ -4709,15 +4653,6 @@ Templates.propTypes = {
   WebPush: PropTypes.object,
   smsRegister: PropTypes.any,
   isDltFromRcs: PropTypes.bool,
-  isSmsFallbackFromRcs: PropTypes.bool,
-  localTemplatesConfig: PropTypes.shape({
-    useLocalTemplates: PropTypes.bool,
-    localTemplates: PropTypes.arrayOf(PropTypes.object),
-    localTemplatesLoading: PropTypes.bool,
-    localTemplatesLoadingTip: PropTypes.string,
-    localTemplatesFilterContent: PropTypes.node,
-    localTemplatesOnPageChange: PropTypes.func,
-  }),
 };
 
 const mapStateToProps = createStructuredSelector({