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

package/components/organisms/RedemptionStrategy/tests/RedemptionStrategy.test.js

@@ -1,78 +1,3 @@
-import { render } from "../../../../tests/test-utils"
-import { RedemptionStrategy } from "../RedemptionStrategy";
-import { screen, waitFor } from '@testing-library/dom'
-import '@testing-library/jest-dom';
-import userEvent from '@testing-library/user-event';
-import { injectIntl } from 'react-intl';;
-import { currentProgram } from "../../AllocationStrategy/tests/mockData";
-import globalMessages from "../../../pages/Cap/messages.js"
-import { redemptionStrategyDetails } from "./mockData"
-
-const initializeRedemptionStrategy = ({
-  isEditable = false,
-  currentOrgDetails,
-  ...props
-}) => {
-  const Component = injectIntl(RedemptionStrategy);
-  const propsObj = {
-    redemptionStrategyDetails,
-    currentProgram,
-    isEditable,
-    buttonAction: jest.fn(() => { }),
-    buttonDescription: "",
-    onOptionClick: undefined,
-    currentOrgDetails,
-    pointsCurrencyRatio: '12345',
-    handlePointCurrencyRatioChange: jest.fn(() => { }),
-    ...props
-  };
-
-  render(Component, undefined, propsObj);
-};
-
-describe('Expiry Stratergy', () => {
-  const spyWindowOpen = jest.spyOn(window, 'open');
-  spyWindowOpen.mockImplementation(jest.fn());
-
-  it("Expect Expiry Strategry to have Link and toolTip", async () => {
-    initializeRedemptionStrategy({isEditable:true});
-    const linkvar = screen.getByTestId("cap-growth-icon");
-    const text = screen.queryByText(globalMessages.viewReports.defaultMessage);
-    const divider = screen.getByTestId("cap-report-link-divider");
-    expect(divider).toBeInTheDocument();
-    expect(text).toEqual(null);
-    expect(linkvar).toBeInTheDocument();
-    userEvent.hover(linkvar);
-    expect(await screen.findByText(globalMessages.pointsConditionPointsStandardReportToolTip.defaultMessage)).toBeInTheDocument();
-    await waitFor(() => userEvent.click(linkvar));
-    expect(spyWindowOpen).toHaveBeenCalledTimes(1);
-  })
-
-  it("DO not Expect Expiry Strategry to have Link and toolTip when Editable is false", async () => {
-    initializeRedemptionStrategy({isEditable:false});
-    const linkvar = screen.queryByTestId("cap-growth-icon");
-    expect(linkvar).toBe(null);
-  })
-});
-
-describe('<RedemptionStrategy /> page', () => {
-  it('should render the RedemptionStrategy details with default currentDetails value', () => {
-    initializeRedemptionStrategy({currentOrgDetails : undefined});
-    const RedemptionThreshold = screen.getByText(
-      /RedemptionThreshold for Capillary TechnologiesDefaultProgram/i);
-
-    expect(RedemptionThreshold).toBeInTheDocument();
-  });
-  it('should render the RedemptionStrategy details with default currentDetails value', () => {
-    initializeRedemptionStrategy({currentOrgDetails : { basic_details: undefined, accessibleFeatures : undefined }});
-    const RedemptionThreshold = screen.getByText(
-      /RedemptionThreshold for Capillary TechnologiesDefaultProgram/i);
-
-    expect(RedemptionThreshold).toBeInTheDocument();
-  });
-});
-
-
 describe('<UpgradeCommunication />', () => {
   it('Expect to have unit tests specified', () => {
     expect(true).toEqual(true);

package/components/organisms/RedemptionStrategy/tests/mockData.js

@@ -1,46 +0,0 @@
-export const redemptionStrategyDetails =  [
-        {
-            "id": 185,
-            "programId": 35,
-            "name": "RedemptionThreshold",
-            "description": "RedemptionThreshold for Capillary TechnologiesDefaultProgram",
-            "strategyTypeId": 4,
-            "propertyValues": {
-                "min_cumulative_points": "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1",
-                "redeem_divisibility": "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1",
-                "min_cumulative_purchase": "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1",
-                "redemption_threshold_type": "SLAB_INDEPENDENT",
-                "min_current_points": "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1",
-                "min_points_redeem": "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1",
-                "max_points_redeem": ""
-            },
-            "owner": "LOYALTY",
-            "updatedViaNewUI": null
-        },
-        {
-            "id": 106410,
-            "programId": 35,
-            "name": "CUMULATIVE_PURCHASES",
-            "description": "THRESHOLD",
-            "strategyTypeId": 4,
-            "propertyValues": {
-                "min_cumulative_points": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
-                "min_cumulative_purchase": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
-                "redemption_threshold_type": "SLAB_INDEPENDENT",
-                "min_current_points": "50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50",
-                "min_points_redeem": "10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10",
-                "redeem_divisibility": "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1",
-                "max_points_redeem": "50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50"
-            },
-            "owner": "LOYALTY",
-            "updatedViaNewUI": null
-        }
-    ];
-   
-const pointTypeIdData = {
-    "pointsAllocation": "1",
-    "pointsRedemption": "4",
-    "pointsExpiry": "3",
-    "pointsReturn": "6",
-    "expiryReminder": "7"
-}

package/components/organisms/RenewTierWorkflowAction/RenewTierWorkflowAction.js

@@ -27,8 +27,6 @@ const RenewTierWorkflowAction = ({
   actionData = {},
   actionDetailsData: { upsertActionStatus } = {},
   fleetLoyaltyEnabled = false,
-  source,
-  updateRuleSet,
 }) => {
   const { EvaluatedEntity = '' } = actionData;
   const [userGroupEntity, setUserGroupEntity] = useState(
@@ -65,7 +63,6 @@ const RenewTierWorkflowAction = ({
         : USER_GROUP_LIST_VALUE_MAP.INDIVIDUAL,
       ...getCommSaveData({ dataSource: actionData }),
       renew_slab: true,
-      source,
     };
     return payload;
   };
@@ -74,9 +71,7 @@ const RenewTierWorkflowAction = ({
     const { programId, actionType } = actionData;
     if (programId && actionType) {
       const payload = getPayload();
-      globalActions.upsertAction(programId, actionType, payload, responseData =>
-        updateRuleSet(actionData, responseData),
-      );
+      globalActions.upsertAction(programId, actionType, payload);
     }
   };
 
@@ -107,8 +102,6 @@ RenewTierWorkflowAction.propTypes = {
   actionDetailsData: PropTypes.object,
   globalActions: PropTypes.object,
   fleetLoyaltyEnabled: PropTypes.bool,
-  source: PropTypes.string,
-  updateRuleSet: PropTypes.func,
 };
 
 RenewTierWorkflowAction.defaultProps = {

package/components/organisms/RenewalCommunication/RenewalCommunication.js

@@ -28,12 +28,11 @@ const { tierDowngrade: tierDowngradeMessage } = globalMessages;
 
 const { tierDowngradeDesc } = messages;
 
-export const RenewalCommunication = ({
+const RenewalCommunication = ({
   onRowClick,
   onViewIconClick,
   intl: { formatMessage },
   tierDowngrade,
-  currentDetails={},
 }) => {
   const [dataSource, updateDataSource] = useState([]);
   const [tierDowngradeData, updateTierDowngradeData] = useState({});
@@ -132,7 +131,7 @@ export const RenewalCommunication = ({
     ],
   );
 
-  return <CommunicationTable currentDetails={currentDetails} {...getCommunicationTableProps()} />;
+  return <CommunicationTable {...getCommunicationTableProps()} />;
 };
 
 RenewalCommunication.propTypes = {
@@ -140,7 +139,6 @@ RenewalCommunication.propTypes = {
   tierDowngrade: PropTypes.array,
   onRowClick: PropTypes.func,
   onViewIconClick: PropTypes.func,
-  currentDetails: PropTypes.object,
 };
 
 export default withErrorBoundary(injectIntl(RenewalCommunication), {

package/components/organisms/RenewalCommunication/tests/index.test.js

@@ -1,24 +1,11 @@
-import '@testing-library/jest-dom';
-import { injectIntl } from 'react-intl';
-import { render } from '../../../../tests/test-utils';
-import { RenewalCommunication } from '../RenewalCommunication';
+// import React from 'react';
+// import { mount } from 'enzyme';
+// import { enzymeFind } from 'styled-components/test-utils';
 
-const initializeRenewalCommunication = ({
-  ...props
-} = {}) => {
-  const Component = injectIntl(RenewalCommunication);
+// import RenewalCommunication from '../index';
 
-  const finalProps = {
-    currentDetails: undefined,
-    ...props,
-  };
-
-  render(Component, undefined, finalProps);
-};
-
-describe('<RenewalCommunication /> page', () => {
-  it('should render the RenewalCommunication details with default currentDetails value', () => {
-    initializeRenewalCommunication();
-    expect(true).toEqual(true);
+describe('<RenewalCommunication />', () => {
+  it('Expect to have unit tests specified', () => {
+   expect(true).toEqual(true);
   });
 });

package/components/organisms/ReturnConditions/ReturnConditions.js

@@ -1,7 +1,6 @@
 /* eslint-disable react/jsx-no-bind */
 import React, { useMemo, useState } from 'react';
 import { injectIntl, intlShape } from 'react-intl';
-import moment from 'moment';
 import PropTypes from 'prop-types';
 import withStyles from 'utils/withStyles';
 import { withRouter } from 'react-router';
@@ -57,13 +56,11 @@ const {
   EXPIRY_FROM,
   EXPIRY_TYPE_MAP,
   REQUEST,
-  DATE_FORMAT,
-  LOCALE_DATE_FORMAT
 } = appConstants;
 
 const { POINTS_TENDER_MODE } = constants;
 
-export const ReturnConditions = props => {
+const ReturnConditions = props => {
   const {
     actions,
     intl: { formatMessage },
@@ -241,7 +238,7 @@ export const ReturnConditions = props => {
         index: 0,
       });
     } else {
-      slabs.forEach((slab, index) => {
+      slabs.map((slab, index) => {
         pointsExpiryObj[index] = getPeriodExpiryValue({
           unit: expiryTimeUnitsArr[index],
           formatMessage,
@@ -254,9 +251,7 @@ export const ReturnConditions = props => {
     const suffix = pointsExpiryObj[0]?.suffix;
     return expiryType === SLAB_INDEPENDENT ? (
       renderCellValue(
-        suffix ? `${value} ${suffix}` : 
-        expiryTimeUnitsArr[0]==='FIXED_DATE'? 
-        moment(value,DATE_FORMAT).format(LOCALE_DATE_FORMAT): value,
+        suffix ? `${value} ${suffix}` : value,
         pointsExpiryObj[0]?.prefix,
       )
     ) : (
@@ -266,9 +261,7 @@ export const ReturnConditions = props => {
             const slabValue = expiryTimeValuesArr[index];
             const slabSuffix = pointsExpiryObj[index]?.suffix;
             return renderCellValue(
-              slabSuffix ? `${slabValue} ${slabSuffix}` :
-              expiryTimeUnitsArr[index]==='FIXED_DATE'?
-              moment(slabValue,DATE_FORMAT).format(LOCALE_DATE_FORMAT): slabValue,
+              slabSuffix ? `${slabValue} ${slabSuffix}` : slabValue,
               pointsExpiryObj[index]?.prefix,
             );
           }),
@@ -349,9 +342,6 @@ export const ReturnConditions = props => {
     rowKey: 'id',
     id: 'expiryStrategyDetailsList',
     showLoader: false,
-    locale: {
-      emptyText: formatMessage(globalMessages.noData),
-    },
   };
 
   const tooggleSwitch = param => {
@@ -362,7 +352,7 @@ export const ReturnConditions = props => {
 
   const ReturnPointsSwitch = () => (
     <SwitchWithDivider
-      label={formatMessage(globalMessages.returnUsedPoints)}
+      label={formatMessage(messages.returnUsedPoints)}
       inductiveText={formatMessage(messages.returnUsedPointsInductive)}
       isSwitchChecked={returnPoints}
       onSwitchChange={tooggleSwitch.bind(

package/components/organisms/ReturnConditions/messages.js

@@ -20,7 +20,7 @@ export default defineMessages({
   returnConditionInductive: {
     id: `${scope}.returnConditionInductive`,
     defaultMessage:
-      'Define how reward currencies get returned or reissued when a redemption is reversed',
+      'Define how points get returned or reissued when a redemption is reversed',
   },
   returndBasedOnInductive: {
     id: `${scope}.returndBasedOnInductive`,
@@ -29,7 +29,7 @@ export default defineMessages({
   },
   expiryConditionReturnPts: {
     id: `${scope}.expiryConditionReturnPts`,
-    defaultMessage: 'Expiry condition for returned reward currencies',
+    defaultMessage: 'Expiry condition for returned points',
   },
   expiryConditionReturnPtsTooltip: {
     id: `${scope}.expiryConditionReturnPtsTooltip`,
@@ -39,26 +39,30 @@ export default defineMessages({
   expiryConditionReturnPtsInductive: {
     id: `${scope}.expiryConditionReturnPtsInductive`,
     defaultMessage:
-      'Define how reissued reward currencies will expire for the chosen return method',
+      'Define how reissued points will expire for the chosen return method',
   },
   payForReturnPoints: {
     id: `${scope}.payForReturnPoints`,
-    defaultMessage: 'Enable refund of return amount through reward currencies',
+    defaultMessage: 'Enable refund of return amount through points',
   },
   payForReturnPointsInductive: {
     id: `${scope}.payForReturnPointsInductive`,
     defaultMessage:
-      'To reissue reward currencies, it is necessary to specify the mode of payment used for that transaction',
+      'To reissue points, it is necessary to specify the mode of payment used for that transaction',
   },
   payForReturnPointsInfo: {
     id: `${scope}.payForReturnPointsInfo`,
     defaultMessage:
-      'You can use refund through reward currencies if your org does not support refunds through original payment mode or cash',
+      'You can use refund through points if your org does not support refunds through original payment mode or cash',
+  },
+  returnUsedPoints: {
+    id: `${scope}.returnUsedPoints`,
+    defaultMessage: 'Return used points',
   },
   returnUsedPointsInductive: {
     id: `${scope}.returnUsedPointsInductive`,
     defaultMessage:
-      'Select if reward currencies are to be returned back to the customer in case there is a return of a transaction against which a redemption was made',
+      'Select if points are to be returned back to the customer in case there is a return of a transaction against which a redemption was made',
   },
   noteDescription: {
     id: `${scope}.noteDescription`,

package/components/organisms/ReturnConditions/style.js

@@ -2,7 +2,6 @@ import styled, { css } from 'styled-components';
 import StyledVars from '@capillarytech/cap-ui-library/styled';
 import CapSelect from '@capillarytech/cap-ui-library/CapSelect';
 import CapTable from '@capillarytech/cap-ui-library/CapTable';
-import { CAP_SPACE_20 } from '@capillarytech/cap-ui-library/styled/variables';
 
 export const {
   CAP_SPACE_24,
@@ -34,6 +33,6 @@ export const styles = css`
   .info-icon-return-expiry {
     position: relative;
     top: -4px;
-    left: -${CAP_SPACE_24};
+    left: -245px;
   }
 `;

package/components/organisms/ReturnStrategy/ReturnStrategy.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, intlShape } from 'react-intl';
-import moment from 'moment';
 import CapRow from '@capillarytech/cap-ui-library/CapRow';
 import CapTable from '@capillarytech/cap-ui-library/CapTable';
 import CapHeader from '@capillarytech/cap-ui-library/CapHeader';
@@ -27,8 +26,6 @@ import TableOption from '../../molecules/TableOption';
 import StrategiesTag from '../../molecules/StrategiesTag';
 import EllipsisText from '../../atoms/EllipsisText';
 import withErrorBoundary from 'utils/withErrorBoundary';
-import CapReportLink from '../../molecules/CapReportLink';
-
 
 const { Flex, FlexApart } = globalStyle;
 const { styles } = style;
@@ -41,9 +38,6 @@ const {
   POINTS_EXPIRY_PERIOD,
   EDIT,
   POINTS_RETURN_MODE_MAP,
-  DISABLE_EI_STATS,
-  DATE_FORMAT,
-  LOCALE_DATE_FORMAT
 } = appConstants;
 
 export const ReturnStrategy = ({
@@ -56,14 +50,7 @@ export const ReturnStrategy = ({
   buttonAction,
   buttonDescription,
   onOptionClick,
-  currentOrgDetails = {}
 }) => {
-  const { accessibleFeatures = [] } = currentOrgDetails;
-
-  const hasInsightsChartDisabled = accessibleFeatures.includes(
-    DISABLE_EI_STATS,
-  );
-
   const columns = [
     {
       title: formatMessage(globalMessages.pointsReturnBasedOn),
@@ -141,7 +128,7 @@ export const ReturnStrategy = ({
   };
   const onEditClick = rowData => onOptionClick(EDIT, rowData);
 
- const prepareReturnStrategyDetailDataSource = (
+  const prepareReturnStrategyDetailDataSource = (
     returnStrategyDetails = [],
   ) => {
     let returnIssualEnabled = true;
@@ -301,7 +288,7 @@ export const ReturnStrategy = ({
         index: 0,
       });
     } else {
-      slabs.forEach((slab, index) => {
+      slabs.map((slab, index) => {
         pointsExpiryObj[index] = getPeriodExpiryValue({
           unit: expiryTimeUnitsArr[index],
           formatMessage,
@@ -314,9 +301,7 @@ export const ReturnStrategy = ({
     const suffix = pointsExpiryObj[0]?.suffix;
     return expiryType === SLAB_INDEPENDENT ? (
       renderCellValue(
-        suffix ? `${value} ${suffix}` : 
-        expiryTimeUnitsArr[0]==='FIXED_DATE'?
-        moment(value,DATE_FORMAT).format(LOCALE_DATE_FORMAT): value,
+        suffix ? `${value} ${suffix}` : value,
         pointsExpiryObj[0]?.prefix,
       )
     ) : (
@@ -326,9 +311,7 @@ export const ReturnStrategy = ({
             const slabValue = expiryTimeValuesArr[index];
             const slabSuffix = pointsExpiryObj[index]?.suffix;
             return renderCellValue(
-              slabSuffix ? `${slabValue} ${slabSuffix}` :
-              expiryTimeUnitsArr[index]==='FIXED_DATE'?
-              moment(slabValue,DATE_FORMAT).format(LOCALE_DATE_FORMAT): slabValue,
+              slabSuffix ? `${slabValue} ${slabSuffix}` : slabValue,
               pointsExpiryObj[index]?.prefix,
             );
           }),
@@ -431,23 +414,14 @@ export const ReturnStrategy = ({
           }
         />
         {isEditable && !modifiedDatasource.length ? (
-          <div style={{ display: "flex", alignItems: "center" }}>
-            {
-              !hasInsightsChartDisabled &&
-              <>
-                <CapReportLink link={appConstants.POINTS_CONDITION_REPORT_PATH} tooltip={formatMessage(globalMessages.pointsConditionPointsStandardReportToolTip)} isIconOnly={true} />
-                <CapDivider data-testId="cap-report-link-divider" type="vertical" style={{ height: "20px" }} />
-              </>
-            }
-            <CapButton
-              onClick={buttonAction}
-              isAddBtn
-              type="flat"
-              className="lp-btn-config-add-points"
-            >
-              {buttonDescription}
-            </CapButton>
-          </div>
+          <CapButton
+            onClick={buttonAction}
+            isAddBtn
+            type="flat"
+            className="lp-btn-config-add-points"
+          >
+            {buttonDescription}
+          </CapButton>
         ) : null}
       </FlexApart>
       {!returnStrategyDetails.length && isEditable ? <CapDivider /> : null}
@@ -481,7 +455,6 @@ ReturnStrategy.propTypes = {
   buttonAction: PropTypes.func,
   buttonDescription: PropTypes.string,
   onOptionClick: PropTypes.func,
-  currentOrgDetails: PropTypes.object,
 };
 
 export default withErrorBoundary(

package/components/organisms/ReturnStrategy/messages.js

@@ -19,6 +19,18 @@ export default defineMessages({
   },
   returnDescription: {
     id: `${scope}.returnDescription`,
-    defaultMessage: 'Define how redeemed reward currencies will get reinstated if the transaction where the redemption happened is returned',
+    defaultMessage: 'Define how redeemed points will get reinstated if the transaction where the redemption happened is returned',
+  },
+  eventDate: {
+    id: `${scope}.eventDate`,
+    defaultMessage: 'Event date',
+  },
+  rollingFromEventDate: {
+    id: `${scope}.rollingFromEventDate`,
+    defaultMessage: 'Rolling expiry from event date',
+  },
+  membershipExpiryDate: {
+    id: `${scope}.membershipExpiryDate`,
+    defaultMessage: 'Membership event date',
   },
 });

package/components/organisms/ReturnStrategy/tests/ReturnStrategy.test.js

@@ -1,71 +1,3 @@
-import { render } from "../../../../tests/test-utils"
-import { ReturnStrategy } from "../ReturnStrategy";
-import { screen, waitFor } from '@testing-library/dom'
-import '@testing-library/jest-dom';
-import userEvent from '@testing-library/user-event';
-import { injectIntl } from 'react-intl';;
-import { currentProgram } from "../../AllocationStrategy/tests/mockData";
-import globalMessages from "../../../pages/Cap/messages.js"
-import { expiryStrategyDetails, returnStrategyDetails } from "../../ReturnConditions/tests/mocks/mockData"
-
-const initializeReturnStrategy = (isEditable = false,props) => {
-  const Component = injectIntl(ReturnStrategy);
-
-  const propsObj = {
-  expiryStrategyDetails,
-  currentProgram,
-  isEditable,
-  buttonAction: jest.fn(() => { }),
-  buttonDescription: "",
-  onOptionClick: undefined,
-  currentOrgDetails: undefined,
-  ...props,
-  };
-
-  render(Component, undefined, propsObj);
-};
-
-describe('Expiry Stratergy', () => {
-  const spyWindowOpen = jest.spyOn(window, 'open');
-  spyWindowOpen.mockImplementation(jest.fn());
-
-  it("Expect Expiry Strategry to have Link and toolTip", async () => {
-    initializeReturnStrategy(true);
-    const linkvar = screen.getByTestId("cap-growth-icon");
-    const text = screen.queryByText(globalMessages.viewReports.defaultMessage);
-    const divider = screen.getByTestId("cap-report-link-divider");
-    expect(divider).toBeInTheDocument();
-    expect(text).toEqual(null);
-    expect(linkvar).toBeInTheDocument();
-    userEvent.hover(linkvar);
-    expect(await screen.findByText(globalMessages.pointsConditionPointsStandardReportToolTip.defaultMessage)).toBeInTheDocument();
-    await waitFor(() => userEvent.click(linkvar));
-    expect(spyWindowOpen).toHaveBeenCalledTimes(1);
-  })
-
-  it("DO not Expect Expiry Strategry to have Link and toolTip when Editable is false", async () => {
-    initializeReturnStrategy(false);
-    const linkvar = screen.queryByTestId("cap-growth-icon");
-    expect(linkvar).toBe(null);
-  })
-
-  it('Return Strategy to show formatted text', async()=>{
-    initializeReturnStrategy(true, {returnStrategyDetails} );
-    const dateText=screen.getAllByText(/Aug 16, 2023/i);
-    const neverText=screen.getAllByText(/never/i);
-    expect(dateText[0]).toBeInTheDocument();
-    expect(neverText[0]).toBeInTheDocument();
-  })
-});
-
-describe('<ReturnStrategy /> page', () => {
-  it('should render the ReturnStrategy details with default currentDetails value', () => {
-    initializeReturnStrategy();
-    expect(true).toEqual(true);
-  });
-});
-
-
 describe('<UpgradeCommunication />', () => {
   it('Expect to have unit tests specified', () => {
     expect(true).toEqual(true);

package/components/organisms/ReviewTierUnloadModal/ReviewTierUnloadModal.js

@@ -51,7 +51,7 @@ const ReviewTierUnloadModal = ({
       globalActions.setTierSecondaryCriteria();
     }
     callback();
-    onCancel();
+    onCancel(null);
   };
 
   const onCancel = () => {
@@ -64,8 +64,8 @@ const ReviewTierUnloadModal = ({
     closable: true,
     icon: pigeon,
     title: formatMessage(messages.unloadSecondaryEligibility),
-    description: formatMessage(globalMessages.addEligibilityValuesDesc),
-    note: formatMessage(globalMessages.addEligibilityValuesNote),
+    description: formatMessage(messages.unloadSecondaryEligibilityDesc),
+    note: formatMessage(messages.unloadSecondaryEligibilityNote),
     handleOkModal: onOkClick,
     onCancel,
     okText: formatMessage(globalMessages.confirm),

package/components/organisms/ReviewTierUnloadModal/messages.js

@@ -13,4 +13,14 @@ export default defineMessages({
     id: `${scope}.unloadSecondaryEligibility`,
     defaultMessage: 'Add secondary eligibility',
   },
+  unloadSecondaryEligibilityDesc: {
+    id: `${scope}.unloadSecondaryEligibilityDesc`,
+    defaultMessage:
+      'You have added a new eligibility criteria for all the tiers in the program. This criteria would not have any eligibility values set. Please add them via the ‘Tiers Section’.',
+  },
+  unloadSecondaryEligibilityNote: {
+    id: `${scope}.unloadSecondaryEligibilityNote`,
+    defaultMessage:
+      'If you do not add values for all tiers the secondary criteria will not get saved.',
+  },
 });