@capillarytech/creatives-library 1.0.1-alpha.0 → 1.0.2

package/components/molecules/CreateTracker/CreateTracker.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { intlShape, FormattedMessage, injectIntl } from 'react-intl';
 import { compose, bindActionCreators } from 'redux';
@@ -27,12 +27,9 @@ import {
 } from '@capillarytech/cap-ui-library/styled/variables';
 import CapSpin from '@capillarytech/cap-ui-library/CapSpin';
 import moment from 'moment';
-import CapIcon from '@capillarytech/cap-ui-library/CapIcon';
-import CapError from '@capillarytech/cap-ui-library/CapError';
-import CapTag from '@capillarytech/cap-ui-library/CapTag';
+import { CapIcon } from '@capillarytech/cap-ui-library';
 import isEmpty from 'lodash/isEmpty';
 import withErrorBoundary from 'utils/withErrorBoundary';
-import CapInfoNote from '@capillarytech/cap-ui-library/CapInfoNote';
 import injectSaga from '../../../utils/injectSaga';
 import injectReducer from '../../../utils/injectReducer';
 import messages from './messages';
@@ -45,10 +42,7 @@ import {
 import saga from './saga';
 import reducer from './reducer';
 import globalMessages from '../../pages/Cap/messages';
-import {
-  makeSelectAlternateCurrencyFlagStatus,
-  makeSelectCap,
-} from '../../pages/Cap/selectors';
+import { makeSelectCap } from '../../pages/Cap/selectors';
 import styles from './style';
 import * as appConstants from '../../pages/App/constants';
 import { formatMessageHandler, sorter } from '../../../utils/commonUtils';
@@ -56,20 +50,12 @@ import NumberInput from '../NumberInput';
 import { gtmPush } from '../../../utils/gtmTrackers';
 import SelectApiWrapper from '../SelectApiWrapper';
 import SelectOptionLabelWithInfo from '../../atoms/SelectOptionLabelWithInfo';
-import {
-  makeSelectAlternateCurrencyList,
-  makeSelectTrackers,
-} from '../../pages/ProgramSummary/selectors';
-import { ALTERNATE_CURRENCIES } from './constants';
-import StatusColor from '../../atoms/StatusColor/StatusColor';
-import { getAlternateCurrencyStatus } from '../../organisms/AlternateCurrencyList/utils';
 
 const {
   WINDOW_TYPE_MAP,
   WINDOW_TYPE_TOOLTIP_MAP,
   POSSIBLE_OPERATION_MAP,
   POSSIBLE_OPERATORS_MAP,
-  POSSIBLE_OPERATORS_DESC_MAP,
   TRACKER_TYPE_MAP,
   OP_BETWEEN,
   TIER_CHANGE_WINDOW,
@@ -83,8 +69,6 @@ const {
   POSITIVE_DECIMALS,
   EDIT,
   FAILURE,
-  LOCALE_DATE_FORMAT,
-  DATE_DISPLAY_FORMAT,
 } = appConstants;
 
 export const CreateTracker = props => {
@@ -104,25 +88,7 @@ export const CreateTracker = props => {
     capActions,
     actionMode,
     makeSelectCapData: { currentOrgDetails = {} } = {},
-    trackersData: { trackersDetails = [] } = {},
-    alternateCurrencyFlag: {
-      alternateCurrencyStatus: {
-        value: alternateCurrencyFlagValue = false,
-      } = {},
-    } = {},
-    alternateCurrencyList: { alternateCurrencyListData = [] } = {},
   } = props;
-  const trackerDetailsObj = useMemo(
-    () => {
-      const trackerDetailsObj = {};
-      trackersDetails.forEach(
-        tracker =>
-          (trackerDetailsObj[tracker?.name?.trim()?.toLowerCase()] = tracker),
-      );
-      return trackerDetailsObj;
-    },
-    [trackersDetails.length],
-  );
 
   const strategyId = currentTracker.id || -1;
   const [trackerName, setTrackerName] = useState();
@@ -132,21 +98,6 @@ export const CreateTracker = props => {
   const [trackerActiveDate, setTrackerActiveDate] = useState(moment());
   const [trackerPointType, setTrackerPointType] = useState();
   const [trackerExtendedField, setTrackerExtendedField] = useState();
-  const [trackerNameExistsError, setTrackerNameExistsError] = useState(false);
-  const [isTrackerWarning, setIsTrackerWarning] = useState({
-    isTrackerNameWarning: false,
-    isTrackerCaseNameWarning: [],
-  });
-
-  const getManipulatedPeriod = (trackerMode, period, trackingPeriodType) => {
-    if (
-      trackerMode === CALENDAR_BASED_CYCLIC_WINDOW &&
-      trackingPeriodType === 0
-    ) {
-      return Number((period / 30).toFixed(2));
-    }
-    return period;
-  };
 
   useEffect(
     () => {
@@ -177,14 +128,10 @@ export const CreateTracker = props => {
           },
           rank,
         } = condition;
-
         return {
           id,
           name,
-          period:
-            period === -1
-              ? ''
-              : getManipulatedPeriod(tracker_mode, period, trackingPeriodType),
+          period: period === -1 ? '' : period,
           tracking_period_type: trackingPeriodType,
           aggrFunc,
           operator,
@@ -210,6 +157,7 @@ export const CreateTracker = props => {
     },
     [JSON.stringify(currentTracker)],
   );
+
   const clearState = () => {
     setTrackerPointType();
     setTrackerName();
@@ -223,15 +171,6 @@ export const CreateTracker = props => {
   useEffect(
     () => {
       getExtendedFields();
-      //reset tracker operator to sum if tracker type is points or alternate currency
-      if (trackerType === POINTS || checkIfAlternateCurrency) {
-        setTrackerConditions(prev =>
-          prev.map(condition => ({
-            ...condition,
-            aggrFunc: 'SUM',
-          })),
-        );
-      }
     },
     [trackerType],
   );
@@ -296,8 +235,6 @@ export const CreateTracker = props => {
     value: windowType,
     key: `mode${index}`,
   }));
-  const checkIfAlternateCurrency =
-    trackerType && trackerType.indexOf(ALTERNATE_CURRENCIES) !== -1; //moved to top for initialization error
 
   const operationList = Object.keys(POSSIBLE_OPERATION_MAP).map(
     (operation, index) => ({
@@ -308,27 +245,15 @@ export const CreateTracker = props => {
       ),
       value: operation,
       key: `operation${index}`,
-      disabled:
-        (trackerType === POINTS || checkIfAlternateCurrency) &&
-        operation === 'COUNT',
     }),
   );
 
   const operatorList = Object.keys(POSSIBLE_OPERATORS_MAP).map(
     (operator, index) => ({
-      label: (
-        <SelectOptionLabelWithInfo
-          title={formatMessageHandler(
-            formatMessage,
-            globalMessages[POSSIBLE_OPERATORS_MAP[operator]],
-            operator,
-          )}
-          tooltipText={formatMessageHandler(
-            formatMessage,
-            globalMessages[POSSIBLE_OPERATORS_DESC_MAP[operator]],
-            operator,
-          )}
-        />
+      label: formatMessageHandler(
+        formatMessage,
+        globalMessages[POSSIBLE_OPERATORS_MAP[operator]],
+        operator,
       ),
       value: operator,
       key: `operator${index}`,
@@ -345,129 +270,17 @@ export const CreateTracker = props => {
     key: `point${index}`,
   }));
 
-  const getTrackerItemList = () => {
-    const staticTrackedItemList = Object.keys(TRACKER_TYPE_MAP).map(
-      (trackerType, index) => ({
-        label: (
-          <SelectOptionLabelWithInfo
-            title={formatMessageHandler(
-              formatMessage,
-              globalMessages[TRACKER_TYPE_MAP[trackerType]],
-              trackerType,
-            )}
-            tooltipText={formatMessage(
-              messages[`${TRACKER_TYPE_MAP[trackerType]}Info`],
-            )}
-          />
-        ),
-        value: `${trackerType}`,
-        key: `itemList${index}`,
-      }),
-    );
-    let dynamicTrackedItemList = [];
-    if (alternateCurrencyFlagValue && alternateCurrencyListData.length) {
-      dynamicTrackedItemList = alternateCurrencyListData.map(
-        (currentCurrencyData, index) => {
-          const {
-            startDate,
-            endDate,
-            name,
-            isActive: active,
-            identifier,
-            metaData: { description } = {},
-          } = currentCurrencyData;
-          const startedOn = moment(parseInt(startDate, 10)).format(
-            DATE_DISPLAY_FORMAT,
-          );
-          const endedOn = moment(parseInt(endDate, 10)).format(
-            DATE_DISPLAY_FORMAT,
-          );
-          const { statusType, intlMessageId } = getAlternateCurrencyStatus(
-            startDate,
-            endDate,
-            name,
-          );
-          return {
-            label: (
-              <SelectOptionLabelWithInfo
-                title={name}
-                tooltipText={
-                  <CapRow className={className}>
-                    <CapRow classname="tracker-currency-header-details">
-                      <CapRow type="flex" align="middle">
-                        <CapLabel
-                          type="label6"
-                          className="alternate-status-label"
-                        >
-                          {formatMessage(globalMessages.status)}
-                        </CapLabel>
-                        <StatusColor
-                          className="alternate-status-label"
-                          colorType={statusType}
-                        />
-                        {globalMessages[intlMessageId] && (
-                          <CapLabel.CapLabelInline
-                            type="label10"
-                            className="alternate-status-label"
-                          >
-                            {formatMessage(globalMessages[intlMessageId])}
-                          </CapLabel.CapLabelInline>
-                        )}
-                        <CapTag className="active-tag-value">
-                          {active
-                            ? formatMessage(globalMessages.active)
-                            : formatMessage(globalMessages.inactive)}
-                        </CapTag>
-                        <CapColumn className="filters-vertical-divider" />
-                      </CapRow>
-                      <CapRow type="flex" align="middle">
-                        <CapLabel
-                          type="label6"
-                          className="alternate-status-label"
-                        >
-                          {formatMessage(globalMessages.duration)}
-                        </CapLabel>
-                        <CapLabel type="label10" className="enrolment-duration">
-                          {moment(endDate).year() > 3000
-                            ? formatMessage(
-                                globalMessages.inceptionNeverExpires,
-                              )
-                            : `${startedOn} - ${endedOn}`}
-                        </CapLabel>
-                      </CapRow>
-                      <CapRow type="flex" align="middle">
-                        <CapLabel
-                          type="label6"
-                          className="alternate-duration-label"
-                        >
-                          {formatMessage(globalMessages.description)}
-                        </CapLabel>
-                        <CapLabel
-                          type="label10"
-                          className="enrolment-description"
-                        >
-                          {description}
-                        </CapLabel>
-                      </CapRow>
-                    </CapRow>
-                  </CapRow>
-                }
-                tooltipPlacement="right"
-              />
-            ),
-            value: `${ALTERNATE_CURRENCIES}_${identifier}`,
-            key: `alternateCurrencyList${index}`,
-          };
-        },
-      );
-    }
-
-    const trackedItemList = [
-      ...staticTrackedItemList,
-      ...dynamicTrackedItemList,
-    ];
-    return trackedItemList;
-  };
+  const trackedItemList = Object.keys(TRACKER_TYPE_MAP).map(
+    (trackerType, index) => ({
+      label: formatMessageHandler(
+        formatMessage,
+        globalMessages[TRACKER_TYPE_MAP[trackerType]],
+        trackerType,
+      ),
+      value: `${trackerType}`,
+      key: `itemList${index}`,
+    }),
+  );
 
   const handleAddNewCondition = index => {
     setTrackerConditions([
@@ -490,45 +303,6 @@ export const CreateTracker = props => {
     ]);
   };
 
-  const checkTrackerNameExists = () => {
-    if (trackerDetailsObj[trackerName?.trim()?.toLowerCase()])
-      setTrackerNameExistsError(true);
-    else setTrackerNameExistsError(false);
-  };
-
-  const validateTrackerName = () => {
-    if (
-      !strategyId ||
-      (strategyId && trackerName?.trim() !== currentTracker?.name?.trim())
-    )
-      checkTrackerNameExists();
-    setIsTrackerWarning(prevState => ({
-      ...prevState,
-      isTrackerNameWarning: false,
-    }));
-  };
-
-  const enableTrackerWarning = () => {
-    setIsTrackerWarning(prevState => ({
-      ...prevState,
-      isTrackerNameWarning: true,
-    }));
-  };
-
-  const toggleTrackerCaseNameWarning = (index, warningNote) => {
-    return () => {
-      if (currentTracker?.conditions?.[index]?.name) {
-        setIsTrackerWarning(prevState => {
-          const updatedWarnings = [...prevState.isTrackerCaseNameWarning];
-          updatedWarnings[index] = warningNote === appConstants.ENABLE;
-          return {
-            ...prevState,
-            isTrackerCaseNameWarning: updatedWarnings,
-          };
-        });
-      }
-    };
-  };
   const conditionHandler = e => {
     const index = e.target.id.split('_')[0];
     const operation = e.target.id.split('_')[1];
@@ -609,22 +383,18 @@ export const CreateTracker = props => {
       setTrackerConditions(trackerConditionsClonned);
     };
 
-    const previewText = `${formatMessage(globalMessages.case)} ${
-      name ? name : `<${formatMessage(globalMessages.caseName)}>`
+    const previewText = `${formatMessage(messages.case)} ${
+      name ? name : `<${formatMessage(messages.caseName)}>`
     } ${formatMessage(messages.activationText)} ${aggrFunc} ${
       trackerMode !== TIER_CHANGE_WINDOW ? formatMessage(messages.inThe) : ''
     } ${
       period
         ? period
         : trackerMode !== TIER_CHANGE_WINDOW
-          ? `<${formatMessage(globalMessages.period)}>`
+          ? `<${formatMessage(messages.period)}>`
           : ''
     } ${
-      trackerMode !== TIER_CHANGE_WINDOW
-        ? trackerMode === CALENDAR_BASED_CYCLIC_WINDOW
-          ? formatMessage(globalMessages.months)
-          : formatMessage(globalMessages.days)
-        : ''
+      trackerMode !== TIER_CHANGE_WINDOW ? formatMessage(messages.days) : ''
     } ${
       trackerMode !== TIER_CHANGE_WINDOW ? formatMessage(messages.window) : ''
     } ${formatMessageHandler(
@@ -653,48 +423,27 @@ export const CreateTracker = props => {
               <CapInput
                 id={`${index}_nameChange`}
                 labelPosition="top"
-                label={formatMessage(globalMessages.caseName)}
+                label={formatMessage(messages.caseName)}
                 placeholder={formatMessage(messages.nameDesc)}
                 value={name}
                 onChange={conditionHandler}
-                onFocus={toggleTrackerCaseNameWarning(
-                  index,
-                  appConstants.ENABLE,
-                )}
-                onBlur={toggleTrackerCaseNameWarning(
-                  index,
-                  appConstants.DISABLE,
-                )}
               />
-              {isTrackerWarning.isTrackerCaseNameWarning?.[index] &&
-                actionMode === EDIT && (
-                  <WarningMessage name={appConstants.CASE_NAME_LOWERCASE} />
-                )}
             </CapColumn>
             {trackerMode !== TIER_CHANGE_WINDOW && (
               <>
-                <CapColumn span={7} offset={1}>
+                <CapColumn span={6} offset={1}>
                   <NumberInput
                     id={`${index}_periodChange`}
                     labelPosition="top"
                     label={formatMessage(messages.trackFor)}
-                    placeholder={formatMessage(globalMessages.enterPeriod)}
+                    placeholder={formatMessage(messages.trackDesc)}
                     value={period}
                     onChange={conditionHandler}
-                    data-testid="tracker-period-input"
-                    type={POSITIVE_DECIMALS}
-                    className={!Number.isInteger(+period) ? 'input-error' : ''}
-                    errorMessage={
-                      !Number.isInteger(+period) &&
-                      formatMessage(messages.decimalErrorMessage)
-                    }
                   />
                 </CapColumn>
-                <CapColumn span={5} offset={1}>
+                <CapColumn span={6} offset={1}>
                   <CapLabel className="days-label">
-                    {trackerMode === CALENDAR_BASED_CYCLIC_WINDOW
-                      ? formatMessage(globalMessages.months)
-                      : formatMessage(globalMessages.days)}
+                    {formatMessage(messages.days)}
                   </CapLabel>
                 </CapColumn>
               </>
@@ -708,7 +457,6 @@ export const CreateTracker = props => {
             </CapRow>
             <CapColumn span={4}>
               <CapSelect
-                data-testid="tracker-condition-type"
                 style={{ width: '100%' }}
                 options={operationList}
                 labelPosition="top"
@@ -721,9 +469,8 @@ export const CreateTracker = props => {
                 {formatMessage(globalMessages.is)}
               </CapHeading>
             </CapColumn>
-            <CapColumn span={8}>
+            <CapColumn span={6}>
               <CapSelect
-                data-testid="tracker-condition-operator"
                 style={{ width: '100%' }}
                 options={operatorList}
                 labelPosition="top"
@@ -734,7 +481,7 @@ export const CreateTracker = props => {
             <CapColumn span={4} offset={1}>
               <NumberInput
                 id={`${index}_threshold1Change`}
-                placeholder={formatMessage(globalMessages.value)}
+                placeholder={formatMessage(messages.value)}
                 value={threashold1}
                 onChange={conditionHandler}
                 type={POSITIVE_DECIMALS}
@@ -750,7 +497,7 @@ export const CreateTracker = props => {
                 <CapColumn span={4} offset={1}>
                   <NumberInput
                     id={`${index}_threshold2Change`}
-                    placeholder={formatMessage(globalMessages.value)}
+                    placeholder={formatMessage(messages.value)}
                     value={threashold2}
                     onChange={conditionHandler}
                     type={POSITIVE_DECIMALS}
@@ -759,16 +506,6 @@ export const CreateTracker = props => {
               </>
             )}
           </CapRow>
-          {(trackerType === POINTS || checkIfAlternateCurrency) && (
-            <CapInfoNote
-              className="sum-supported-info-note"
-              message={
-                <CapLabel type="label2">
-                  {formatMessage(messages.sumSupportedPointsAndACTracker)}
-                </CapLabel>
-              }
-            />
-          )}
           <CapRow className="create-tracker-content-row">
             <CapColumn span={14}>
               <CapCheckbox
@@ -784,7 +521,7 @@ export const CreateTracker = props => {
               <CapColumn offset={1} span={4}>
                 <NumberInput
                   id={`${index}_maxTimesSuccessSignalChange`}
-                  placeholder={formatMessage(globalMessages.value)}
+                  placeholder={formatMessage(messages.value)}
                   value={max_time_success_signals}
                   onChange={conditionHandler}
                 />
@@ -798,17 +535,13 @@ export const CreateTracker = props => {
               strategyId &&
               strategyId === -1 && (
                 <CapColumn span={2} offset={20}>
-                  <CapIcon
-                    type="close"
-                    data-testid="create-tracker-close"
-                    onClick={handleRemoveCondition}
-                  />
+                  <CapIcon type="close" onClick={handleRemoveCondition} />
                 </CapColumn>
               )}
           </CapRow>
           <CapRow>
             <CapHeading type="h5" className="preview-text">
-              {formatMessage(globalMessages.preview)}
+              {formatMessage(messages.preview)}
             </CapHeading>
           </CapRow>
           <CapRow className="create-tracker-content-row">
@@ -835,10 +568,7 @@ export const CreateTracker = props => {
     </CapColumn>
   );
 
-  const handleTrackerNameChange = e => {
-    setTrackerNameExistsError(false);
-    setTrackerName(e.target.value);
-  };
+  const handleTrackerNameChange = e => setTrackerName(e.target.value);
 
   const handleTrackerTypeChange = value => {
     setTrackerType(value);
@@ -863,119 +593,28 @@ export const CreateTracker = props => {
 
   const onExtendedFieldRefreshClick = () => getExtendedFields();
 
-  const getAlternateCurrencyDataFromIdentifier = () => {
-    const alternateCurrencyId = trackerType?.split('_')[2];
-    const { propertyValues: { points_category_id } = {} } = currentTracker;
-    const alternateCurrencyData = alternateCurrencyListData?.find(
-      currency =>
-        currency.identifier === alternateCurrencyId ||
-        currency?.alternateCategoryPointCategory?.[0]?.categoryId ===
-          points_category_id,
-    );
-    return alternateCurrencyData;
-  };
-
-  const getPointsMessage = defaultMessage => {
-    if (checkIfAlternateCurrency) {
-      return formatMessage(messages.alternateCurrencyPointTypes, {
-        name: getAlternateCurrencyDataFromIdentifier()?.name || defaultMessage,
-      });
-    }
-    return defaultMessage;
-  };
-
-  const getPointsLabelMessage = defaultMessage => {
-    if (checkIfAlternateCurrency) {
-      return formatMessage(messages.alternateCurrencyPointsTypesDesc, {
-        name: getAlternateCurrencyDataFromIdentifier()?.name || defaultMessage,
-      });
-    }
-    return defaultMessage;
-  };
-
-  const getAlternatePointId = () => {
-    const alternateCurrencyData = getAlternateCurrencyDataFromIdentifier();
-    return alternateCurrencyData?.alternateCategoryPointCategory?.[0]
-      ?.categoryId;
-  };
-
-  const getAlternateTrackerName = () => {
-    const alternateCurrencyData = getAlternateCurrencyDataFromIdentifier();
-    return alternateCurrencyData?.name || trackerType;
-  };
-
-  const WarningMessage = ({ name }) => {
-    return (
-      <CapRow>
-        <CapAlert
-          className="tracker-warning-container"
-          message={
-            <CapRow type="flex" className="tracker-flex">
-              <CapRow>
-                <CapIcon type="warning" />
-              </CapRow>
-              <CapRow className="tracker-warning-text-container">
-                <CapLabel type="label31">
-                  {formatMessage(messages.trackerNameWarning, {
-                    name: name,
-                  })}
-                </CapLabel>
-              </CapRow>
-            </CapRow>
-          }
-          type="warning"
-        />
-      </CapRow>
-    );
-  };
-
   const getSlideBoxContent = (
     <CapSpin spinning={spin}>
       <CapRow className="create-tracker-content-row">
-        <CapRow className="trackers-note">
-          <CapAlert
-            className="trackers-note-desc"
-            message={formatMessage(messages.trackersNote)}
-            type="warning"
-          />
-        </CapRow>
         <CapColumn span={8}>
           <CapInput
             labelPosition="top"
-            label={formatMessage(globalMessages.name)}
+            label={formatMessage(messages.name)}
             inductiveText={formatMessage(messages.nameDesc)}
             placeholder={formatMessage(messages.nameDesc)}
             value={trackerName}
             onChange={handleTrackerNameChange}
-            onBlur={validateTrackerName}
-            onFocus={enableTrackerWarning}
-            error={trackerNameExistsError}
-            errorMessage={
-              trackerNameExistsError
-                ? formatMessage(messages.trackerNameExistsError)
-                : ''
-            }
-            className={trackerNameExistsError ? 'error-border' : ''}
           />
-          {isTrackerWarning?.isTrackerNameWarning &&
-            actionMode === EDIT && (
-              <WarningMessage name={appConstants.NAME_LOWERCASE} />
-            )}
         </CapColumn>
         <CapColumn span={8} offset={2}>
           <CapSelect
-            data-testid="create-tracker-select-entity"
             style={{ width: '100%' }}
-            options={getTrackerItemList()}
+            options={trackedItemList}
             label={formatMessage(messages.trackedItem)}
             inductiveText={formatMessage(messages.trackedItemDesc)}
             placeholder={formatMessage(messages.trackedItemPlaceholder)}
             labelPosition="top"
-            value={
-              checkIfAlternateCurrency && actionMode === EDIT
-                ? getAlternateTrackerName()
-                : trackerType
-            }
+            value={trackerType}
             onChange={handleTrackerTypeChange}
             disabled={actionMode === EDIT}
           />
@@ -985,7 +624,6 @@ export const CreateTracker = props => {
         <CapColumn span={8}>
           <CapTooltip title={formatMessage(messages.trackingMethodTooltip)}>
             <CapSelect
-              data-testid="create-tracking-method-select"
               style={{ width: '100%' }}
               options={modesList}
               label={formatMessage(messages.trackingMethod)}
@@ -997,19 +635,14 @@ export const CreateTracker = props => {
             />
           </CapTooltip>
         </CapColumn>
-        {(trackerType === POINTS || checkIfAlternateCurrency) && (
+        {trackerType === POINTS && (
           <CapColumn span={8} offset={2}>
             <CapSelect
-              data-testid="tracker-point-types"
               style={{ width: '100%' }}
               options={pointTypesList}
-              label={getPointsMessage(formatMessage(messages.pointTypes))}
-              inductiveText={getPointsLabelMessage(
-                formatMessage(messages.pointTypesDesc),
-              )}
-              placeholder={getPointsLabelMessage(
-                formatMessage(messages.pointTypesDesc),
-              )}
+              label={formatMessage(messages.pointTypes)}
+              inductiveText={formatMessage(messages.pointTypes)}
+              placeholder={formatMessage(messages.pointTypesPlaceholder)}
               labelPosition="top"
               value={trackerPointType}
               onChange={handleTrackerPointTypeChange}
@@ -1028,7 +661,6 @@ export const CreateTracker = props => {
               inductiveText={formatMessage(messages.extendedFieldDesc)}
             >
               <CapSelect
-                data-testid="tracker-extended-field"
                 style={{ width: '100%' }}
                 options={extendedFieldsList}
                 placeholder={formatMessage(messages.extendedFieldPlaceholder)}
@@ -1044,9 +676,7 @@ export const CreateTracker = props => {
         {trackerMode === CALENDAR_BASED_CYCLIC_WINDOW && (
           <CapColumn span={8}>
             <CapDatePicker
-              data-testid="tracker-start-date"
               onChange={handleTrackerActiveDateChange}
-              format={LOCALE_DATE_FORMAT}
               style={{
                 width: '100%',
                 border: `1px solid ${CAP_G06}`,
@@ -1059,6 +689,14 @@ export const CreateTracker = props => {
           </CapColumn>
         )}
       </CapRow>
+      <CapRow className="create-tracker-content-row">
+        <CapColumn span={18}>
+          <CapAlert
+            message={formatMessage(messages.trackersNote)}
+            type="warning"
+          />
+        </CapColumn>
+      </CapRow>
       <CapRow className="create-tracker-content-row">
         <CapColumn span={12}>
           <CapHeading type="h5" style={{ fontWeight: 'bold' }}>
@@ -1079,13 +717,7 @@ export const CreateTracker = props => {
     const { basic_details: { name = '' } = {} } = currentOrgDetails;
     const finalConditions = trackerConditions.map(
       cond =>
-        trackerMode === TIER_CHANGE_WINDOW
-          ? { ...cond, period: -1 }
-          : {
-              ...cond,
-              tracking_period_type:
-                trackerMode === CALENDAR_BASED_CYCLIC_WINDOW ? 1 : 0,
-            },
+        trackerMode === TIER_CHANGE_WINDOW ? { ...cond, period: -1 } : cond,
     );
     const payload = {
       programId,
@@ -1097,13 +729,9 @@ export const CreateTracker = props => {
       conditions: finalConditions,
       orgName: name,
     };
-    if (trackerType === POINTS || checkIfAlternateCurrency) {
+    if (trackerType === POINTS) {
       payload.typeOfPoints = trackerPointType;
     }
-    if (checkIfAlternateCurrency) {
-      payload.entity = ALTERNATE_CURRENCIES;
-      payload.alternatePointCategoryId = getAlternatePointId();
-    }
     if (
       trackerType === BILL_EXTENDED_FIELD ||
       trackerType === LINEITEM_EXTENDED_FIELD
@@ -1122,38 +750,34 @@ export const CreateTracker = props => {
     clearState();
     toggleSlideboxState();
   };
-
   const handleSaveTracker = () => {
-    if (!trackerNameExistsError) {
-      const payload = prepareTrackerData();
-      actions.upsertTrackerStrategy(payload, result => {
-        if (result?.success) {
-          if (strategyId !== -1) {
-            CapNotification.success({
-              message: formatMessage(globalMessages.editedSuccessfully),
-            });
-          } else {
-            CapNotification.success({
-              message: formatMessage(globalMessages.createdSuccessfully),
-            });
-          }
-          const actionMode =
-            strategyId && strategyId !== -1 ? 'EDIT' : 'CREATE';
-          const trackerDetails = Object.assign(payload, {
-            programId: programId,
-            actionMode,
+    const payload = prepareTrackerData();
+    actions.upsertTrackerStrategy(payload, result => {
+      if (result?.success) {
+        if (strategyId !== -1) {
+          CapNotification.success({
+            message: formatMessage(globalMessages.editedSuccessfully),
           });
-          gtmPush('trackerDetails', trackerDetails);
-          refreshTrackersData();
-          clearAndToggleState();
-          capActions.checkReconfigureProgram(programId);
         } else {
-          CapNotification.error({
-            message: formatMessage(globalMessages.errorMessage),
+          CapNotification.success({
+            message: formatMessage(globalMessages.createdSuccessfully),
           });
         }
-      });
-    }
+        const actionMode = strategyId && strategyId !== -1 ? 'EDIT' : 'CREATE';
+        const trackerDetails = Object.assign(payload, {
+          programId: programId,
+          actionMode,
+        });
+        gtmPush('trackerDetails', trackerDetails);
+        refreshTrackersData();
+        clearAndToggleState();
+        capActions.checkReconfigureProgram(programId);
+      } else {
+        CapNotification.error({
+          message: formatMessage(globalMessages.errorMessage),
+        });
+      }
+    });
   };
 
   let isSaveDisabled = false;
@@ -1161,14 +785,12 @@ export const CreateTracker = props => {
     isEmpty(trackerName) ||
     isEmpty(trackerType) ||
     isEmpty(trackerMode) ||
-    ((trackerType === POINTS || checkIfAlternateCurrency) &&
-      isEmpty(trackerPointType)) ||
+    (trackerType === POINTS && isEmpty(trackerPointType)) ||
     ((trackerType === BILL_EXTENDED_FIELD ||
       trackerType === LINEITEM_EXTENDED_FIELD) &&
       isEmpty(trackerExtendedField)) ||
     (trackerMode === CALENDAR_BASED_CYCLIC_WINDOW &&
-      isEmpty(moment(trackerActiveDate).format(DATE_FORMAT))) ||
-    trackerNameExistsError
+      isEmpty(moment(trackerActiveDate).format(DATE_FORMAT)))
   ) {
     isSaveDisabled = true;
   }
@@ -1193,31 +815,15 @@ export const CreateTracker = props => {
       isSaveDisabled = true;
     }
   });
-  const trackerPeriodInDecimalError = useMemo(
-    () => trackerConditions.some(cond => !Number.isInteger(+cond.period)),
-    [trackerConditions],
-  );
   const getSlideBoxFooter = (
-    <CapTooltip
-      placement="topLeft"
-      title={
-        trackerPeriodInDecimalError
-          ? formatMessage(messages.requiredTootipText)
-          : ''
-      }
+    <CapButton
+      onClick={handleSaveTracker}
+      disabled={isSaveDisabled || spin}
+      id="loyalty-add-edit-tracker-button"
+      className="lp-btn-config-trackers"
     >
-      <span className="button-disabled-tooltip-wrapper">
-        <CapButton
-          onClick={handleSaveTracker}
-          disabled={isSaveDisabled || spin || trackerPeriodInDecimalError}
-          id="loyalty-add-edit-tracker-button"
-          className="lp-btn-config-trackers"
-          tooltipText
-        >
-          <FormattedMessage {...globalMessages.save} />
-        </CapButton>
-      </span>
-    </CapTooltip>
+      <FormattedMessage {...messages.saveAndContinue} />
+    </CapButton>
   );
 
   const getSlideBoxHeader = (
@@ -1228,7 +834,7 @@ export const CreateTracker = props => {
         <CapHeading type="h1">
           {currentTracker?.id
             ? formatMessage(messages.editTracker)
-            : formatMessage(globalMessages.addTracker)}
+            : formatMessage(messages.addTracker)}
         </CapHeading>
       }
       description={
@@ -1273,9 +879,6 @@ const mapStateToProps = createStructuredSelector({
   extendedFieldsData: makeSelectExtendedFields(),
   upsertTrackerStrategy: makeSelectUpsertTrackersStrategy(),
   makeSelectCapData: makeSelectCap(),
-  trackersData: makeSelectTrackers(),
-  alternateCurrencyList: makeSelectAlternateCurrencyList(),
-  alternateCurrencyFlag: makeSelectAlternateCurrencyFlagStatus(),
 });
 
 function mapDispatchToProps(dispatch) {