From 7f262372499b98d9fd8071c7b8069238ad3a1d15 Mon Sep 17 00:00:00 2001
From: Tony Valle <79843014+superskip@users.noreply.github.com>
Date: Fri, 11 Aug 2023 10:30:11 +0200
Subject: [PATCH 01/16] fix: [TECH-1623] rename TEI "Launchpad McQuack" ->
 "Breaking TheGlass" (#3400)

---
 .../EnrollmentPage/BreakingTheGlass/index.js           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js b/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js
index b460d47b33..45ad92f517 100644
--- a/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js
+++ b/cypress/integration/EnrollmentPage/BreakingTheGlass/index.js
@@ -1,7 +1,7 @@
 import '../sharedSteps';
 
 Given('the tei created by this test is cleared from the database', () => {
-    cy.buildApiUrl('tracker', 'trackedEntities?filter=w75KJ2mc4zz:like:Launchpad&filter=zDhUuAYrxNC:like:McQuack&trackedEntityType=nEenWmSyUEp&page=1&pageSize=5&ouMode=ACCESSIBLE')
+    cy.buildApiUrl('tracker', 'trackedEntities?filter=w75KJ2mc4zz:like:Breaking&filter=zDhUuAYrxNC:like:TheGlass&trackedEntityType=nEenWmSyUEp&page=1&pageSize=5&ouMode=ACCESSIBLE')
         .then(url => cy.request(url))
         .then(({ body }) =>
             body.instances.forEach(({ trackedEntity }) =>
@@ -24,12 +24,12 @@ And('you create a new tei in Child programme from Ngelehun CHC', () => {
     cy.get('[data-test="d2-form-component"]')
         .find('[data-test="capture-ui-input"]')
         .eq(0)
-        .type('Launchpad')
+        .type('Breaking')
         .blur();
     cy.get('[data-test="d2-form-component"]')
         .find('[data-test="capture-ui-input"]')
         .eq(1)
-        .type('McQuack')
+        .type('TheGlass')
         .blur();
 
     clickSave();
@@ -61,7 +61,7 @@ And('you enroll the tei from Njandama MCHP', () => {
         .click();
 
     cy.get('[data-test="enrollment-page-content"]')
-        .contains('Enroll Launchpad McQuack in this program')
+        .contains('Enroll Breaking TheGlass in this program')
         .click();
 
     cy.get('[data-test="d2-form-component"]')
@@ -97,7 +97,7 @@ And('you log in as tracker2 user', () => {
 
 And('you select the new tei', () => {
     cy.visit('/#/?orgUnitId=DiszpKrYNg8&programId=IpHINAT79UW');
-    cy.contains('Launchpad')
+    cy.contains('Breaking')
         .click();
     // Wait for enrollment dashboard
     cy.get('[data-test="profile-widget"]')

From 519198b0c8dc4f97f47a6dc52a1b69d71927fc35 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Fri, 11 Aug 2023 08:47:51 +0000
Subject: [PATCH 02/16] chore(release): cut 100.35.6 [skip release]

## [100.35.6](https://github.com/dhis2/capture-app/compare/v100.35.5...v100.35.6) (2023-08-11)

### Bug Fixes

* [TECH-1623] rename TEI "Launchpad McQuack" -> "Breaking TheGlass" ([#3400](https://github.com/dhis2/capture-app/issues/3400)) ([7f26237](https://github.com/dhis2/capture-app/commit/7f262372499b98d9fd8071c7b8069238ad3a1d15))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6a4627eb0..c2022d7582 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.35.6](https://github.com/dhis2/capture-app/compare/v100.35.5...v100.35.6) (2023-08-11)
+
+
+### Bug Fixes
+
+* [TECH-1623] rename TEI "Launchpad McQuack" -> "Breaking TheGlass" ([#3400](https://github.com/dhis2/capture-app/issues/3400)) ([7f26237](https://github.com/dhis2/capture-app/commit/7f262372499b98d9fd8071c7b8069238ad3a1d15))
+
 ## [100.35.5](https://github.com/dhis2/capture-app/compare/v100.35.4...v100.35.5) (2023-08-03)
 
 
diff --git a/package.json b/package.json
index 4f00969968..966c3f4c8a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.35.5",
+    "version": "100.35.6",
     "cacheVersion": "5",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.35.5",
+        "@dhis2/rules-engine-javascript": "100.35.6",
         "@dhis2/app-runtime": "^3.8.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 908b0b2737..4d314f92cc 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.35.5",
+    "version": "100.35.6",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From c02c3ee46ed4209215946636682ec86c97c9d905 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Tue, 15 Aug 2023 11:39:16 +0200
Subject: [PATCH 03/16] fix: [DHIS2-15525] show formNames in the enrollment
 dashboard (#3402)

---
 .../EnrollmentPageDefault/hooks/useProgramMetadata.js         | 2 +-
 .../EnrollmentPageDefault/hooks/useProgramStages.js           | 1 +
 .../Stages/Stage/StageDetail/hooks/useEventList.js            | 4 ++--
 .../components/WidgetStagesAndEvents/types/common.types.js    | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramMetadata.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramMetadata.js
index 085a79bd15..d319df06d1 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramMetadata.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramMetadata.js
@@ -8,7 +8,7 @@ const query = {
         id: ({ id }) => id,
         params: {
             fields:
-            ['programStages[id,repeatable,hideDueDate,programStageDataElements[displayInReports,dataElement[id,valueType,displayName,optionSet[options[code,name]]]'],
+            ['programStages[id,repeatable,hideDueDate,programStageDataElements[displayInReports,dataElement[id,valueType,displayName,displayFormName,optionSet[options[code,name]]]'],
         },
     },
 };
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramStages.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramStages.js
index d146c6e3a9..3c8b50285a 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramStages.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useProgramStages.js
@@ -32,6 +32,7 @@ export const useProgramStages = (program: Program, programStages?: Array<apiProg
                             acc.push({
                                 id: dataElement.id,
                                 name: dataElement.displayName,
+                                formName: dataElement.displayFormName,
                                 type: dataElement.valueType,
                                 options,
                                 optionSet: dataElement.optionSet,
diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/hooks/useEventList.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/hooks/useEventList.js
index ab03558397..ab47615397 100644
--- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/hooks/useEventList.js
+++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/hooks/useEventList.js
@@ -113,13 +113,13 @@ const useComputeDataFromEvent = (dataElements: Array<StageDataElement>, events:
 const useComputeHeaderColumn = (dataElements: Array<StageDataElement>, hideDueDate: boolean, formFoundation: Object) => {
     const headerColumns = useMemo(() => {
         const dataElementHeaders = dataElements.reduce((acc, currDataElement) => {
-            const { id, name, type, optionSet } = currDataElement;
+            const { id, name, formName, type, optionSet } = currDataElement;
             if (!acc.find(item => item.id === id)) {
                 if (isNotValidOptionSet(type, optionSet)) {
                     log.error(errorCreator(MULIT_TEXT_WITH_NO_OPTIONS_SET)({ currDataElement }));
                     return acc;
                 }
-                acc.push({ id, header: name, type, sortDirection: SORT_DIRECTION.DEFAULT });
+                acc.push({ id, header: formName || name, type, sortDirection: SORT_DIRECTION.DEFAULT });
             }
             return acc;
         }, []);
diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js
index 53e97b9ebe..9ec7b002ac 100644
--- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js
+++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js
@@ -8,6 +8,7 @@ type StageOptions = {
 export type StageDataElement = {
     id: string,
     name: string,
+    formName: string,
     type: $Keys<typeof dataElementTypes>,
     options?: StageOptions,
     optionSet?: { options: Array<Option> },

From 4a600bd1659e55db37fe4b3c9642534bc5382104 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Tue, 15 Aug 2023 09:57:19 +0000
Subject: [PATCH 04/16] chore(release): cut 100.35.7 [skip release]

## [100.35.7](https://github.com/dhis2/capture-app/compare/v100.35.6...v100.35.7) (2023-08-15)

### Bug Fixes

* [DHIS2-15525] show formNames in the enrollment dashboard ([#3402](https://github.com/dhis2/capture-app/issues/3402)) ([c02c3ee](https://github.com/dhis2/capture-app/commit/c02c3ee46ed4209215946636682ec86c97c9d905))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2022d7582..b08e5419b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.35.7](https://github.com/dhis2/capture-app/compare/v100.35.6...v100.35.7) (2023-08-15)
+
+
+### Bug Fixes
+
+* [DHIS2-15525] show formNames in the enrollment dashboard ([#3402](https://github.com/dhis2/capture-app/issues/3402)) ([c02c3ee](https://github.com/dhis2/capture-app/commit/c02c3ee46ed4209215946636682ec86c97c9d905))
+
 ## [100.35.6](https://github.com/dhis2/capture-app/compare/v100.35.5...v100.35.6) (2023-08-11)
 
 
diff --git a/package.json b/package.json
index 966c3f4c8a..a30eb6b11b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.35.6",
+    "version": "100.35.7",
     "cacheVersion": "5",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.35.6",
+        "@dhis2/rules-engine-javascript": "100.35.7",
         "@dhis2/app-runtime": "^3.8.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 4d314f92cc..1bbbde72e4 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.35.6",
+    "version": "100.35.7",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From adb6b32f1bffc5020ca34ab5c7568b5a323a8002 Mon Sep 17 00:00:00 2001
From: Tony Valle <79843014+superskip@users.noreply.github.com>
Date: Tue, 22 Aug 2023 09:44:08 +0200
Subject: [PATCH 05/16] fix: [DHIS2-15492] transition of tooltip enabled state
 (#3381)

---
 .../ConditionalTooltip.component.js           | 31 ++++++++
 .../components/ConditionalTooltip/index.js    |  1 +
 .../DataEntry/withMainButton.js               | 39 +++++-----
 .../FilterButtonMain.component.js             | 47 +++++-------
 .../components/Notes/Notes.component.js       | 33 ++++-----
 .../QuickActionButton/QuickActionButton.js    | 39 ++++------
 .../ProgramStageSelector.component.js         | 70 ++++++++----------
 .../EventDetailsSection.component.js          | 35 ++++-----
 .../Relationships/Relationships.component.js  | 71 ++++++++-----------
 .../Actions/AddNew/AddNew.component.js        | 40 +++++------
 .../DataEntry/withMainButton.js               | 32 ++++-----
 .../WidgetEventEdit.container.js              | 45 +++++-------
 .../StageDetail/StageDetail.component.js      | 61 ++++++++--------
 13 files changed, 247 insertions(+), 297 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/ConditionalTooltip/ConditionalTooltip.component.js
 create mode 100644 src/core_modules/capture-core/components/ConditionalTooltip/index.js

diff --git a/src/core_modules/capture-core/components/ConditionalTooltip/ConditionalTooltip.component.js b/src/core_modules/capture-core/components/ConditionalTooltip/ConditionalTooltip.component.js
new file mode 100644
index 0000000000..e2df643a07
--- /dev/null
+++ b/src/core_modules/capture-core/components/ConditionalTooltip/ConditionalTooltip.component.js
@@ -0,0 +1,31 @@
+// @flow
+import React from 'react';
+import { Tooltip } from '@dhis2/ui';
+
+type Props = {
+    enabled: boolean,
+    wrapperClassName?: string,
+    children: any,
+};
+
+export const ConditionalTooltip = (props: Props) => {
+    const { enabled, wrapperClassName, children, ...passOnProps } = props;
+
+    return enabled ?
+        (<Tooltip {...passOnProps}>
+            { ({ onMouseOver, onMouseOut, ref }) => (
+                <span
+                    className={wrapperClassName}
+                    ref={(btnRef) => {
+                        if (btnRef) {
+                            btnRef.onpointerenter = onMouseOver;
+                            btnRef.onpointerleave = onMouseOut;
+                            ref.current = btnRef;
+                        }
+                    }}
+                >
+                    {children}
+                </span>
+            )}
+        </Tooltip>) : children;
+};
diff --git a/src/core_modules/capture-core/components/ConditionalTooltip/index.js b/src/core_modules/capture-core/components/ConditionalTooltip/index.js
new file mode 100644
index 0000000000..dacd281a12
--- /dev/null
+++ b/src/core_modules/capture-core/components/ConditionalTooltip/index.js
@@ -0,0 +1 @@
+export { ConditionalTooltip } from './ConditionalTooltip.component';
diff --git a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/withMainButton.js b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/withMainButton.js
index 097d88a8dd..8b18d2f201 100644
--- a/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/withMainButton.js
+++ b/src/core_modules/capture-core/components/DataEntries/SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/withMainButton.js
@@ -2,7 +2,8 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
 import i18n from '@dhis2/d2-i18n';
-import { Tooltip, Button } from '@dhis2/ui';
+import { Button } from '@dhis2/ui';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { newEventSaveTypes } from './newEventSaveTypes';
 import { getDataEntryKey } from '../../../../DataEntry/common/getDataEntryKey';
 import { type RenderFoundation } from '../../../../../metaData';
@@ -86,29 +87,21 @@ const getMainButton = (InnerComponent: React.ComponentType<any>) =>
             const primary = buttons[0];
             const secondaries = buttons.slice(1);
             return (
-                <Tooltip content={i18n.t('No write access')}>
-                    {({ onMouseOver, onMouseOut, ref }) => (
-                        <div
-                            data-test="main-button"
-                            ref={(divRef) => {
-                                if (divRef && !hasWriteAccess) {
-                                    divRef.onmouseover = onMouseOver;
-                                    divRef.onmouseout = onMouseOut;
-                                    ref.current = divRef;
-                                }
-                            }}
+                <ConditionalTooltip
+                    content={i18n.t('No write access')}
+                    enabled={!hasWriteAccess}
+                >
+                    <div data-test="main-button">
+                        <SimpleSplitButton
+                            primary
+                            disabled={!hasWriteAccess}
+                            onClick={primary.onClick}
+                            dropDownItems={secondaries}
                         >
-                            <SimpleSplitButton
-                                primary
-                                disabled={!hasWriteAccess}
-                                onClick={primary.onClick}
-                                dropDownItems={secondaries}
-                            >
-                                {primary.text}
-                            </SimpleSplitButton>
-                        </div>
-                    )}
-                </Tooltip>
+                            {primary.text}
+                        </SimpleSplitButton>
+                    </div>
+                </ConditionalTooltip>
             );
         }
 
diff --git a/src/core_modules/capture-core/components/ListView/Filters/FilterButton/FilterButtonMain.component.js b/src/core_modules/capture-core/components/ListView/Filters/FilterButton/FilterButtonMain.component.js
index ec4f54e83a..6541747f96 100644
--- a/src/core_modules/capture-core/components/ListView/Filters/FilterButton/FilterButtonMain.component.js
+++ b/src/core_modules/capture-core/components/ListView/Filters/FilterButton/FilterButtonMain.component.js
@@ -2,7 +2,8 @@
 import React, { Component } from 'react';
 import { withStyles } from '@material-ui/core/styles';
 import Popover from '@material-ui/core/Popover';
-import { IconChevronDown16, IconChevronUp16, Tooltip, Button } from '@dhis2/ui';
+import { IconChevronDown16, IconChevronUp16, Button } from '@dhis2/ui';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { ActiveFilterButton } from './ActiveFilterButton.component';
 import { FilterSelectorContents } from '../Contents';
 import type { UpdateFilter, ClearFilter, RemoveFilter } from '../../types';
@@ -165,34 +166,22 @@ class FilterButtonMainPlain extends Component<Props, State> {
     renderWithoutAppliedFilter() {
         const { selectorVisible, classes, title, disabled, tooltipContent } = this.props;
 
-        return disabled ? (
-            <Tooltip content={tooltipContent} closeDelay={50}>
-                {({ onMouseOver, onMouseOut, ref }) => (
-                    <div
-                        ref={(divRef) => {
-                            if (divRef && disabled) {
-                                divRef.onmouseover = onMouseOver;
-                                divRef.onmouseout = onMouseOut;
-                                ref.current = divRef;
-                            }
-                        }}
-                    >
-                        <Button disabled={disabled}>
-                            {title}
-                            <span className={classes.icon}>
-                                {selectorVisible ? <IconChevronUp16 /> : <IconChevronDown16 />}
-                            </span>
-                        </Button>
-                    </div>
-                )}
-            </Tooltip>
-        ) : (
-            <Button onClick={this.openFilterSelector}>
-                {title}
-                <span className={classes.icon}>
-                    {selectorVisible ? <IconChevronUp16 /> : <IconChevronDown16 />}
-                </span>
-            </Button>
+        return (
+            <ConditionalTooltip
+                content={tooltipContent}
+                enabled={disabled}
+                closeDelay={50}
+            >
+                <Button
+                    disabled={disabled}
+                    onClick={this.openFilterSelector}
+                >
+                    {title}
+                    <span className={classes.icon}>
+                        {selectorVisible ? <IconChevronUp16 /> : <IconChevronDown16 />}
+                    </span>
+                </Button>
+            </ConditionalTooltip>
         );
     }
 
diff --git a/src/core_modules/capture-core/components/Notes/Notes.component.js b/src/core_modules/capture-core/components/Notes/Notes.component.js
index cf0bf7e8f5..bb1fc61c8d 100644
--- a/src/core_modules/capture-core/components/Notes/Notes.component.js
+++ b/src/core_modules/capture-core/components/Notes/Notes.component.js
@@ -3,9 +3,10 @@
 import * as React from 'react';
 import { Editor, Parser } from '@dhis2/d2-ui-rich-text';
 import { withStyles } from '@material-ui/core';
-import { colors, spacersNum, Tooltip, Menu, MenuItem, Button } from '@dhis2/ui';
+import { colors, spacersNum, Menu, MenuItem, Button } from '@dhis2/ui';
 import i18n from '@dhis2/d2-i18n';
 import { withFocusSaver } from 'capture-ui';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { TextField } from '../FormFields/New';
 import type { Note } from './notes.types';
 
@@ -181,26 +182,18 @@ class NotesPlain extends React.Component<Props, State> {
                 className={classes.newNoteButtonContainer}
                 data-test="new-comment-button"
             >
-                <Button
-                    onClick={this.toggleIsOpen}
-                    disabled={!canAddComment}
-                    small={smallMainButton}
+                <ConditionalTooltip
+                    content={i18n.t('You don\'t have access to write comments')}
+                    enabled={!canAddComment}
                 >
-                    <Tooltip content={i18n.t('You don\'t have access to write comments')}>
-                        {({ onMouseOver, onMouseOut, ref }) => (
-                            <div ref={(divRef) => {
-                                if (divRef && !canAddComment) {
-                                    divRef.onmouseover = onMouseOver;
-                                    divRef.onmouseout = onMouseOut;
-                                    ref.current = divRef;
-                                }
-                            }}
-                            >
-                                {i18n.t('Write comment')}
-                            </div>
-                        )}
-                    </Tooltip>
-                </Button>
+                    <Button
+                        onClick={this.toggleIsOpen}
+                        disabled={!canAddComment}
+                        small={smallMainButton}
+                    >
+                        {i18n.t('Write comment')}
+                    </Button>
+                </ConditionalTooltip>
             </div>
         );
     }
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/QuickActionButton/QuickActionButton.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/QuickActionButton/QuickActionButton.js
index 6cf8e002c5..7727a05019 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/QuickActionButton/QuickActionButton.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/QuickActionButton/QuickActionButton.js
@@ -1,8 +1,9 @@
 // @flow
 import React from 'react';
 import i18n from '@dhis2/d2-i18n';
-import { Button, spacers, Tooltip } from '@dhis2/ui';
+import { Button, spacers } from '@dhis2/ui';
 import { withStyles } from '@material-ui/core';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import type { QuickActionButtonTypes } from './QuickActionButton.types';
 
 const styles = {
@@ -14,30 +15,20 @@ const styles = {
 };
 
 const QuickActionButtonPlain = ({ icon, label, onClickAction, dataTest, disable, classes }: QuickActionButtonTypes) => (
-    <Tooltip
+    <ConditionalTooltip
         content={i18n.t('No available program stages')}
+        enabled={disable}
     >
-        { ({ onMouseOver, onMouseOut, ref }) => (
-            <div ref={(btnRef) => {
-                if (btnRef && disable) {
-                    btnRef.onmouseover = onMouseOver;
-                    btnRef.onmouseout = onMouseOut;
-                    ref.current = btnRef;
-                }
-            }}
-            >
-                <Button
-                    onClick={onClickAction}
-                    dataTest={dataTest}
-                    disabled={disable}
-                >
-
-                    <div className={classes.button}>
-                        {icon}
-                        {label}
-                    </div>
-                </Button>
-            </div>)}
-    </Tooltip>);
+        <Button
+            onClick={onClickAction}
+            dataTest={dataTest}
+            disabled={disable}
+        >
+            <div className={classes.button}>
+                {icon}
+                {label}
+            </div>
+        </Button>
+    </ConditionalTooltip>);
 
 export const QuickActionButton = withStyles(styles)(QuickActionButtonPlain);
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js
index a0219c8cab..20f5b1b8dd 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js
@@ -1,7 +1,8 @@
 // @flow
 import React from 'react';
 import i18n from '@dhis2/d2-i18n';
-import { Button, Tooltip, spacers, spacersNum } from '@dhis2/ui';
+import { Button, spacers, spacersNum } from '@dhis2/ui';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { withStyles } from '@material-ui/core';
 import { NonBundledDhis2Icon } from '../../../NonBundledDhis2Icon';
 
@@ -30,47 +31,36 @@ const ProgramStageSelectorComponentPlain = ({ programStages, onSelectProgramStag
                 <div
                     key={programStage.id}
                 >
-                    <Button
-                        className={classes.button}
-                        secondary
-                        disabled={disableStage}
-                        onClick={() => onSelectProgramStage(programStage.id)}
-                        dataTest={'program-stage-selector-button'}
-                        icon={
-                            programStage.style?.icon && (
-                                <div className={classes.icon}>
-                                    <NonBundledDhis2Icon
-                                        name={programStage.style?.icon}
-                                        color={programStage.style?.color}
-                                        width={24}
-                                        height={24}
-                                        cornerRadius={5}
-                                    />
-                                </div>
-                            )
-                        }
+                    <ConditionalTooltip
+                        content={i18n.t('You can\'t add any more {{ programStageName }} events', {
+                            programStageName: programStage.displayName,
+                            interpolation: { escapeValue: false },
+                        })}
+                        enabled={disableStage}
                     >
-                        <Tooltip
-                            content={i18n.t('You can’t add any more {{ programStageName }} events', {
-                                programStageName: programStage.displayName,
-                                interpolation: { escapeValue: false },
-                            })}
+                        <Button
+                            className={classes.button}
+                            secondary
+                            disabled={disableStage}
+                            onClick={() => onSelectProgramStage(programStage.id)}
+                            dataTest={'program-stage-selector-button'}
+                            icon={
+                                programStage.style?.icon && (
+                                    <div className={classes.icon}>
+                                        <NonBundledDhis2Icon
+                                            name={programStage.style?.icon}
+                                            color={programStage.style?.color}
+                                            width={24}
+                                            height={24}
+                                            cornerRadius={5}
+                                        />
+                                    </div>
+                                )
+                            }
                         >
-                            {({ onMouseOver, onMouseOut, ref }) => (
-                                <div
-                                    ref={(divRef) => {
-                                        if (divRef && disableStage) {
-                                            divRef.onmouseover = onMouseOver;
-                                            divRef.onmouseout = onMouseOut;
-                                            ref.current = divRef;
-                                        }
-                                    }}
-                                >
-                                    {programStage.displayName}
-                                </div>
-                            )}
-                        </Tooltip>
-                    </Button>
+                            {programStage.displayName}
+                        </Button>
+                    </ConditionalTooltip>
                 </div>
             );
         })}
diff --git a/src/core_modules/capture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js b/src/core_modules/capture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js
index 0af4ee3050..4416248dcf 100644
--- a/src/core_modules/capture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js
+++ b/src/core_modules/capture-core/components/Pages/ViewEvent/EventDetailsSection/EventDetailsSection.component.js
@@ -3,8 +3,9 @@ import React from 'react';
 import { useSelector } from 'react-redux';
 import { dataEntryIds, dataEntryKeys } from 'capture-core/constants';
 import { withStyles } from '@material-ui/core/';
-import { spacers, IconFileDocument24, Tooltip, Button } from '@dhis2/ui';
+import { spacers, IconFileDocument24, Button } from '@dhis2/ui';
 import i18n from '@dhis2/d2-i18n';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { ViewEventSection } from '../Section/ViewEventSection.component';
 import { ViewEventSectionHeader } from '../Section/ViewEventSectionHeader.component';
 import { EditEventDataEntry } from '../../../WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.container';
@@ -96,26 +97,20 @@ const EventDetailsSectionPlain = (props: Props) => {
                 <div
                     className={classes.editButtonContainer}
                 >
-                    <Button
-                        className={classes.button}
-                        onClick={() => onOpenEditEvent(orgUnit)}
-                        disabled={!canEdit}
-                        secondary
-                        small
+                    <ConditionalTooltip
+                        content={i18n.t('You don\'t have access to edit this event')}
+                        enabled={!canEdit}
                     >
-                        <Tooltip content={i18n.t('You don\'t have access to edit this event')}>
-                            {({ onMouseOver, onMouseOut, ref }) => (<div ref={(divRef) => {
-                                if (divRef && !canEdit) {
-                                    divRef.onmouseover = onMouseOver;
-                                    divRef.onmouseout = onMouseOut;
-                                    ref.current = divRef;
-                                }
-                            }}
-                            >
-                                {i18n.t('Edit event')}
-                            </div>)}
-                        </Tooltip>
-                    </Button>
+                        <Button
+                            className={classes.button}
+                            onClick={() => onOpenEditEvent(orgUnit)}
+                            disabled={!canEdit}
+                            secondary
+                            small
+                        >
+                            {i18n.t('Edit event')}
+                        </Button>
+                    </ConditionalTooltip>
                 </div>}
             </div>
         );
diff --git a/src/core_modules/capture-core/components/Relationships/Relationships.component.js b/src/core_modules/capture-core/components/Relationships/Relationships.component.js
index 008653c5e9..2d218e8d22 100644
--- a/src/core_modules/capture-core/components/Relationships/Relationships.component.js
+++ b/src/core_modules/capture-core/components/Relationships/Relationships.component.js
@@ -4,7 +4,8 @@ import * as React from 'react';
 import classNames from 'classnames';
 import i18n from '@dhis2/d2-i18n';
 import { IconButton, withStyles } from '@material-ui/core';
-import { IconArrowRight16, IconCross24, Tooltip, Button } from '@dhis2/ui';
+import { IconArrowRight16, IconCross24, Button } from '@dhis2/ui';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import type { RelationshipType } from '../../metaData';
 import type { Relationship, Entity } from './relationships.types';
 
@@ -61,6 +62,10 @@ const getStyles = (theme: Theme) => ({
     relationshipHighlight: {
         animation: 'background-fade 2.5s forwards',
     },
+    tooltip: {
+        display: 'inline-flex',
+        borderRadius: '100%',
+    },
 });
 
 const fromNames = {
@@ -78,6 +83,7 @@ type Props = {
         arrowIcon: string,
         relationshipActions: string,
         relationshipHighlight: string,
+        tooltip: string,
         addButtonContainer: string,
     },
     relationships: Array<Relationship>,
@@ -132,25 +138,18 @@ class RelationshipsPlain extends React.Component<Props> {
                     </div>
                 </div>
                 <div className={classes.relationshipActions}>
-                    <Tooltip content={i18n.t('You don\'t have access to delete this relationship')}>
-                        {({ onMouseOver, onMouseOut, ref }) => (
-                            <div ref={(divRef) => {
-                                if (divRef && !canDelete) {
-                                    divRef.onmouseover = onMouseOver;
-                                    divRef.onmouseout = onMouseOut;
-                                    ref.current = divRef;
-                                }
-                            }}
-                            >
-                                <IconButton
-                                    onClick={() => { onRemoveRelationship(relationship.clientId); }}
-                                    disabled={!canDelete}
-                                >
-                                    <IconCross24 />
-                                </IconButton>
-                            </div>
-                        )}
-                    </Tooltip>
+                    <ConditionalTooltip
+                        content={i18n.t('You don\'t have access to delete this relationship')}
+                        enabled={!canDelete}
+                        wrapperClassName={classes.tooltip}
+                    >
+                        <IconButton
+                            onClick={() => { onRemoveRelationship(relationship.clientId); }}
+                            disabled={!canDelete}
+                        >
+                            <IconCross24 />
+                        </IconButton>
+                    </ConditionalTooltip>
                 </div>
             </div>
         );
@@ -193,27 +192,19 @@ class RelationshipsPlain extends React.Component<Props> {
                     <div
                         className={classes.addButtonContainer}
                     >
-                        <Button
-                            onClick={onOpenAddRelationship}
-                            disabled={!canCreate}
-                            small={smallMainButton}
-                            dataTest="add-relationship-button"
+                        <ConditionalTooltip
+                            content={i18n.t('You don\'t have access to create any relationships')}
+                            enabled={!canCreate}
                         >
-                            <Tooltip content={i18n.t('You don\'t have access to create any relationships')}>
-                                {({ onMouseOver, onMouseOut, ref }) => (
-                                    <div ref={(divRef) => {
-                                        if (divRef && !canCreate) {
-                                            divRef.onmouseover = onMouseOver;
-                                            divRef.onmouseout = onMouseOut;
-                                            ref.current = divRef;
-                                        }
-                                    }}
-                                    >
-                                        {i18n.t('Add relationship')}
-                                    </div>
-                                )}
-                            </Tooltip>
-                        </Button>
+                            <Button
+                                onClick={onOpenAddRelationship}
+                                disabled={!canCreate}
+                                small={smallMainButton}
+                                dataTest="add-relationship-button"
+                            >
+                                {i18n.t('Add relationship')}
+                            </Button>
+                        </ConditionalTooltip>
                     </div>
                 </div>
             </div>
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/AddNew/AddNew.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/AddNew/AddNew.component.js
index e576a3ec0e..e4ec61be1b 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/AddNew/AddNew.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/AddNew/AddNew.component.js
@@ -1,7 +1,8 @@
 // @flow
-import { IconAdd16, MenuItem, Tooltip } from '@dhis2/ui';
+import { IconAdd16, MenuItem } from '@dhis2/ui';
 import React from 'react';
 import i18n from '@dhis2/d2-i18n';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import type { Props } from './addNew.types';
 
 export const AddNew = ({ canAddNew, onlyEnrollOnce, tetName, onAddNew }: Props) => {
@@ -9,27 +10,18 @@ export const AddNew = ({ canAddNew, onlyEnrollOnce, tetName, onAddNew }: Props)
         return null;
     }
 
-    return (<Tooltip
-        content={i18n.t('Only one enrollment per {{tetName}} is allowed in this program', { tetName })}
-    >
-        {({ onMouseOver, onMouseOut, ref }) => (
-            <div ref={(divRef) => {
-                if (divRef && onlyEnrollOnce) {
-                    divRef.onmouseover = onMouseOver;
-                    divRef.onmouseout = onMouseOut;
-                    ref.current = divRef;
-                }
-            }}
-            >
-                <MenuItem
-                    dense
-                    dataTest="widget-enrollment-actions-add-new"
-                    onClick={onAddNew}
-                    icon={<IconAdd16 />}
-                    label={i18n.t('Add new')}
-                    disabled={onlyEnrollOnce}
-                />
-            </div>
-        )}
-    </Tooltip>);
+    return (
+        <ConditionalTooltip
+            content={i18n.t('Only one enrollment per {{tetName}} is allowed in this program', { tetName })}
+            enabled={onlyEnrollOnce}
+        >
+            <MenuItem
+                dense
+                dataTest="widget-enrollment-actions-add-new"
+                onClick={onAddNew}
+                icon={<IconAdd16 />}
+                label={i18n.t('Add new')}
+                disabled={onlyEnrollOnce}
+            />
+        </ConditionalTooltip>);
 };
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/withMainButton.js b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/withMainButton.js
index 34e93f3184..42491ef4ab 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/withMainButton.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/withMainButton.js
@@ -2,7 +2,8 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
 import i18n from '@dhis2/d2-i18n';
-import { Tooltip, Button } from '@dhis2/ui';
+import { Button } from '@dhis2/ui';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { type RenderFoundation } from '../../../metaData';
 
 type Props = {
@@ -19,23 +20,18 @@ const getMainButton = (InnerComponent: React.ComponentType<any>) =>
             return this.innerInstance;
         }
         renderMainButton = (hasWriteAccess: boolean) => (
-            <Tooltip content={i18n.t('No write access')}>
-                {({ onMouseOver, onMouseOut, ref }) => (
-                    <Button
-                        onClick={() => { this.props.onSave(); }}
-                        disabled={!hasWriteAccess}
-                        primary
-                        ref={(divRef) => {
-                            if (divRef && !hasWriteAccess) {
-                                divRef.onmouseover = onMouseOver;
-                                divRef.onmouseout = onMouseOut;
-                                ref.current = divRef;
-                            }
-                        }}
-                    >
-                        {i18n.t('Save')}
-                    </Button>)}
-            </Tooltip>
+            <ConditionalTooltip
+                content={i18n.t('No write access')}
+                enabled={!hasWriteAccess}
+            >
+                <Button
+                    onClick={() => { this.props.onSave(); }}
+                    disabled={!hasWriteAccess}
+                    primary
+                >
+                    {i18n.t('Save')}
+                </Button>
+            </ConditionalTooltip>
         )
 
         render() {
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
index 6cba9acf96..4c4196fcfe 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -2,9 +2,10 @@
 import React, { type ComponentType } from 'react';
 import { dataEntryIds, dataEntryKeys } from 'capture-core/constants';
 import { useDispatch } from 'react-redux';
-import { spacersNum, Button, colors, IconEdit24, IconArrowLeft24, Tooltip } from '@dhis2/ui';
+import { spacersNum, Button, colors, IconEdit24, IconArrowLeft24 } from '@dhis2/ui';
 import { withStyles } from '@material-ui/core';
 import i18n from '@dhis2/d2-i18n';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { useEnrollmentEditEventPageMode, useRulesEngineOrgUnit, useAvailableProgramStages } from 'capture-core/hooks';
 import type { Props } from './widgetEventEdit.types';
 import { startShowEditEventDataEntry } from './WidgetEventEdit.actions';
@@ -39,6 +40,7 @@ const styles = {
         borderBottomWidth: 0,
     },
     button: { margin: spacersNum.dp8 },
+    tooltip: { display: 'inline-flex' },
 };
 
 export const WidgetEventEditPlain = ({
@@ -75,32 +77,23 @@ export const WidgetEventEditPlain = ({
                 </Button>
 
                 {currentPageMode === dataEntryKeys.VIEW && (
-                    <Tooltip
-                        content={i18n.t('You don\'t have access to edit this event')}
-                    >
-                        {({ onMouseOver, onMouseOut, ref }) => (
-                            <div
-                                ref={(btnRef) => {
-                                    if (btnRef && !eventAccess?.write) {
-                                        btnRef.onmouseover = onMouseOver;
-                                        btnRef.onmouseout = onMouseOut;
-                                        ref.current = btnRef;
-                                    }
-                                }}
+                    <div className={classes.button}>
+                        <ConditionalTooltip
+                            content={i18n.t('You don\'t have access to edit this event')}
+                            enabled={!eventAccess?.write}
+                            wrapperClassName={classes.tooltip}
+                        >
+                            <Button
+                                small
+                                secondary
+                                disabled={!eventAccess?.write}
+                                onClick={() => dispatch(startShowEditEventDataEntry(orgUnit, programCategory))}
                             >
-                                <Button
-                                    small
-                                    secondary
-                                    disabled={!eventAccess?.write}
-                                    className={classes.button}
-                                    onClick={() => dispatch(startShowEditEventDataEntry(orgUnit, programCategory))}
-                                >
-                                    <IconEdit24 />
-                                    {i18n.t('Edit event')}
-                                </Button>
-                            </div>
-                        )}
-                    </Tooltip>
+                                <IconEdit24 />
+                                {i18n.t('Edit event')}
+                            </Button>
+                        </ConditionalTooltip>
+                    </div>
                 )}
             </div>
             <Widget
diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
index c76e617668..5b45f31d6f 100644
--- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
+++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
@@ -16,6 +16,7 @@ import { colors,
     IconAdd16,
     Tooltip,
 } from '@dhis2/ui';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { sortDataFromEvent } from './hooks/sortFuntions';
 import { useComputeDataFromEvent, useComputeHeaderColumn, formatRowForView } from './hooks/useEventList';
 import { DEFAULT_NUMBER_OF_ROW, SORT_DIRECTION } from './hooks/constants';
@@ -146,17 +147,20 @@ const StageDetailPlain = (props: Props) => {
                                 key={id}
                                 onClick={() => !row.pendingApiResponse && onEventClick(row.id)}
                                 ref={(tableCell) => {
-                                    if (tableCell && row.pendingApiResponse) {
-                                        tableCell.onmouseover = onMouseOver;
-                                        tableCell.onmouseout = onMouseOut;
-                                        ref.current = tableCell;
+                                    if (tableCell) {
+                                        if (row.pendingApiResponse) {
+                                            tableCell.onmouseover = onMouseOver;
+                                            tableCell.onmouseout = onMouseOut;
+                                            ref.current = tableCell;
+                                        } else {
+                                            tableCell.onmouseover = null;
+                                            tableCell.onmouseout = null;
+                                        }
                                     }
                                 }}
                             >
                                 <div>
-                                    { // $FlowFixMe
-                                        row[id]
-                                    }
+                                    {row[id]}
                                 </div>
                             </DataTableCell>
                         )}
@@ -212,35 +216,26 @@ const StageDetailPlain = (props: Props) => {
         const renderCreateNewButton = () => {
             const shouldDisableCreateNew = !repeatable && events.length > 0;
 
-            return (<Button
-                small
-                secondary
-                icon={<IconAdd16 />}
-                disabled={shouldDisableCreateNew}
-                className={classes.button}
-                dataTest="create-new-button"
-                onClick={handleCreateNew}
-            >
-                <Tooltip
+            return (
+                <ConditionalTooltip
                     content={i18n.t('This stage can only have one event')}
+                    enabled={shouldDisableCreateNew}
                     closeDelay={50}
                 >
-                    {({ onMouseOver, onMouseOut, ref }) => (
-                        <div ref={(divRef) => {
-                            if (divRef && shouldDisableCreateNew) {
-                                divRef.onmouseover = onMouseOver;
-                                divRef.onmouseout = onMouseOut;
-                                ref.current = divRef;
-                            }
-                        }}
-                        >
-                            {i18n.t('New {{ eventName }} event', {
-                                eventName, interpolation: { escapeValue: false },
-                            })}
-                        </div>
-                    )}
-                </Tooltip>
-            </Button>);
+                    <Button
+                        small
+                        secondary
+                        icon={<IconAdd16 />}
+                        disabled={shouldDisableCreateNew}
+                        dataTest="create-new-button"
+                        onClick={handleCreateNew}
+                    >
+                        {i18n.t('New {{ eventName }} event', {
+                            eventName, interpolation: { escapeValue: false },
+                        })}
+                    </Button>
+                </ConditionalTooltip>
+            );
         };
 
         return (

From 61e67c0ad4f67983f9e26584b23ecb9a93466aa2 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Tue, 22 Aug 2023 07:54:49 +0000
Subject: [PATCH 06/16] chore(release): cut 100.35.8 [skip release]

## [100.35.8](https://github.com/dhis2/capture-app/compare/v100.35.7...v100.35.8) (2023-08-22)

### Bug Fixes

* [DHIS2-15492] transition of tooltip enabled state ([#3381](https://github.com/dhis2/capture-app/issues/3381)) ([adb6b32](https://github.com/dhis2/capture-app/commit/adb6b32f1bffc5020ca34ab5c7568b5a323a8002))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b08e5419b2..de3b8dc83f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.35.8](https://github.com/dhis2/capture-app/compare/v100.35.7...v100.35.8) (2023-08-22)
+
+
+### Bug Fixes
+
+* [DHIS2-15492] transition of tooltip enabled state ([#3381](https://github.com/dhis2/capture-app/issues/3381)) ([adb6b32](https://github.com/dhis2/capture-app/commit/adb6b32f1bffc5020ca34ab5c7568b5a323a8002))
+
 ## [100.35.7](https://github.com/dhis2/capture-app/compare/v100.35.6...v100.35.7) (2023-08-15)
 
 
diff --git a/package.json b/package.json
index a30eb6b11b..a2c55c2fb5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.35.7",
+    "version": "100.35.8",
     "cacheVersion": "5",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.35.7",
+        "@dhis2/rules-engine-javascript": "100.35.8",
         "@dhis2/app-runtime": "^3.8.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 1bbbde72e4..461a0b57a6 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.35.7",
+    "version": "100.35.8",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From 2e4747719151b042d3539fe61a612ebd0ac122d4 Mon Sep 17 00:00:00 2001
From: eirikhaugstulen <eirik.haugstulen@gmail.com>
Date: Tue, 22 Aug 2023 10:40:18 +0200
Subject: [PATCH 07/16] fix: [DHIS2-15700] Option sets not working in TEI
 Registration

---
 .../useMetadataForRegistrationForm.js                         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/useMetadataForRegistrationForm.js b/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/useMetadataForRegistrationForm.js
index d018aa4c1d..97488cf7fd 100644
--- a/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/useMetadataForRegistrationForm.js
+++ b/src/core_modules/capture-core/components/DataEntries/common/TEIAndEnrollment/useMetadataForRegistrationForm/useMetadataForRegistrationForm.js
@@ -33,7 +33,9 @@ export const useMetadataForRegistrationForm = ({ selectedScopeId }: Props) => {
                 .map(({ trackedEntityAttributeId }) => trackedEntityAttributeId);
         }
         if (scopeType === scopeTypes.TRACKED_ENTITY_TYPE && trackedEntityType) {
-            return trackedEntityType.trackedEntityTypeAttributes.map(({ id }) => id);
+            return trackedEntityType
+                .trackedEntityTypeAttributes
+                .map(({ trackedEntityAttributeId }) => trackedEntityAttributeId);
         }
         return undefined;
     }, [program, scopeType, trackedEntityType]);

From 8877225e16c235bee2d288bc0d94fbcf99e63158 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Tue, 22 Aug 2023 08:49:11 +0000
Subject: [PATCH 08/16] chore(release): cut 100.35.9 [skip release]

## [100.35.9](https://github.com/dhis2/capture-app/compare/v100.35.8...v100.35.9) (2023-08-22)

### Bug Fixes

* [DHIS2-15700] Option sets not working in TEI Registration ([2e47477](https://github.com/dhis2/capture-app/commit/2e4747719151b042d3539fe61a612ebd0ac122d4))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de3b8dc83f..e54554fbdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.35.9](https://github.com/dhis2/capture-app/compare/v100.35.8...v100.35.9) (2023-08-22)
+
+
+### Bug Fixes
+
+* [DHIS2-15700] Option sets not working in TEI Registration ([2e47477](https://github.com/dhis2/capture-app/commit/2e4747719151b042d3539fe61a612ebd0ac122d4))
+
 ## [100.35.8](https://github.com/dhis2/capture-app/compare/v100.35.7...v100.35.8) (2023-08-22)
 
 
diff --git a/package.json b/package.json
index a2c55c2fb5..dd9abcbc98 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.35.8",
+    "version": "100.35.9",
     "cacheVersion": "5",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.35.8",
+        "@dhis2/rules-engine-javascript": "100.35.9",
         "@dhis2/app-runtime": "^3.8.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 461a0b57a6..f6e6396be2 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.35.8",
+    "version": "100.35.9",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From c5d9a7d57547153dd62cf36c8e3323685f43978f Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Tue, 22 Aug 2023 12:55:01 +0200
Subject: [PATCH 09/16] feat: [DHIS2-15229] search for MULTI_TEXT (#3395)

---
 .../possibleDuplicatesDialog.epics.js            |  5 +++--
 .../SearchBox/SearchForm/SearchForm.epics.js     |  6 ------
 .../SearchFormElementConverter.js                |  4 ++--
 .../components/TeiSearch/serverToFilters.js      | 16 +++++++++++-----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/core_modules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js b/src/core_modules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js
index f1a26604b0..5375ad7eca 100644
--- a/src/core_modules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js
+++ b/src/core_modules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js
@@ -9,7 +9,7 @@ import {
     duplicatesForReviewRetrievalFailed,
 } from './possibleDuplicatesDialog.actions';
 import {
-    scopeTypes, getScopeFromScopeId, EventProgram, TrackerProgram, TrackedEntityType,
+    scopeTypes, getScopeFromScopeId, EventProgram, TrackerProgram, TrackedEntityType, dataElementTypes,
 } from '../../metaData';
 import { getDataEntryKey } from '../DataEntry/common/getDataEntryKey';
 import { convertFormToClient, convertClientToServer } from '../../converters';
@@ -65,7 +65,8 @@ export const loadSearchGroupDuplicatesForReviewEpic = (
                             return null;
                         }
                         const serverValue = element.convertValue(value, pipeD2(convertFormToClient, convertClientToServer));
-                        return `${element.id}:${element.optionSet ? 'eq' : 'like'}:${serverValue}`;
+                        const hasOptionSet = element.optionSet && element.type !== dataElementTypes.MULTI_TEXT;
+                        return `${element.id}:${hasOptionSet ? 'eq' : 'like'}:${serverValue}`;
                     })
                     .filter(f => f);
 
diff --git a/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchForm.epics.js b/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchForm.epics.js
index f9aa25f38e..753dea334b 100644
--- a/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchForm.epics.js
+++ b/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchForm.epics.js
@@ -17,7 +17,6 @@ import {
     getTrackedEntityInstances,
 } from '../../../trackedEntityInstances/trackedEntityInstanceRequests';
 import {
-    type DataElement,
     dataElementTypes,
     getTrackedEntityTypeThrowIfNotFound,
     getTrackerProgramThrowIfNotFound,
@@ -67,11 +66,6 @@ const searchViaUniqueIdStream = ({
         catchError(() => of(showErrorViewOnSearchBox())),
     );
 
-export const deriveFilterKeyword = (fieldId: string, attributes: Array<DataElement>): ("eq" | "like") => {
-    const hasOptionSet = Boolean(attributes.find(({ id, optionSet }) => (id === fieldId) && (optionSet)));
-    return hasOptionSet ? 'eq' : 'like';
-};
-
 const getFiltersForAttributesSearchQuery = (formValues, attributes) => Object.keys(formValues)
     .filter(fieldId => formValues[fieldId])
     .filter((fieldId) => {
diff --git a/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchFormElementConverter/SearchFormElementConverter.js b/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchFormElementConverter/SearchFormElementConverter.js
index a07af2134b..7d5e282ee7 100644
--- a/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchFormElementConverter/SearchFormElementConverter.js
+++ b/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchFormElementConverter/SearchFormElementConverter.js
@@ -1,12 +1,12 @@
 // @flow
 import { pipe as pipeD2 } from '../../../../../capture-core-utils';
 import { convertClientToServer, convertFormToClient } from '../../../../converters';
-import { type DataElement } from '../../../../metaData';
+import { type DataElement, dataElementTypes } from '../../../../metaData';
 
 type FormValues = { [key: string]: any}
 
 const derivedFilterKeyword = (dataElement) => {
-    const hasOptionSet = !!dataElement.optionSet;
+    const hasOptionSet = dataElement.optionSet && dataElement.type !== dataElementTypes.MULTI_TEXT;
     return hasOptionSet ? 'eq' : 'like';
 };
 
diff --git a/src/core_modules/capture-core/components/TeiSearch/serverToFilters.js b/src/core_modules/capture-core/components/TeiSearch/serverToFilters.js
index e9da576888..06d24bad32 100644
--- a/src/core_modules/capture-core/components/TeiSearch/serverToFilters.js
+++ b/src/core_modules/capture-core/components/TeiSearch/serverToFilters.js
@@ -10,12 +10,18 @@ const equals = (value: any, elementId: string) => `${elementId}:eq:${value}`;
 const like = (value: any, elementId: string) => `${elementId}:like:${value}`;
 
 
-function convertRange(value: RangeValue, elementId: string) {
-    return `${elementId}:ge:${value.from}:le:${value.to}`;
-}
+const convertRange = (value: RangeValue, { id: elementId }: DataElement) => (
+    `${elementId}:ge:${value.from}:le:${value.to}`
+);
+
+const convertString = (value: any, metaElement: DataElement) => {
+    const hasOptionSet = metaElement.optionSet && metaElement.type !== dataElementTypes.MULTI_TEXT;
+    return hasOptionSet ? equals(value, metaElement.id) : like(value, metaElement.id);
+};
 
 const valueConvertersForType = {
-    [dataElementTypes.TEXT]: like,
+    [dataElementTypes.TEXT]: convertString,
+    [dataElementTypes.MULTI_TEXT]: convertString,
     [dataElementTypes.NUMBER_RANGE]: convertRange,
     [dataElementTypes.DATE_RANGE]: convertRange,
     [dataElementTypes.DATETIME_RANGE]: convertRange,
@@ -27,7 +33,7 @@ export function convertValue(value: any, type: $Keys<typeof dataElementTypes>, m
         return value;
     }
     // $FlowFixMe dataElementTypes flow error
-    return valueConvertersForType[type] ? valueConvertersForType[type](value, metaElement.id) : equals(value, metaElement.id);
+    return valueConvertersForType[type] ? valueConvertersForType[type](value, metaElement) : equals(value, metaElement.id);
 }
 
 export function convertValueToEqual(value: any, type: $Keys<typeof dataElementTypes>, metaElement: DataElement) {

From b01a793302db6a315cbdb7d0548b515a77e3adb0 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Tue, 22 Aug 2023 11:02:36 +0000
Subject: [PATCH 10/16] chore(release): cut 100.36.0 [skip release]

# [100.36.0](https://github.com/dhis2/capture-app/compare/v100.35.9...v100.36.0) (2023-08-22)

### Features

* [DHIS2-15229] search for MULTI_TEXT ([#3395](https://github.com/dhis2/capture-app/issues/3395)) ([c5d9a7d](https://github.com/dhis2/capture-app/commit/c5d9a7d57547153dd62cf36c8e3323685f43978f))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e54554fbdc..2b4d14cfea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [100.36.0](https://github.com/dhis2/capture-app/compare/v100.35.9...v100.36.0) (2023-08-22)
+
+
+### Features
+
+* [DHIS2-15229] search for MULTI_TEXT ([#3395](https://github.com/dhis2/capture-app/issues/3395)) ([c5d9a7d](https://github.com/dhis2/capture-app/commit/c5d9a7d57547153dd62cf36c8e3323685f43978f))
+
 ## [100.35.9](https://github.com/dhis2/capture-app/compare/v100.35.8...v100.35.9) (2023-08-22)
 
 
diff --git a/package.json b/package.json
index dd9abcbc98..09e12cba11 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.35.9",
+    "version": "100.36.0",
     "cacheVersion": "5",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.35.9",
+        "@dhis2/rules-engine-javascript": "100.36.0",
         "@dhis2/app-runtime": "^3.8.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index f6e6396be2..f8ae9bbd9b 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.35.9",
+    "version": "100.36.0",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From 5db743eaf7f67bbb4a9391ac9ade25317e4d3642 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Tue, 22 Aug 2023 15:30:25 +0200
Subject: [PATCH 11/16] feat: [DHIS2-15299] escape value for attribute filter
 (#3403)

---
 cypress/integration/SearchPage.feature            |  8 --------
 cypress/integration/SearchPage/index.js           | 13 -------------
 i18n/en.pot                                       |  8 ++++----
 .../possibleDuplicatesDialog.epics.js             |  3 ++-
 .../SearchBox/SearchForm/SearchForm.epics.js      |  3 ++-
 .../SearchFormElementConverter.js                 |  5 +++--
 .../components/TeiSearch/serverToFilters.js       |  5 +++--
 .../DataEntry/FormFoundation/DataElement.js       |  6 +++---
 .../DataEntry/helpers/escapeString.js             | 14 ++++++++++++++
 .../WidgetProfile/DataEntry/helpers/index.js      |  1 +
 .../optionSet/optionSetConverter.js               |  3 ++-
 .../filterConverters/textConverter.js             |  3 ++-
 .../capture-core/converters/clientToServer.js     |  4 ++--
 .../factory/enrollment/DataElementFactory.js      |  5 +++--
 .../TrackedEntityType/DataElementFactory.js       |  5 +++--
 .../capture-core/utils/escapeString.js            | 15 +++++++++++++++
 16 files changed, 59 insertions(+), 42 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/escapeString.js
 create mode 100644 src/core_modules/capture-core/utils/escapeString.js

diff --git a/cypress/integration/SearchPage.feature b/cypress/integration/SearchPage.feature
index ea30752589..0f98fdfdfc 100644
--- a/cypress/integration/SearchPage.feature
+++ b/cypress/integration/SearchPage.feature
@@ -37,14 +37,6 @@ Feature: User interacts with Search page
     #     And you click search
     #     Then you should see no results found
 
-    Scenario: Searching using attributes in Tracker Program throws error
-        Given you are on the default search page
-        When you select the search domain Malaria Case diagnosis
-        And you expand the attributes search area
-        And you fill in the first name with values that will return an error
-        And you click search
-        Then there should be an generic error message
-
     Scenario: Searching using attributes in Tracker Program is invalid because no terms typed
         Given you are on the default search page
         When you select the search domain Malaria Case diagnosis
diff --git a/cypress/integration/SearchPage/index.js b/cypress/integration/SearchPage/index.js
index 40868ea394..93d0212d34 100644
--- a/cypress/integration/SearchPage/index.js
+++ b/cypress/integration/SearchPage/index.js
@@ -151,19 +151,6 @@ When('for Person you fill in values that will return less than 5 results', () =>
         .blur();
 });
 
-When('you fill in the first name with values that will return an error', () => {
-    cy.get('[data-test="form-attributes"]')
-        .find('[data-test="capture-ui-input"]')
-        .first()
-        .type(',,,,')
-        .blur();
-});
-
-Then('there should be an generic error message', () => {
-    cy.get('[data-test="general-purpose-error-mesage"]')
-        .should('exist');
-});
-
 When('you dont fill in any of the values', () => {
     cy.get('[data-test="form-attributes"]')
         .find('[data-test="capture-ui-input"]')
diff --git a/i18n/en.pot b/i18n/en.pot
index 3119626801..ff0db59ce7 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-06-01T08:11:59.116Z\n"
-"PO-Revision-Date: 2023-06-01T08:11:59.116Z\n"
+"POT-Creation-Date: 2023-08-22T12:04:52.436Z\n"
+"PO-Revision-Date: 2023-08-22T12:04:52.436Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -775,8 +775,8 @@ msgstr "Schedule"
 msgid "Refer"
 msgstr "Refer"
 
-msgid "You can’t add any more {{ programStageName }} events"
-msgstr "You can’t add any more {{ programStageName }} events"
+msgid "You can't add any more {{ programStageName }} events"
+msgstr "You can't add any more {{ programStageName }} events"
 
 msgid "Cancel without saving"
 msgstr "Cancel without saving"
diff --git a/src/core_modules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js b/src/core_modules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js
index 5375ad7eca..515eee121d 100644
--- a/src/core_modules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js
+++ b/src/core_modules/capture-core/components/PossibleDuplicatesDialog/possibleDuplicatesDialog.epics.js
@@ -16,6 +16,7 @@ import { convertFormToClient, convertClientToServer } from '../../converters';
 import { getTrackedEntityInstances } from '../../trackedEntityInstances/trackedEntityInstanceRequests';
 import { getAttributesFromScopeId } from '../../metaData/helpers';
 import { searchGroupDuplicateActionTypes } from '../../components/Pages/NewRelationship/RegisterTei';
+import { escapeString } from '../../utils/escapeString';
 
 function getGroupElementsFromScopeId(scopeId: ?string) {
     if (!scopeId) {
@@ -66,7 +67,7 @@ export const loadSearchGroupDuplicatesForReviewEpic = (
                         }
                         const serverValue = element.convertValue(value, pipeD2(convertFormToClient, convertClientToServer));
                         const hasOptionSet = element.optionSet && element.type !== dataElementTypes.MULTI_TEXT;
-                        return `${element.id}:${hasOptionSet ? 'eq' : 'like'}:${serverValue}`;
+                        return `${element.id}:${hasOptionSet ? 'eq' : 'like'}:${escapeString(serverValue)}`;
                     })
                     .filter(f => f);
 
diff --git a/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchForm.epics.js b/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchForm.epics.js
index 753dea334b..9f50c5e821 100644
--- a/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchForm.epics.js
+++ b/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchForm.epics.js
@@ -28,11 +28,12 @@ import {
 } from '../../../actions/navigateToEnrollmentOverview/navigateToEnrollmentOverview.actions';
 import { dataElementConvertFunctions } from './SearchFormElementConverter/SearchFormElementConverter';
 import type { QuerySingleResource } from '../../../utils/api/api.types';
+import { escapeString } from '../../../utils/escapeString';
 
 
 const getFiltersForUniqueIdSearchQuery = (formValues) => {
     const fieldId = Object.keys(formValues)[0];
-    return [`${fieldId}:eq:${formValues[fieldId]}`];
+    return [`${fieldId}:eq:${escapeString(formValues[fieldId])}`];
 };
 
 const searchViaUniqueIdStream = ({
diff --git a/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchFormElementConverter/SearchFormElementConverter.js b/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchFormElementConverter/SearchFormElementConverter.js
index 7d5e282ee7..5153fc5454 100644
--- a/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchFormElementConverter/SearchFormElementConverter.js
+++ b/src/core_modules/capture-core/components/SearchBox/SearchForm/SearchFormElementConverter/SearchFormElementConverter.js
@@ -2,6 +2,7 @@
 import { pipe as pipeD2 } from '../../../../../capture-core-utils';
 import { convertClientToServer, convertFormToClient } from '../../../../converters';
 import { type DataElement, dataElementTypes } from '../../../../metaData';
+import { escapeString } from '../../../../utils/escapeString';
 
 type FormValues = { [key: string]: any}
 
@@ -13,7 +14,7 @@ const derivedFilterKeyword = (dataElement) => {
 const convertString = (formValues: string, dataElement: DataElement) => {
     const sanitizedString = formValues.trim();
     const convertedString = (dataElement.convertValue(sanitizedString, pipeD2(convertFormToClient, convertClientToServer)));
-    return `${dataElement.id}:${derivedFilterKeyword(dataElement)}:${convertedString}`;
+    return `${dataElement.id}:${derivedFilterKeyword(dataElement)}:${escapeString(convertedString)}`;
 };
 
 const convertRange = (formValues: FormValues, dataElement: DataElement) => {
@@ -38,7 +39,7 @@ const convertAge = (formValues: FormValues, dataElement: DataElement) => {
 
 const convertFile = (formValues: FormValues, dataElement: DataElement) => {
     const convertedFileName = (dataElement.convertValue(formValues, pipeD2(convertFormToClient, convertClientToServer)));
-    return `${dataElement.id}:${derivedFilterKeyword(dataElement)}:${convertedFileName}`;
+    return `${dataElement.id}:${derivedFilterKeyword(dataElement)}:${escapeString(convertedFileName)}`;
 };
 
 const convertBoolean = (formValues: boolean, dataElement: DataElement) => {
diff --git a/src/core_modules/capture-core/components/TeiSearch/serverToFilters.js b/src/core_modules/capture-core/components/TeiSearch/serverToFilters.js
index 06d24bad32..afbf8a2b49 100644
--- a/src/core_modules/capture-core/components/TeiSearch/serverToFilters.js
+++ b/src/core_modules/capture-core/components/TeiSearch/serverToFilters.js
@@ -1,13 +1,14 @@
 // @flow
 import { type DataElement, dataElementTypes } from '../../metaData';
+import { escapeString } from '../../utils/escapeString';
 
 type RangeValue = {
     from: number,
     to: number,
 }
 
-const equals = (value: any, elementId: string) => `${elementId}:eq:${value}`;
-const like = (value: any, elementId: string) => `${elementId}:like:${value}`;
+const equals = (value: any, elementId: string) => `${elementId}:eq:${escapeString(value)}`;
+const like = (value: any, elementId: string) => `${elementId}:like:${escapeString(value)}`;
 
 
 const convertRange = (value: RangeValue, { id: elementId }: DataElement) => (
diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/FormFoundation/DataElement.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/FormFoundation/DataElement.js
index 49c24f8a0e..c8e09b913c 100644
--- a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/FormFoundation/DataElement.js
+++ b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/FormFoundation/DataElement.js
@@ -19,7 +19,7 @@ import { convertFormToClient, convertClientToServer } from '../../../../converte
 import { convertOptionSetValue } from '../../../../converters/serverToClient';
 import { buildIcon } from '../../../../metaDataMemoryStoreBuilders/common/helpers';
 import { OptionGroup } from '../../../../metaData/OptionSet/OptionGroup';
-import { getFeatureType, getDataElement, getLabel, isNotValidOptionSet } from '../helpers';
+import { getFeatureType, getDataElement, getLabel, isNotValidOptionSet, escapeString } from '../helpers';
 import type { QuerySingleResource } from '../../../../utils/api/api.types';
 
 const OPTION_SET_NOT_FOUND = 'Optionset not found';
@@ -67,7 +67,7 @@ const buildDataElementUnique = (
                     params: {
                         program: contextProps.programId,
                         orgUnit: orgUnitId,
-                        filter: `${dataElement.id}:EQ:${serverValue}`,
+                        filter: `${dataElement.id}:EQ:${escapeString(serverValue)}`,
                     },
                 });
             } else {
@@ -76,7 +76,7 @@ const buildDataElementUnique = (
                     params: {
                         program: contextProps.programId,
                         ouMode: 'ACCESSIBLE',
-                        filter: `${dataElement.id}:EQ:${serverValue}`,
+                        filter: `${dataElement.id}:EQ:${escapeString(serverValue)}`,
                     },
                 });
             }
diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/escapeString.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/escapeString.js
new file mode 100644
index 0000000000..ef28a44a1d
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/escapeString.js
@@ -0,0 +1,14 @@
+// @flow
+
+const valueToEscape = Object.freeze({
+    COLON: ':',
+    COMMA: ',',
+    SLASH: '/',
+});
+const escape = '/';
+
+export const escapeString = (value: string): string =>
+    value
+        .replace(new RegExp(valueToEscape.SLASH, 'g'), `${escape}${valueToEscape.SLASH}`)
+        .replace(new RegExp(valueToEscape.COLON, 'g'), `${escape}${valueToEscape.COLON}`)
+        .replace(new RegExp(valueToEscape.COMMA, 'g'), `${escape}${valueToEscape.COMMA}`);
diff --git a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/index.js b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/index.js
index 5782f0f6e7..9a9b94144a 100644
--- a/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/index.js
+++ b/src/core_modules/capture-core/components/WidgetProfile/DataEntry/helpers/index.js
@@ -15,3 +15,4 @@ export {
 export { GEOMETRY, getFeatureType, getDataElement, getLabel } from './geometry';
 export { convertClientToView } from './convertClientToView';
 export { isNotValidOptionSet } from './isNotValidOptionSet';
+export { escapeString } from './escapeString';
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/optionSet/optionSetConverter.js b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/optionSet/optionSetConverter.js
index 7524405217..cd35012202 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/optionSet/optionSetConverter.js
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/optionSet/optionSetConverter.js
@@ -3,13 +3,14 @@ import { pipe } from 'capture-core-utils';
 import { convertDataTypeValueToRequest } from './basicDataTypeConverters';
 import { typeof dataElementTypes } from '../../../../../../../metaData';
 import type { OptionSetFilterData } from '../../../../../../ListView';
+import { escapeString } from '../../../../../../../utils/escapeString';
 
 export function convertOptionSet(
     sourceValue: OptionSetFilterData,
     type: $Keys<dataElementTypes>,
 ) {
     return pipe(
-        values => values.map(filterValue => convertDataTypeValueToRequest(filterValue, type)),
+        values => values.map(filterValue => escapeString(convertDataTypeValueToRequest(filterValue, type))),
         values => values.join(';'),
         valueString => `in:${valueString}`,
     )(sourceValue.values);
diff --git a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/textConverter.js b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/textConverter.js
index a14959a232..b3b3db672d 100644
--- a/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/textConverter.js
+++ b/src/core_modules/capture-core/components/WorkingLists/WorkingListsCommon/helpers/buildFilterQueryArgs/filterConverters/textConverter.js
@@ -1,6 +1,7 @@
 // @flow
 import type { TextFilterData } from '../../../../../ListView';
+import { escapeString } from '../../../../../../utils/escapeString';
 
 export function convertText(filter: TextFilterData) {
-    return `like:${filter.value}`;
+    return `like:${escapeString(filter.value)}`;
 }
diff --git a/src/core_modules/capture-core/converters/clientToServer.js b/src/core_modules/capture-core/converters/clientToServer.js
index 9612390eed..7477352af6 100644
--- a/src/core_modules/capture-core/converters/clientToServer.js
+++ b/src/core_modules/capture-core/converters/clientToServer.js
@@ -4,8 +4,8 @@ import { dataElementTypes } from '../metaData';
 import { stringifyNumber } from './common/stringifyNumber';
 
 type RangeValue = {
-    from: any,
-    to: any,
+    from: number,
+    to: number,
 }
 
 
diff --git a/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/DataElementFactory.js b/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/DataElementFactory.js
index 1ad7926f75..3fa73e1130 100644
--- a/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/DataElementFactory.js
+++ b/src/core_modules/capture-core/metaDataMemoryStoreBuilders/programs/factory/enrollment/DataElementFactory.js
@@ -21,6 +21,7 @@ import { convertFormToClient, convertClientToServer } from '../../../../converte
 import type { ConstructorInput } from './dataElementFactory.types';
 import type { QuerySingleResource } from '../../../../utils/api/api.types';
 import { isNotValidOptionSet } from '../../../../utils/isNotValidOptionSet';
+import { escapeString } from '../../../../utils/escapeString';
 
 export class DataElementFactory {
     static translationPropertyNames = {
@@ -88,7 +89,7 @@ export class DataElementFactory {
                         params: {
                             program: contextProps.programId,
                             orgUnit: orgUnitId,
-                            filter: `${dataElement.id}:EQ:${serverValue}`,
+                            filter: `${dataElement.id}:EQ:${escapeString(serverValue)}`,
                         },
                     });
                 } else {
@@ -97,7 +98,7 @@ export class DataElementFactory {
                         params: {
                             program: contextProps.programId,
                             ouMode: 'ACCESSIBLE',
-                            filter: `${dataElement.id}:EQ:${serverValue}`,
+                            filter: `${dataElement.id}:EQ:${escapeString(serverValue)}`,
                         },
                     });
                 }
diff --git a/src/core_modules/capture-core/metaDataMemoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/DataElementFactory.js b/src/core_modules/capture-core/metaDataMemoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/DataElementFactory.js
index 3a9f1b929e..bc27da80ed 100644
--- a/src/core_modules/capture-core/metaDataMemoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/DataElementFactory.js
+++ b/src/core_modules/capture-core/metaDataMemoryStoreBuilders/trackedEntityTypes/factory/TrackedEntityType/DataElementFactory.js
@@ -19,6 +19,7 @@ import { convertFormToClient, convertClientToServer } from '../../../../converte
 import type { ConstructorInput } from './dataElementFactory.types';
 import type { QuerySingleResource } from '../../../../utils/api/api.types';
 import { isNotValidOptionSet } from '../../../../utils/isNotValidOptionSet';
+import { escapeString } from '../../../../utils/escapeString';
 
 export class DataElementFactory {
     static translationPropertyNames = {
@@ -151,7 +152,7 @@ export class DataElementFactory {
                             params: {
                                 trackedEntityType: contextProps.trackedEntityTypeId,
                                 orgUnit: orgUnitId,
-                                filter: `${dataElement.id}:EQ:${serverValue}`,
+                                filter: `${dataElement.id}:EQ:${escapeString(serverValue)}`,
                             },
                         });
                     } else {
@@ -160,7 +161,7 @@ export class DataElementFactory {
                             params: {
                                 trackedEntityType: contextProps.trackedEntityTypeId,
                                 ouMode: 'ACCESSIBLE',
-                                filter: `${dataElement.id}:EQ:${serverValue}`,
+                                filter: `${dataElement.id}:EQ:${escapeString(serverValue)}`,
                             },
                         });
                     }
diff --git a/src/core_modules/capture-core/utils/escapeString.js b/src/core_modules/capture-core/utils/escapeString.js
new file mode 100644
index 0000000000..c71c659564
--- /dev/null
+++ b/src/core_modules/capture-core/utils/escapeString.js
@@ -0,0 +1,15 @@
+// @flow
+
+const valueToEscape = Object.freeze({
+    COLON: ':',
+    COMMA: ',',
+    SLASH: '/',
+});
+const escape = '/';
+
+export const escapeString = (value: string): string =>
+    value
+        .replace(new RegExp(valueToEscape.SLASH, 'g'), `${escape}${valueToEscape.SLASH}`)
+        .replace(new RegExp(valueToEscape.COLON, 'g'), `${escape}${valueToEscape.COLON}`)
+        .replace(new RegExp(valueToEscape.COMMA, 'g'), `${escape}${valueToEscape.COMMA}`);
+

From 8bed7fb9e4aefc28cc4dc2c032ee8d706a522064 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Tue, 22 Aug 2023 13:38:35 +0000
Subject: [PATCH 12/16] chore(release): cut 100.37.0 [skip release]

# [100.37.0](https://github.com/dhis2/capture-app/compare/v100.36.0...v100.37.0) (2023-08-22)

### Features

* [DHIS2-15299] escape value for attribute filter ([#3403](https://github.com/dhis2/capture-app/issues/3403)) ([5db743e](https://github.com/dhis2/capture-app/commit/5db743eaf7f67bbb4a9391ac9ade25317e4d3642))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b4d14cfea..6487c20723 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [100.37.0](https://github.com/dhis2/capture-app/compare/v100.36.0...v100.37.0) (2023-08-22)
+
+
+### Features
+
+* [DHIS2-15299] escape value for attribute filter ([#3403](https://github.com/dhis2/capture-app/issues/3403)) ([5db743e](https://github.com/dhis2/capture-app/commit/5db743eaf7f67bbb4a9391ac9ade25317e4d3642))
+
 # [100.36.0](https://github.com/dhis2/capture-app/compare/v100.35.9...v100.36.0) (2023-08-22)
 
 
diff --git a/package.json b/package.json
index 09e12cba11..297f0a3494 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.36.0",
+    "version": "100.37.0",
     "cacheVersion": "5",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.36.0",
+        "@dhis2/rules-engine-javascript": "100.37.0",
         "@dhis2/app-runtime": "^3.8.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index f8ae9bbd9b..7e57d9d6a2 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.36.0",
+    "version": "100.37.0",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From 290bd578500f16868bd94e7d43dcf53f27afee21 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Thu, 24 Aug 2023 12:18:38 +0200
Subject: [PATCH 13/16] refactor: [DHIS2-15185] use Dhis2 DataTable component
 in working lists (#3386)

---
 .../EventWorkingListsDev/index.js             |   18 +-
 .../EventWorkingListsUser/index.js            |   10 +-
 .../TeiWorkingListsDev/index.js               |    6 +-
 .../TeiWorkingListsUser/index.js              |   13 +-
 .../integration/WorkingLists/sharedSteps.js   |   10 +-
 i18n/en.pot                                   |    9 +-
 package.json                                  |    4 +-
 .../DataTable/SortLabelWrapper.component.js   |  141 --
 .../List/OfflineList/OfflineList.component.js |  212 +-
 .../List/OnlineList/OnlineList.component.js   |  292 +--
 .../withEndColumnMenu/RowMenu.component.js    |   29 +-
 .../withEndColumnMenu/rowMenu.types.js        |    3 +-
 .../capture-ui/DataTable/Body.component.js    |   16 -
 .../capture-ui/DataTable/Cell.component.js    |   38 -
 .../capture-ui/DataTable/Footer.component.js  |   30 -
 .../capture-ui/DataTable/Head.component.js    |   30 -
 .../DataTable/HeaderCell.component.js         |   25 -
 .../capture-ui/DataTable/Row.component.js     |   40 -
 .../DataTable/SortLabel.component.js          |   99 -
 .../capture-ui/DataTable/Table.component.js   |   27 -
 .../capture-ui/DataTable/sortLabel.const.js   |   11 -
 .../capture-ui/DataTable/table.module.css     |  101 -
 .../Pagination.component.js                   |    0
 .../capture-ui/Pagination/table.module.css    |   19 +
 src/core_modules/capture-ui/index.js          |   15 +-
 yarn.lock                                     | 1776 +++++------------
 26 files changed, 666 insertions(+), 2308 deletions(-)
 delete mode 100644 src/core_modules/capture-core/components/DataTable/SortLabelWrapper.component.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/Body.component.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/Cell.component.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/Footer.component.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/Head.component.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/HeaderCell.component.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/Row.component.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/SortLabel.component.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/Table.component.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/sortLabel.const.js
 delete mode 100644 src/core_modules/capture-ui/DataTable/table.module.css
 rename src/core_modules/capture-ui/{DataTable => Pagination}/Pagination.component.js (100%)
 create mode 100644 src/core_modules/capture-ui/Pagination/table.module.css

diff --git a/cypress/integration/WorkingLists/EventWorkingLists/EventWorkingListsDev/index.js b/cypress/integration/WorkingLists/EventWorkingLists/EventWorkingListsDev/index.js
index a200fcf728..b1b8f6c79a 100644
--- a/cypress/integration/WorkingLists/EventWorkingLists/EventWorkingListsDev/index.js
+++ b/cypress/integration/WorkingLists/EventWorkingLists/EventWorkingListsDev/index.js
@@ -38,7 +38,7 @@ Then('the list should display the events retrieved from the api', () => {
             cy.get('[data-test="event-working-lists"]')
                 .find('tr')
                 .each(($teiRow, index) => {
-                    const rowId = $teiRow.get(0).getAttribute('id');
+                    const rowId = $teiRow.get(0).getAttribute('data-test');
                     if (index > 1) {
                         expect(rowId).to.equal(teis[index - 1].event);
                     }
@@ -232,25 +232,27 @@ When('you click the report date column header', () => {
 
     cy.route('GET', '**/tracker/events**').as('getEvents');
 
-    cy.get('[data-test="online-list-table"]')
-        .contains('Report date')
+    cy.get('[data-test="dhis2-uicore-tableheadercellaction"]')
+        .eq(0)
+        .click()
         .click();
 });
 
 Then('events should be retrieved from the api ordered ascendingly by report date', () => {
-    cy.wait('@getEvents', { timeout: 40000 }).as('result');
+    cy.wait('@getEvents', { timeout: 40000 }).as('resultDefault');
+    cy.wait('@getEvents', { timeout: 40000 }).as('resultAsc');
 
-    cy.get('@result')
+    cy.get('@resultAsc')
         .its('status')
         .should('equal', 200);
 
-    cy.get('@result')
+    cy.get('@resultAsc')
         .its('url')
         .should('match', /order=.*asc/);
 
-    cy.get('@result')
+    cy.get('@resultAsc')
         .its('url')
         .should('include', 'page=1');
 
-    cy.get('@result').its('response.body.instances').as('events');
+    cy.get('@resultAsc').its('response.body.instances').as('events');
 });
diff --git a/cypress/integration/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js b/cypress/integration/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js
index ed72014a7f..cacda7707f 100644
--- a/cypress/integration/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js
+++ b/cypress/integration/WorkingLists/EventWorkingLists/EventWorkingListsUser/index.js
@@ -256,8 +256,9 @@ Then('the list should display 10 rows of data', () => {
 });
 
 When('you click the report date column header', () => {
-    cy.get('[data-test="online-list-table"]')
-        .contains('Report date')
+    cy.get('[data-test="dhis2-uicore-tableheadercellaction"]')
+        .eq(0)
+        .click()
         .click();
 });
 
@@ -364,8 +365,9 @@ When('you change the sharing settings', () => {
 
 
 When('you update the working list', () => {
-    cy.get('[data-test="online-list-table"]')
-        .contains('Report date')
+    cy.get('[data-test="dhis2-uicore-tableheadercellaction"]')
+        .eq(0)
+        .click()
         .click();
 
     cy.get('[data-test="list-view-menu-button"]')
diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsDev/index.js b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsDev/index.js
index 1c8cacb865..d7bbe85138 100644
--- a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsDev/index.js
+++ b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsDev/index.js
@@ -146,7 +146,7 @@ Then('the list should display the teis retrieved from the api', () => {
             cy.get('[data-test="tei-working-lists"]')
                 .find('tr')
                 .each(($teiRow, index) => {
-                    const rowId = $teiRow.get(0).getAttribute('id');
+                    const rowId = $teiRow.get(0).getAttribute('data-test');
                     if (index > 1) {
                         expect(rowId).to.equal(teis[index - 1].trackedEntity);
                     }
@@ -226,8 +226,8 @@ When('you click the first name column header', () => {
 
     cy.route('GET', '**/tracker/trackedEntities**').as('getTeis');
 
-    cy.get('[data-test="online-list-table"]')
-        .contains('First name')
+    cy.get('[data-test="dhis2-uicore-tableheadercellaction"]')
+        .eq(0)
         .click();
 });
 
diff --git a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
index 211356e1bc..6426baf38c 100644
--- a/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
+++ b/cypress/integration/WorkingLists/TeiWorkingLists/TeiWorkingListsUser/index.js
@@ -332,20 +332,21 @@ Then('the list should display 10 rows of data', () => {
 });
 
 When('you click the first name column header', () => {
-    cy.get('[data-test="online-list-table"]')
-        .contains('First name')
+    cy.get('[data-test="dhis2-uicore-tableheadercellaction"]')
+        .eq(0)
         .click();
 });
 
 When('you click the last name column header', () => {
-    cy.get('[data-test="online-list-table"]')
-        .contains('Last name')
+    cy.get('[data-test="dhis2-uicore-tableheadercellaction"]')
+        .eq(2)
         .click();
 });
 
 When('you click the WHOMCH Smoking column header', () => {
-    cy.get('[data-test="online-list-table"]')
-        .contains('WHOMCH Smoking')
+    cy.get('[data-test="dhis2-uicore-tableheadercellaction"]')
+        .eq(6)
+        .click()
         .click();
 });
 
diff --git a/cypress/integration/WorkingLists/sharedSteps.js b/cypress/integration/WorkingLists/sharedSteps.js
index 4dd206ad9b..5c359d2569 100644
--- a/cypress/integration/WorkingLists/sharedSteps.js
+++ b/cypress/integration/WorkingLists/sharedSteps.js
@@ -75,8 +75,9 @@ Then('the pagination for the tei working list should show the second page', () =
 });
 
 Then('the sort arrow should indicate ascending order', () => {
-    cy.get('[data-test="data-table-asc-sort-icon"]')
-        .should('exist');
+    cy.get('[data-test="table-row"]').within(() => {
+        cy.get('[data-test="table-row-asc"]').should('exist');
+    });
 });
 
 Then('the enrollment status filter button should show that the active filter is in effect', () => {
@@ -133,8 +134,9 @@ When('you click the first page button', () => {
 });
 
 Then('the sort arrow should indicate descending order', () => {
-    cy.get('[data-test="data-table-desc-sort-icon"]')
-        .should('exist');
+    cy.get('[data-test="table-row"]').within(() => {
+        cy.get('[data-test="table-row-desc"]').should('exist');
+    });
 });
 
 Then('rows per page should be set to 15', () => {
diff --git a/i18n/en.pot b/i18n/en.pot
index ff0db59ce7..52dcc1b13e 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -373,9 +373,6 @@ msgstr "Some operations are still runnning. Please wait.."
 msgid "Operations running"
 msgstr "Operations running"
 
-msgid "Sort"
-msgstr "Sort"
-
 msgid ""
 "This event has unsaved changes. Leaving this page without saving will lose "
 "these changes. Are you sure you want to discard unsaved changes?"
@@ -1503,9 +1500,6 @@ msgstr "Error editing the event, the changes made were not saved"
 msgid "Set coordinate"
 msgstr "Set coordinate"
 
-msgid "Page {{currentPage}}"
-msgstr "Page {{currentPage}}"
-
 msgid "Date"
 msgstr "Date"
 
@@ -1524,6 +1518,9 @@ msgstr "To date"
 msgid "To time"
 msgstr "To time"
 
+msgid "Page {{currentPage}}"
+msgstr "Page {{currentPage}}"
+
 msgid "Delete polygon"
 msgstr "Delete polygon"
 
diff --git a/package.json b/package.json
index 297f0a3494..6f9a6db16c 100644
--- a/package.json
+++ b/package.json
@@ -11,14 +11,14 @@
     ],
     "dependencies": {
         "@dhis2/rules-engine-javascript": "100.37.0",
-        "@dhis2/app-runtime": "^3.8.0",
+        "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
         "@dhis2/d2-ui-app": "^2.0.0",
         "@dhis2/d2-ui-org-unit-tree": "^7.3.3",
         "@dhis2/d2-ui-rich-text": "^7.4.0",
         "@dhis2/d2-ui-sharing-dialog": "^7.3.3",
-        "@dhis2/ui": "^8.7.7",
+        "@dhis2/ui": "^8.13.8",
         "@joakim_sm/react-infinite-calendar": "^2.4.2",
         "@material-ui/core": "3.9.4",
         "@material-ui/icons": "3",
diff --git a/src/core_modules/capture-core/components/DataTable/SortLabelWrapper.component.js b/src/core_modules/capture-core/components/DataTable/SortLabelWrapper.component.js
deleted file mode 100644
index 73fded30e6..0000000000
--- a/src/core_modules/capture-core/components/DataTable/SortLabelWrapper.component.js
+++ /dev/null
@@ -1,141 +0,0 @@
-// @flow
-import * as React from 'react';
-import { IconArrowDown16, IconArrowUp16, Tooltip } from '@dhis2/ui';
-import { withStyles } from '@material-ui/core/styles';
-import classNames from 'classnames';
-
-import i18n from '@dhis2/d2-i18n';
-import { SortLabel, sortLabelDirections } from 'capture-ui';
-
-const styles = () => ({
-    iconBase: {
-        color: '#3a796f',
-    },
-    enabledIcon: {
-        cursor: 'pointer',
-    },
-});
-
-type Props = {
-    children?: ?React.Node,
-    classes: {
-        iconBase: string,
-        enabledIcon: string,
-    },
-    disabled?: ?boolean,
-};
-
-class SortLabelWrapperPlain extends React.Component<Props> {
-    getIconClickHandler = (
-        direction: $Values<typeof sortLabelDirections>,
-        onSort: (direction: $Values<typeof sortLabelDirections>) => void) =>
-        () => {
-            if (!this.props.disabled) {
-                onSort(direction);
-            }
-        }
-
-    getActiveIcons = (direction?: ?$Values<typeof sortLabelDirections>,
-        onSort: (direction: $Values<typeof sortLabelDirections>) => void,
-    ) => {
-        const isDisabled = this.props.disabled;
-        const classes = this.props.classes;
-
-        const icon =
-            direction === sortLabelDirections.ASC ?
-                (<div
-                    className={isDisabled ? classes.iconBase : classNames(classes.iconBase, classes.enabledIcon)}
-                    role="button"
-                    tabIndex="0"
-                    onClick={this.getIconClickHandler(sortLabelDirections.DESC, onSort)}
-                    data-test="data-table-asc-sort-icon"
-                >
-                    <IconArrowUp16 />
-                </div>) :
-                (<div
-                    className={isDisabled ? classes.iconBase : classNames(classes.iconBase, classes.enabledIcon)}
-                    role="button"
-                    tabIndex="0"
-                    onClick={this.getIconClickHandler(sortLabelDirections.ASC, onSort)}
-                    data-test="data-table-desc-sort-icon"
-
-                >
-                    <IconArrowDown16 />
-                </div>);
-
-        if (this.props.disabled) {
-            return (
-                <span>
-                    {icon}
-                </span>
-            );
-        }
-
-        return (
-            <Tooltip
-                content={i18n.t('Sort')}
-                placement={'bottom'}
-                openDelay={500}
-            >
-                <span>
-                    {icon}
-                </span>
-            </Tooltip>
-        );
-    }
-
-    getIcons = (
-        isActive: boolean,
-        direction?: ?$Values<typeof sortLabelDirections>,
-        onSort: (direction: $Values<typeof sortLabelDirections>,
-    ) => void) => {
-        if (isActive) {
-            return this.getActiveIcons(direction, onSort);
-        }
-        return (
-            <div
-                style={{ width: 14, height: 14 }}
-            />
-        );
-    }
-
-    render() {
-        return (
-            // $FlowFixMe[cannot-spread-inexact] automated comment
-            <SortLabel
-                onGetIcons={this.getIcons}
-                {...this.props}
-            >
-                {
-                    (() => {
-                        if (this.props.disabled) {
-                            return (
-                                <span>
-                                    {this.props.children}
-                                </span>
-                            );
-                        }
-                        return (
-                            <Tooltip
-                                content={i18n.t('Sort')}
-                                placement={'bottom'}
-                                openDelay={500}
-                            >
-                                <span>
-                                    {this.props.children}
-                                </span>
-                            </Tooltip>
-                        );
-                    })()
-                }
-            </SortLabel>
-        );
-    }
-}
-
-/**
- * A wrapper for the d2-ui/dataTable/sortLabel component. Adds sort tooltip and icons
- * @alias SortLabelWrapper
- * @memberof DataTable
- */
-export const SortLabelWrapper = withStyles(styles)(SortLabelWrapperPlain);
diff --git a/src/core_modules/capture-core/components/List/OfflineList/OfflineList.component.js b/src/core_modules/capture-core/components/List/OfflineList/OfflineList.component.js
index 69d7b9c760..8955ce20e3 100644
--- a/src/core_modules/capture-core/components/List/OfflineList/OfflineList.component.js
+++ b/src/core_modules/capture-core/components/List/OfflineList/OfflineList.component.js
@@ -3,62 +3,17 @@ import React, { Component } from 'react';
 import { withStyles } from '@material-ui/core/styles';
 import classNames from 'classnames';
 import i18n from '@dhis2/d2-i18n';
-
-import {
-    Table,
-    Row,
-    Cell,
-    HeaderCell,
-    Head,
-    Body,
-    sortLabelDirections,
-    sorLabelPlacements,
-} from 'capture-ui';
-import { SortLabelWrapper } from '../../DataTable/SortLabelWrapper.component';
+import { DataTableHead, DataTable, DataTableBody, DataTableRow, DataTableCell, DataTableColumnHeader } from '@dhis2/ui';
 import { dataElementTypes } from '../../../metaData';
 
-const styles = theme => ({
-    loaderContainer: {
-        display: 'flex',
-        justifyContent: 'center',
-    },
-    container: {
-        borderColor: theme.palette.type === 'light'
-            ? theme.palette.dividerLighter
-            : theme.palette.dividerDarker,
-        borderWidth: '1px',
-        borderStyle: 'solid',
-    },
-    topBarContainer: {
-        display: 'flex',
-        justifyContent: 'space-between',
-    },
+const styles = () => ({
     tableContainer: {
         overflow: 'auto',
     },
-    optionsIcon: {
-        color: theme.palette.primary.main,
-    },
-    table: {},
-    row: {},
-    cell: {
-        padding: `${theme.spacing.unit / 2}px ${theme.spacing.unit * 7}px ${theme.spacing.unit /
-            2}px ${theme.spacing.unit * 3}px`,
-        '&:last-child': {
-            paddingRight: theme.spacing.unit * 3,
+    headerAlign: {
+        '&>span.container': {
+            alignItems: 'flex-end',
         },
-        borderBottomColor: theme.palette.type === 'light'
-            ? theme.palette.dividerLighter
-            : theme.palette.dividerDarker,
-    },
-    bodyCell: {
-        fontSize: theme.typography.pxToRem(13),
-        color: theme.palette.text.primary,
-    },
-    headerCell: {
-        fontSize: theme.typography.pxToRem(12),
-        color: theme.palette.text.secondary,
-        fontWeight: theme.typography.fontWeightMedium,
     },
 });
 
@@ -70,37 +25,17 @@ type Column = {
 };
 
 type Props = {
-    dataSource: Array<{id: string, [elementId: string]: any}>,
+    dataSource: Array<{ id: string, [elementId: string]: any }>,
     columns: ?Array<Column>,
     classes: {
-        loaderContainer: string,
-        container: string,
-        topBarContainer: string,
+        headerAlign: string,
         tableContainer: string,
-        optionsIcon: string,
-        table: string,
-        cell: string,
-        headerCell: string,
-        bodyCell: string,
-        footerCell: string,
-        row: string,
     },
     rowIdKey: string,
-    sortById: string,
-    sortByDirection: string,
     noItemsText: ?string,
 };
 
 class Index extends Component<Props> {
-    static defaultProps = {
-        rowIdKey: 'id',
-    };
-    static typesWithAscendingInitialDirection = [
-        // todo (report lgmt)
-        dataElementTypes.TEXT,
-        dataElementTypes.LONG_TEXT,
-    ];
-
     static typesWithRightPlacement = [
         dataElementTypes.NUMBER,
         dataElementTypes.INTEGER,
@@ -110,122 +45,61 @@ class Index extends Component<Props> {
     ];
 
     renderHeaderRow(visibleColumns: Array<Column>) {
-        const sortById = this.props.sortById;
-        const sortByDirection = this.props.sortByDirection;
-
-        const headerCells = visibleColumns
-            .map(column => (
-                <HeaderCell
-                    key={column.id}
-                    className={classNames(this.props.classes.cell, this.props.classes.headerCell)}
-                >
-                    <SortLabelWrapper
-                        isActive={column.id === sortById}
-                        initialDirection={
-                            Index.typesWithAscendingInitialDirection.includes(column.type)
-                                ? sortLabelDirections.ASC
-                                : sortLabelDirections.DESC
-                        }
-                        placement={
-                            Index.typesWithRightPlacement.includes(column.type)
-                                ? sorLabelPlacements.RIGHT
-                                : sorLabelPlacements.LEFT
-                        }
-                        direction={sortByDirection}
-                        disabled
-                    >
-                        {column.header}
-                    </SortLabelWrapper>
-                </HeaderCell>
-            ));
+        const { classes } = this.props;
 
-        return (
-            <Row
-                className={this.props.classes.row}
+        const headerCells = visibleColumns.map(column => (
+            <DataTableColumnHeader
+                key={column.id}
+                className={classNames({ [classes.headerAlign]: Index.typesWithRightPlacement.includes(column.type) })}
+                align={Index.typesWithRightPlacement.includes(column.type) ? 'right' : 'left'}
             >
-                {headerCells}
-            </Row>
-        );
+                {column.header}
+            </DataTableColumnHeader>
+        ));
+
+        return <DataTableRow dataTest="table-row">{headerCells}</DataTableRow>;
     }
 
     renderRows(visibleColumns: Array<Column>) {
-        const { dataSource, classes, noItemsText, rowIdKey } = this.props;
+        const { dataSource, noItemsText, rowIdKey } = this.props;
 
         if (!dataSource || dataSource.length === 0) {
             const columnsCount = visibleColumns.length;
             return (
-                <Row
-                    className={classes.row}
-                >
-                    <Cell
-                        colSpan={columnsCount}
-                        className={classNames(classes.cell, classes.bodyCell)}
-                    >
-                        {noItemsText || i18n.t('No items to display')}
-                    </Cell>
-                </Row>
+                <DataTableRow dataTest="table-row">
+                    <DataTableCell colSpan={columnsCount}>{noItemsText || i18n.t('No items to display')}</DataTableCell>
+                </DataTableRow>
             );
         }
 
-        return dataSource
-            .map((row) => {
-                const cells = visibleColumns
-                    .map(column => (
-                        <Cell
-                            key={column.id}
-                            className={classNames(classes.cell, classes.bodyCell)}
-                        >
-                            <div
-                                style={
-                                    Index.typesWithRightPlacement.includes(column.type) ?
-                                        { textAlign: 'right' } :
-                                        null
-                                }
-                            >
-                                {row[column.id]}
-                            </div>
-                        </Cell>
-                    ));
+        return dataSource.map((row) => {
+            const cells = visibleColumns.map(column => (
+                <DataTableCell
+                    key={column.id}
+                    align={Index.typesWithRightPlacement.includes(column.type) ? 'right' : 'left'}
+                >
+                    {row[column.id]}
+                </DataTableCell>
+            ));
 
-                return (
-                    <Row
-                        key={row[rowIdKey]}
-                        className={classes.row}
-                    >
-                        {cells}
-                    </Row>
-                );
-            });
+            return (
+                <DataTableRow key={row[rowIdKey]} dataTest="table-row">
+                    {cells}
+                </DataTableRow>
+            );
+        });
     }
 
     render() {
         const { columns, classes } = this.props;
-
-        const visibleColumns = columns ?
-            columns
-                .filter(column => column.visible) : [];
+        const visibleColumns = columns ? columns.filter(column => column.visible) : [];
 
         return (
-            <div
-                className={classes.container}
-            >
-                <div
-                    className={classes.topBarContainer}
-                />
-                <div
-                    className={classes.tableContainer}
-                >
-                    <Table
-                        className={classes.table}
-                    >
-                        <Head>
-                            {this.renderHeaderRow(visibleColumns)}
-                        </Head>
-                        <Body>
-                            {this.renderRows(visibleColumns)}
-                        </Body>
-                    </Table>
-                </div>
+            <div className={classes.tableContainer}>
+                <DataTable>
+                    <DataTableHead>{this.renderHeaderRow(visibleColumns)}</DataTableHead>
+                    <DataTableBody>{this.renderRows(visibleColumns)}</DataTableBody>
+                </DataTable>
             </div>
         );
     }
diff --git a/src/core_modules/capture-core/components/List/OnlineList/OnlineList.component.js b/src/core_modules/capture-core/components/List/OnlineList/OnlineList.component.js
index 8d8fc3ad59..21b085e8d0 100644
--- a/src/core_modules/capture-core/components/List/OnlineList/OnlineList.component.js
+++ b/src/core_modules/capture-core/components/List/OnlineList/OnlineList.component.js
@@ -2,68 +2,23 @@
 
 import * as React from 'react';
 import i18n from '@dhis2/d2-i18n';
-import { CircularLoader } from '@dhis2/ui';
+import { DataTableHead, DataTable, DataTableBody, DataTableRow, DataTableCell, DataTableColumnHeader } from '@dhis2/ui';
 import classNames from 'classnames';
 import { withStyles } from '@material-ui/core/styles';
-import {
-    Table,
-    Head,
-    Body,
-    Row,
-    Cell,
-    HeaderCell,
-    sortLabelDirections,
-    sorLabelPlacements,
-} from 'capture-ui';
-import { SortLabelWrapper } from '../../DataTable/SortLabelWrapper.component';
 import { dataElementTypes } from '../../../metaData';
 import type { OptionSet } from '../../../metaData';
 
-
-const getStyles = (theme: Theme) => ({
+const getStyles = () => ({
     tableContainer: {
         overflowX: 'auto',
     },
-    table: {},
-    row: {},
     loadingRow: {
         height: 100,
     },
-    dataRow: {
-        cursor: 'pointer',
-        '&:hover': {
-            backgroundColor: '#F1FBFF',
-        },
-    },
-
-    cell: {
-        padding: `${theme.spacing.unit / 2}px ${theme.spacing.unit * 7}px ${theme.spacing.unit /
-            2}px ${theme.spacing.unit * 3}px`,
-        '&:last-child': {
-            paddingRight: theme.spacing.unit * 3,
+    headerAlign: {
+        '&>span.container': {
+            alignItems: 'flex-end',
         },
-        borderBottomColor: theme.palette.type === 'light'
-            ? theme.palette.dividerLighter
-            : theme.palette.dividerDarker,
-    },
-    bodyCell: {
-        fontSize: theme.typography.pxToRem(13),
-        color: theme.palette.text.primary,
-    },
-    staticHeaderCell: {
-        width: 1,
-    },
-    headerCell: {
-        fontSize: theme.typography.pxToRem(12),
-        color: theme.palette.text.secondary,
-        // $FlowFixMe
-        fontWeight: theme.typography.fontWeightMedium,
-    },
-    loadingCell: {
-        textAlign: 'center',
-    },
-    loader: {
-        display: 'inline-block',
     },
 });
 
@@ -90,33 +45,12 @@ type Props = {
     customEndCellBodyStyle?: ?Object,
     classes: {
         tableContainer: string,
-        table: string,
-        cell: string,
-        headerCell: string,
-        bodyCell: string,
-        loadingCell: string,
-        sortLabelChilden: string,
         loadingRow: string,
-        row: string,
-        dataRow: string,
-        loader: string,
-    }
-}
-
+        headerAlign: string,
+    },
+};
 
 class Index extends React.Component<Props> {
-    columnHeaderInstances: Array<HTMLElement>;
-    constructor(props: Props) {
-        super(props);
-        this.columnHeaderInstances = [];
-    }
-    static typesWithAscendingInitialDirection = [
-        dataElementTypes.TEXT,
-        dataElementTypes.LONG_TEXT,
-        dataElementTypes.USERNAME,
-        'ASSIGNEE',
-    ];
-
     static typesWithRightPlacement = [
         dataElementTypes.NUMBER,
         dataElementTypes.INTEGER,
@@ -124,181 +58,107 @@ class Index extends React.Component<Props> {
         dataElementTypes.INTEGER_NEGATIVE,
         dataElementTypes.INTEGER_ZERO_OR_POSITIVE,
     ];
-    getSortHandler = (id: string) => (direction: string) => {
-        this.props.onSort(id, direction);
-    }
 
-    setColumnWidth(columnInstance: any, index: number) {
-        if (columnInstance && !this.props.updating) {
-            this.columnHeaderInstances[index] = columnInstance;
-        }
-    }
+    getSortHandler =
+        (id: string) =>
+            ({ direction }: { direction: string }) => {
+                this.props.onSort(id, direction);
+            };
 
     getCustomEndCellHeader = () => {
-        const { getCustomEndCellHeader, getCustomEndCellBody, customEndCellHeaderStyle, classes } = this.props;
+        const { getCustomEndCellHeader, getCustomEndCellBody, customEndCellHeaderStyle } = this.props;
 
-        return getCustomEndCellBody ?
-            (
-                <HeaderCell
-                    className={classNames(classes.cell, classes.headerCell)}
-                    style={customEndCellHeaderStyle}
-                >
-                    {getCustomEndCellHeader && getCustomEndCellHeader(this.props)}
-                </HeaderCell>
-            ) :
-            null;
-    }
+        return getCustomEndCellBody ? (
+            <DataTableColumnHeader style={customEndCellHeaderStyle}>
+                {getCustomEndCellHeader && getCustomEndCellHeader(this.props)}
+            </DataTableColumnHeader>
+        ) : null;
+    };
 
     getCustomEndCellBody = (row: Object, customEndCellBodyProps: Object) => {
-        const { getCustomEndCellBody, customEndCellBodyStyle, classes } = this.props;
+        const { getCustomEndCellBody, customEndCellBodyStyle } = this.props;
 
-        return getCustomEndCellBody ?
-            (
-                <HeaderCell
-                    className={classNames(classes.cell, classes.bodyCell)}
-                    style={customEndCellBodyStyle}
-                >
-                    {getCustomEndCellBody(row, customEndCellBodyProps)}
-                </HeaderCell>
-            ) :
-            null;
-    }
+        return getCustomEndCellBody ? (
+            <DataTableCell style={customEndCellBodyStyle}>
+                {getCustomEndCellBody(row, customEndCellBodyProps)}
+            </DataTableCell>
+        ) : null;
+    };
 
     renderHeaderRow(visibleColumns: Array<Column>) {
-        const sortById = this.props.sortById;
-        const sortByDirection = this.props.sortByDirection;
-
-        const headerCells = visibleColumns
-            .map((column, index) => (
-                <HeaderCell
-                    innerRef={(instance) => { this.setColumnWidth(instance, index); }}
-                    key={column.id}
-                    className={classNames(this.props.classes.cell, this.props.classes.headerCell)}
-                    style={{ width: this.props.updating && this.columnHeaderInstances.length - 1 >= index ? this.columnHeaderInstances[index].clientWidth : 'auto' }}
-                >
-                    <SortLabelWrapper
-                        isActive={column.id === sortById}
-                        initialDirection={
-                            Index.typesWithAscendingInitialDirection.includes(column.type)
-                                ? sortLabelDirections.ASC
-                                : sortLabelDirections.DESC
-                        }
-                        placement={
-                            Index.typesWithRightPlacement.includes(column.type)
-                                ? sorLabelPlacements.RIGHT
-                                : sorLabelPlacements.LEFT
-                        }
-                        direction={sortByDirection}
-                        onSort={this.getSortHandler(column.id)}
-                        childrenClass={this.props.classes.sortLabelChilden}
-                    >
-                        {column.header}
-                    </SortLabelWrapper>
-                </HeaderCell>
-            ));
+        const { classes, sortById, sortByDirection } = this.props;
+
+        const headerCells = visibleColumns.map(column => (
+            <DataTableColumnHeader
+                dataTest={`table-row-${sortById === column.id ? sortByDirection : 'default'}`}
+                onSortIconClick={this.getSortHandler(column.id)}
+                sortDirection={sortById === column.id ? sortByDirection : 'default'}
+                key={column.id}
+                align={Index.typesWithRightPlacement.includes(column.type) ? 'right' : 'left'}
+                className={classNames({ [classes.headerAlign]: Index.typesWithRightPlacement.includes(column.type) })}
+            >
+                {column.header}
+            </DataTableColumnHeader>
+        ));
 
         return (
-            <Row
-                className={this.props.classes.row}
-            >
+            <DataTableRow dataTest="table-row">
                 {headerCells}
                 {this.getCustomEndCellHeader()}
-            </Row>
+            </DataTableRow>
         );
     }
 
     renderBody(visibleColumns: Array<Column>) {
-        const { classes, getCustomEndCellBody, updating } = this.props;
+        const { getCustomEndCellBody, updating, classes } = this.props;
         const columnsCount = visibleColumns.length + (getCustomEndCellBody ? 1 : 0);
 
-        return updating ?
-            (
-                <Row
-                    className={classes.loadingRow}
-                >
-                    <Cell
-                        colSpan={columnsCount}
-                        className={classNames(classes.cell, classes.bodyCell, classes.loadingCell)}
-                    >
-                        <CircularLoader className={classes.loader} />
-                    </Cell>
-                </Row>
-            ) : this.renderRows(visibleColumns, columnsCount);
+        return updating ? (
+            <DataTableRow className={classes.loadingRow} />
+        ) : (
+            this.renderRows(visibleColumns, columnsCount)
+        );
     }
 
     renderRows(visibleColumns: Array<Column>, columnsCount: number) {
-        const { dataSource, classes, rowIdKey, ...customEndCellBodyProps } = this.props;
+        const { dataSource, rowIdKey, ...customEndCellBodyProps } = this.props;
 
         if (!dataSource || dataSource.length === 0) {
             return (
-                <Row
-                    className={classes.row}
-                >
-                    <Cell
-                        colSpan={columnsCount}
-                        className={classNames(classes.cell, classes.bodyCell)}
-                    >
-                        {i18n.t('No items to display')}
-                    </Cell>
-                </Row>
+                <DataTableRow dataTest="table-row">
+                    <DataTableCell colSpan={columnsCount}>{i18n.t('No items to display')}</DataTableCell>
+                </DataTableRow>
             );
         }
 
-        return (
-            <React.Fragment>
-                {
-                    dataSource
-                        .map((row) => {
-                            const cells = visibleColumns
-                                .map(column => (
-                                    <Cell
-                                        key={column.id}
-                                        className={classNames(classes.cell, classes.bodyCell)}
-                                    >
-                                        <div
-                                            style={Index.typesWithRightPlacement.includes(column.type) ? { textAlign: 'right' } : null}
-                                        >
-                                            {row[column.id]}
-                                        </div>
-                                    </Cell>
-                                ));
-                            return (
-                                <Row
-                                    key={row[rowIdKey]}
-                                    id={row[rowIdKey]}
-                                    className={classNames(classes.row, classes.dataRow)}
-                                    onClick={() => this.props.onRowClick(row)}
-                                >
-                                    {cells}
-                                    {this.getCustomEndCellBody(row, customEndCellBodyProps)}
-                                </Row>
-                            );
-                        })
-                }
-            </React.Fragment>
-        );
+        return dataSource.map((row) => {
+            const cells = visibleColumns.map(column => (
+                <DataTableCell
+                    key={column.id}
+                    align={Index.typesWithRightPlacement.includes(column.type) ? 'right' : 'left'}
+                    onClick={() => this.props.onRowClick(row)}
+                >
+                    {row[column.id]}
+                </DataTableCell>
+            ));
+            return (
+                <DataTableRow key={row[rowIdKey]} dataTest={row[rowIdKey]}>
+                    {cells}
+                    {this.getCustomEndCellBody(row, customEndCellBodyProps)}
+                </DataTableRow>
+            );
+        });
     }
 
     render() {
-        const { classes, columns } = this.props;
+        const { classes, columns, updating } = this.props;
         const visibleColumns = columns ? columns.filter(column => column.visible) : [];
         return (
-            <div
-                className={classes.tableContainer}
-            >
-                <Table
-                    className={classes.table}
-                    data-test="online-list-table"
-                >
-                    <Head>
-                        {this.renderHeaderRow(visibleColumns)}
-                    </Head>
-                    <Body
-                        data-test="online-list-body"
-                    >
-                        {this.renderBody(visibleColumns)}
-                    </Body>
-                </Table>
+            <div className={classes.tableContainer}>
+                <DataTable dataTest="online-list-table">
+                    <DataTableHead>{this.renderHeaderRow(visibleColumns)}</DataTableHead>
+                    <DataTableBody loading={updating}>{this.renderBody(visibleColumns)}</DataTableBody>
+                </DataTable>
             </div>
         );
     }
diff --git a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js
index 22d8cf593c..28778a4ef7 100644
--- a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js
+++ b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js
@@ -2,12 +2,11 @@
 import * as React from 'react';
 import { Manager, Popper, Reference } from 'react-popper';
 import ClickAwayListener from '@material-ui/core/ClickAwayListener';
-import { IconMore24 } from '@dhis2/ui';
+import { spacers, IconMore24, colors } from '@dhis2/ui';
 import Grow from '@material-ui/core/Grow';
 import Paper from '@material-ui/core/Paper';
 import MenuList from '@material-ui/core/MenuList';
 import MenuItem from '@material-ui/core/MenuItem';
-import IconButton from '@material-ui/core/IconButton';
 import withStyles from '@material-ui/core/styles/withStyles';
 import type { Props, State } from './rowMenu.types';
 
@@ -21,12 +20,19 @@ const styles = theme => ({
     popperContainer: {
         zIndex: 100,
     },
-    iconContainer: {
-        position: 'relative',
-    },
-    icon: {
-        position: 'absolute',
-        marginTop: '-24px',
+    iconButton: {
+        display: 'flex',
+        borderRadius: '50%',
+        border: 'none',
+        cursor: 'pointer',
+        background: 'transparent',
+        padding: spacers.dp12,
+        marginTop: `-${spacers.dp12}`,
+        marginBottom: `-${spacers.dp12}`,
+        color: colors.grey600,
+        '&:hover': {
+            background: colors.grey400,
+        },
     },
 });
 
@@ -105,15 +111,14 @@ class Index extends React.Component<Props, State> {
                             return (
                                 <div
                                     ref={this.handleReferenceInstanceRetrieved}
-                                    className={classes.iconContainer}
                                 >
-                                    <IconButton
+                                    <button
                                         data-test="event-content-menu"
                                         onClick={this.toggleMenu}
-                                        className={classes.icon}
+                                        className={classes.iconButton}
                                     >
                                         <IconMore24 />
-                                    </IconButton>
+                                    </button>
                                 </div>
                             );
                         }
diff --git a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/rowMenu.types.js b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/rowMenu.types.js
index 4b11a4ff82..6c05417157 100644
--- a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/rowMenu.types.js
+++ b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/rowMenu.types.js
@@ -7,8 +7,7 @@ export type Props = {
         menuList: string,
         popperContainerHidden: string,
         popperContainer: string,
-        iconContainer: string,
-        icon: string,
+        iconButton: string,
     },
     row: DataSourceItem,
     customRowMenuContents?: CustomRowMenuContents,
diff --git a/src/core_modules/capture-ui/DataTable/Body.component.js b/src/core_modules/capture-ui/DataTable/Body.component.js
deleted file mode 100644
index ff3bf7afe2..0000000000
--- a/src/core_modules/capture-ui/DataTable/Body.component.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// @flow
-import * as React from 'react';
-
-type Props = {
-    children: React.Node,
-};
-
-export class Body extends React.Component<Props> {
-    render() {
-        return (
-            <tbody>
-                {this.props.children}
-            </tbody>
-        );
-    }
-}
diff --git a/src/core_modules/capture-ui/DataTable/Cell.component.js b/src/core_modules/capture-ui/DataTable/Cell.component.js
deleted file mode 100644
index 20960f5a68..0000000000
--- a/src/core_modules/capture-ui/DataTable/Cell.component.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// @flow
-import * as React from 'react';
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import defaultClasses from './table.module.css';
-
-type Props = {
-    children: React.Node,
-    className?: ?string,
-};
-
-export const Cell = (props: Props, context: { table?: ?{ head: boolean, footer: boolean }}) => {
-    const { children, className, ...passOnProps } = props;
-
-    const { table } = context;
-    const classes = classNames(
-        defaultClasses.tableCell,
-        {
-            [defaultClasses.tableCellBody]: !table,
-            [defaultClasses.tableCellHeader]: table && table.head,
-            [defaultClasses.tableCellFooter]: table && table.footer,
-        },
-        className,
-    );
-    return (
-        // $FlowFixMe[cannot-spread-inexact] automated comment
-        <td
-            className={classes}
-            {...passOnProps}
-        >
-            {props.children}
-        </td>
-    );
-};
-
-Cell.contextTypes = {
-    table: PropTypes.object,
-};
diff --git a/src/core_modules/capture-ui/DataTable/Footer.component.js b/src/core_modules/capture-ui/DataTable/Footer.component.js
deleted file mode 100644
index 40265801e7..0000000000
--- a/src/core_modules/capture-ui/DataTable/Footer.component.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// @flow
-import * as React from 'react';
-import PropTypes from 'prop-types';
-
-type Props = {
-    children: React.Node,
-};
-
-export class Footer extends React.Component<Props> {
-    static childContextTypes = {
-        table: PropTypes.object,
-    };
-
-    getChildContext() {
-        // eslint-disable-line class-methods-use-this
-        return {
-            table: {
-                footer: true,
-            },
-        };
-    }
-
-    render() {
-        return (
-            <tfoot>
-                {this.props.children}
-            </tfoot>
-        );
-    }
-}
diff --git a/src/core_modules/capture-ui/DataTable/Head.component.js b/src/core_modules/capture-ui/DataTable/Head.component.js
deleted file mode 100644
index 7f68219da7..0000000000
--- a/src/core_modules/capture-ui/DataTable/Head.component.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// @flow
-import * as React from 'react';
-import PropTypes from 'prop-types';
-
-type Props = {
-    children: React.Node,
-};
-
-export class Head extends React.Component<Props> {
-    static childContextTypes = {
-        table: PropTypes.object,
-    };
-
-    getChildContext() {
-        // eslint-disable-line class-methods-use-this
-        return {
-            table: {
-                head: true,
-            },
-        };
-    }
-
-    render() {
-        return (
-            <thead>
-                {this.props.children}
-            </thead>
-        );
-    }
-}
diff --git a/src/core_modules/capture-ui/DataTable/HeaderCell.component.js b/src/core_modules/capture-ui/DataTable/HeaderCell.component.js
deleted file mode 100644
index 87b245ccc9..0000000000
--- a/src/core_modules/capture-ui/DataTable/HeaderCell.component.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// @flow
-import * as React from 'react';
-import classNames from 'classnames';
-import defaultClasses from './table.module.css';
-
-type Props = {
-    children: React.Node,
-    className?: ?string,
-    innerRef?: ?(instance?: ?HTMLElement) => void,
-};
-
-export const HeaderCell = (props: Props) => {
-    const { children, className, innerRef, ...passOnProps } = props;
-    const classes = classNames(defaultClasses.tableCell, defaultClasses.tableCellHeader, className);
-    return (
-        // $FlowFixMe[cannot-spread-inexact] automated comment
-        <td
-            ref={innerRef}
-            className={classes}
-            {...passOnProps}
-        >
-            { props.children }
-        </td>
-    );
-};
diff --git a/src/core_modules/capture-ui/DataTable/Row.component.js b/src/core_modules/capture-ui/DataTable/Row.component.js
deleted file mode 100644
index 9f6633cc56..0000000000
--- a/src/core_modules/capture-ui/DataTable/Row.component.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// @flow
-import * as React from 'react';
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import defaultClasses from './table.module.css';
-
-type Props = {
-    children: React.Node,
-    className?: ?string,
-};
-
-export const Row = (props: Props, context: { table?: ?{ head: boolean, footer: boolean }}) => {
-    const { children, className, ...passOnProps } = props;
-
-    const { table } = context;
-    const classes = classNames(
-        defaultClasses.tableRow,
-        {
-            [defaultClasses.tableRowBody]: !table,
-            [defaultClasses.tableRowHeader]: table && table.head,
-            [defaultClasses.tableRowFooter]: table && table.footer,
-        },
-        className,
-    );
-
-    return (
-        // $FlowFixMe[cannot-spread-inexact] automated comment
-        <tr
-            className={classes}
-            data-test="table-row"
-            {...passOnProps}
-        >
-            {props.children}
-        </tr>
-    );
-};
-
-Row.contextTypes = {
-    table: PropTypes.object,
-};
diff --git a/src/core_modules/capture-ui/DataTable/SortLabel.component.js b/src/core_modules/capture-ui/DataTable/SortLabel.component.js
deleted file mode 100644
index e6d67b3188..0000000000
--- a/src/core_modules/capture-ui/DataTable/SortLabel.component.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// @flow
-import * as React from 'react';
-import classNames from 'classnames';
-import { directions, placements } from './sortLabel.const';
-import defaultClasses from './table.module.css';
-
-type Props = {
-    children?: ?React.Node,
-    initialDirection?: ?$Values<typeof directions>,
-    isActive: boolean,
-    direction?: ?$Values<typeof directions>,
-    placement?: ?$Values<typeof placements>,
-    onSort: (direction: $Values<typeof directions>) => void,
-    onGetIcons?: ?(
-        isActive: boolean,
-        direction?: ?$Values<typeof directions>,
-        onSort: (direction: $Values<typeof directions>) => void)
-    => void,
-    childrenClass?: ?string,
-    disabled?: ?boolean,
-};
-
-export class SortLabel extends React.Component<Props> {
-    handleSort = () => {
-        const { isActive, direction, disabled } = this.props;
-
-        if (!disabled) {
-            if (isActive) {
-                this.props.onSort(direction === directions.ASC ? directions.DESC : directions.ASC);
-            } else {
-                this.props.onSort(this.props.initialDirection || directions.DESC);
-            }
-        }
-    }
-
-    renderChildrenContainer(classes: Array<string>) {
-        const childrenDefaultClasses = this.props.disabled ? defaultClasses.sortLabelChildren : classNames(defaultClasses.sortLabelChildren, defaultClasses.sortLabelChildrenEnabled);
-        return (
-            <div
-
-                className={classNames(childrenDefaultClasses, this.props.childrenClass, classes)}
-                onClick={this.handleSort}
-                role="button"
-                tabIndex={0}
-            >
-                {this.props.children}
-            </div>
-        );
-    }
-
-    render() {
-        const { isActive, direction, onSort, onGetIcons, placement } = this.props;
-        const icons = onGetIcons && onGetIcons(isActive, direction, onSort);
-        const containerClasses = classNames(
-            defaultClasses.sortLabelContainer,
-            {
-                [defaultClasses.sortLabelRight]: placement === placements.RIGHT,
-            },
-        );
-
-        return (
-            <div
-                className={containerClasses}
-            >
-                {
-                    (() => {
-                        if (placement === placements.RIGHT) {
-                            return (
-                                <React.Fragment>
-                                    <div
-                                        className={defaultClasses.sortLabelIcon}
-                                    >
-                                        {icons}
-                                    </div>
-                                    {
-                                        this.renderChildrenContainer([defaultClasses.sortLabelChildrenLast])
-                                    }
-                                </React.Fragment>
-                            );
-                        }
-
-                        return (
-                            <React.Fragment>
-                                {
-                                    this.renderChildrenContainer([defaultClasses.sortLabelChildrenFirst])
-                                }
-                                <div
-                                    className={defaultClasses.sortLabelIcon}
-                                >
-                                    {icons}
-                                </div>
-                            </React.Fragment>
-                        );
-                    })()
-                }
-            </div>
-        );
-    }
-}
diff --git a/src/core_modules/capture-ui/DataTable/Table.component.js b/src/core_modules/capture-ui/DataTable/Table.component.js
deleted file mode 100644
index a411a6c617..0000000000
--- a/src/core_modules/capture-ui/DataTable/Table.component.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @flow
-/**
- * @namespace DataTable
- */
-
-import * as React from 'react';
-import classNames from 'classnames';
-import defaultClasses from './table.module.css';
-
-type Props = {
-    children: React.Node,
-    className?: ?string,
-};
-
-export const Table = (props: Props) => {
-    const { children, className, ...passOnProps } = props;
-    const classes = classNames(defaultClasses.table, className);
-    return (
-        // $FlowFixMe[cannot-spread-inexact] automated comment
-        <table
-            className={classes}
-            {...passOnProps}
-        >
-            { props.children }
-        </table>
-    );
-};
diff --git a/src/core_modules/capture-ui/DataTable/sortLabel.const.js b/src/core_modules/capture-ui/DataTable/sortLabel.const.js
deleted file mode 100644
index 619b13dab9..0000000000
--- a/src/core_modules/capture-ui/DataTable/sortLabel.const.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// @flow
-
-export const directions = {
-    ASC: 'asc',
-    DESC: 'desc',
-};
-
-export const placements = {
-    LEFT: 'Left',
-    RIGHT: 'Right',
-};
diff --git a/src/core_modules/capture-ui/DataTable/table.module.css b/src/core_modules/capture-ui/DataTable/table.module.css
deleted file mode 100644
index 18a0eaa00f..0000000000
--- a/src/core_modules/capture-ui/DataTable/table.module.css
+++ /dev/null
@@ -1,101 +0,0 @@
-.table {
-    display: table;
-    width: 100%;
-    border-spacing: 0;
-}
-
-.tableRow {
-    color: inherit;
-    display: table-row;
-    vertical-align: middle;    
-}
-
-.tableRow:focus {
-    outline: none;
-}
-
-.tableRowBody {
-    height: 48px;
-}
-
-.tableRowHeader {    
-    height: 56px;
-}
-
-.tableRowFooter {    
-    height: 56px;
-}
-
-.tableCell {
-    display: table-cell;
-    vertical-align: middle;
-    padding: 2px 30px 2px 20px;
-}
-
-.tableCellBody {
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    text-align: left;
-}
-
-.tableCellHeader {
-    font-weight: bold;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    text-align: left;
-}
-
-.tableCellFooter {
-   
-}
-
-.pagination {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-}
-
-.paginationRowsPerPageElementContainer {
-    display: flex;
-    align-items: center;
-    margin-right: 20px;
-}
-
-.paginationRowsPerPageElement {
-    margin-left: 20px;
-}
-
-.paginationDisplayRowsContainer {
-    margin-right: 20px;
-}
-
-.sortLabelContainer {
-    display: flex;
-    align-items: center;
-}
-
-.sortLabelChildren {   
-    outline: none;
-    user-select: none;
-}
-
-.sortLabelChildrenEnabled {
-    cursor: pointer;
-}
-
-.sortLabelChildrenFirst {
-    padding-right: 10px;
-}
-
-.sortLabelChildrenLast {
-    padding-left: 10px;
-}
-
-.sortLabelRight {
-    justify-content: flex-end;
-}
-
-.sortLabelIcon {
-    display: flex;
-    align-items: center;
-}
\ No newline at end of file
diff --git a/src/core_modules/capture-ui/DataTable/Pagination.component.js b/src/core_modules/capture-ui/Pagination/Pagination.component.js
similarity index 100%
rename from src/core_modules/capture-ui/DataTable/Pagination.component.js
rename to src/core_modules/capture-ui/Pagination/Pagination.component.js
diff --git a/src/core_modules/capture-ui/Pagination/table.module.css b/src/core_modules/capture-ui/Pagination/table.module.css
new file mode 100644
index 0000000000..3bc5f9c345
--- /dev/null
+++ b/src/core_modules/capture-ui/Pagination/table.module.css
@@ -0,0 +1,19 @@
+.pagination {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+.paginationRowsPerPageElementContainer {
+    display: flex;
+    align-items: center;
+    margin-right: 20px;
+}
+
+.paginationRowsPerPageElement {
+    margin-left: 20px;
+}
+
+.paginationDisplayRowsContainer {
+    margin-right: 20px;
+}
\ No newline at end of file
diff --git a/src/core_modules/capture-ui/index.js b/src/core_modules/capture-ui/index.js
index 982dc2742e..c0a8aa0ac1 100644
--- a/src/core_modules/capture-ui/index.js
+++ b/src/core_modules/capture-ui/index.js
@@ -24,20 +24,7 @@ export { withLabel } from './HOC/withLabel';
 export { withShrinkLabel } from './HOC/withShrinkLabel';
 export { withTextFieldFocusHandler } from './internal/TextInput/withFocusHandler';
 
-// Datatable
-export { Body } from './DataTable/Body.component';
-export { Cell } from './DataTable/Cell.component';
-export { Footer } from './DataTable/Footer.component';
-export { Head } from './DataTable/Head.component';
-export { HeaderCell } from './DataTable/HeaderCell.component';
-export { Pagination } from './DataTable/Pagination.component';
-export { Row } from './DataTable/Row.component';
-export { SortLabel } from './DataTable/SortLabel.component';
-export { Table } from './DataTable/Table.component';
-export {
-    directions as sortLabelDirections,
-    placements as sorLabelPlacements,
-} from './DataTable/sortLabel.const';
+export { Pagination } from './Pagination/Pagination.component';
 
 // UI-Elements
 export { DividerHorizontal } from './Divider/DividerHorizontal.component';
diff --git a/yarn.lock b/yarn.lock
index 3de3f4eff9..0c0d33e902 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -48,26 +48,14 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
-  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
-  dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/code-frame@^7.22.5", "@babel/code-frame@^7.5.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.5.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
   integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
     "@babel/highlight" "^7.22.5"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f"
-  integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
-
-"@babel/compat-data@^7.22.5":
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
   integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==
@@ -94,28 +82,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.17.8", "@babel/core@^7.6.2", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659"
-  integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==
-  dependencies:
-    "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-compilation-targets" "^7.21.4"
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helpers" "^7.21.0"
-    "@babel/parser" "^7.21.4"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.4"
-    "@babel/types" "^7.21.4"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
-    semver "^6.3.0"
-
-"@babel/core@^7.8.4":
+"@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.17.8", "@babel/core@^7.6.2", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0", "@babel/core@^7.8.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89"
   integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==
@@ -145,7 +112,7 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.12.1", "@babel/generator@^7.22.5":
+"@babel/generator@^7.12.1", "@babel/generator@^7.22.5", "@babel/generator@^7.7.2", "@babel/generator@^7.7.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7"
   integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==
@@ -155,38 +122,13 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.21.4", "@babel/generator@^7.7.2", "@babel/generator@^7.7.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
-  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
-  dependencies:
-    "@babel/types" "^7.21.4"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/helper-annotate-as-pure@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
-  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-annotate-as-pure@^7.22.5":
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
   integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
-  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.18.6"
-    "@babel/types" "^7.18.9"
-
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878"
@@ -194,18 +136,7 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656"
-  integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==
-  dependencies:
-    "@babel/compat-data" "^7.21.4"
-    "@babel/helper-validator-option" "^7.21.0"
-    browserslist "^4.21.3"
-    lru-cache "^5.1.1"
-    semver "^6.3.0"
-
-"@babel/helper-compilation-targets@^7.22.5":
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02"
   integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==
@@ -216,21 +147,7 @@
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18"
-  integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-member-expression-to-functions" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-
-"@babel/helper-create-class-features-plugin@^7.22.5":
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c"
   integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==
@@ -245,15 +162,7 @@
     "@babel/helper-split-export-declaration" "^7.22.5"
     semver "^6.3.0"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz#40411a8ab134258ad2cf3a3d987ec6aa0723cee5"
-  integrity sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    regexpu-core "^5.3.1"
-
-"@babel/helper-create-regexp-features-plugin@^7.22.5":
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4"
   integrity sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==
@@ -286,31 +195,11 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
 "@babel/helper-environment-visitor@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
   integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
 
-"@babel/helper-explode-assignable-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
-  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
-  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
-  dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/types" "^7.21.0"
-
 "@babel/helper-function-name@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
@@ -319,13 +208,6 @@
     "@babel/template" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
@@ -333,13 +215,6 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
-  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
-  dependencies:
-    "@babel/types" "^7.21.0"
-
 "@babel/helper-member-expression-to-functions@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
@@ -347,20 +222,13 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4", "@babel/helper-module-imports@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
   integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af"
-  integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==
-  dependencies:
-    "@babel/types" "^7.21.4"
-
 "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef"
@@ -375,27 +243,6 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
-  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.20.2"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.2"
-    "@babel/types" "^7.21.2"
-
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
 "@babel/helper-optimise-call-expression@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
@@ -403,26 +250,11 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
-  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
-
-"@babel/helper-plugin-utils@^7.22.5":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-remap-async-to-generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
-  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-wrap-function" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
 "@babel/helper-remap-async-to-generator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2"
@@ -433,19 +265,7 @@
     "@babel/helper-wrap-function" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
-  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.20.7"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/helper-replace-supers@^7.22.5":
+"@babel/helper-replace-supers@^7.20.7", "@babel/helper-replace-supers@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc"
   integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==
@@ -457,13 +277,6 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helper-simple-access@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
-  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
-  dependencies:
-    "@babel/types" "^7.20.2"
-
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
@@ -471,74 +284,35 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
-  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
-  dependencies:
-    "@babel/types" "^7.20.0"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
   integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-split-export-declaration@^7.22.5":
+"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08"
   integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
-
 "@babel/helper-string-parser@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
-"@babel/helper-validator-identifier@^7.22.5":
+"@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
   integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
 
-"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
-  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
-
-"@babel/helper-validator-option@^7.22.5":
+"@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.21.0", "@babel/helper-validator-option@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
   integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
 
-"@babel/helper-wrap-function@^7.18.9":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
-  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
-  dependencies:
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
-
 "@babel/helper-wrap-function@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06"
@@ -558,25 +332,7 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
-  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
-  dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.0"
-    "@babel/types" "^7.21.0"
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/highlight@^7.22.5":
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
   integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
@@ -585,23 +341,11 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5", "@babel/parser@^7.9.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
-  integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
-
-"@babel/parser@^7.12.3", "@babel/parser@^7.22.5":
+"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.12.3", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5", "@babel/parser@^7.9.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
   integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
-  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
@@ -609,15 +353,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
-  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
-
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
@@ -627,17 +362,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-transform-optional-chaining" "^7.22.5"
 
-"@babel/plugin-proposal-async-generator-functions@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.18.6", "@babel/plugin-proposal-class-properties@^7.8.3":
+"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.8.3":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
@@ -645,15 +370,6 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
-  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
 "@babel/plugin-proposal-decorators@^7.16.4":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz#70e0c89fdcd7465c97593edb8f628ba6e4199d63"
@@ -665,39 +381,7 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     "@babel/plugin-syntax-decorators" "^7.21.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
-  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-export-namespace-from@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
-  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
-  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.1.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.1.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
@@ -705,7 +389,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.18.6":
+"@babel/plugin-proposal-numeric-separator@^7.16.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
   integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
@@ -713,7 +397,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.16.0", "@babel/plugin-proposal-object-rest-spread@^7.20.7":
+"@babel/plugin-proposal-object-rest-spread@^7.16.0":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
   integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
@@ -724,15 +408,7 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.20.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
-  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.1.0", "@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0", "@babel/plugin-proposal-optional-chaining@^7.8.3":
+"@babel/plugin-proposal-optional-chaining@^7.1.0", "@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.8.3":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
   integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
@@ -741,7 +417,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.18.6":
+"@babel/plugin-proposal-private-methods@^7.16.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
   integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
@@ -754,16 +430,6 @@
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
   integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
-"@babel/plugin-proposal-private-property-in-object@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
-  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
 "@babel/plugin-proposal-throw-expressions@^7.7.4":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.18.6.tgz#f05eb10f417d34857e4ebf3a2a152e77bd59ff9f"
@@ -772,7 +438,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-throw-expressions" "^7.18.6"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
@@ -836,13 +502,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-syntax-import-assertions@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
-  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-
 "@babel/plugin-syntax-import-assertions@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
@@ -963,13 +622,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
-  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
 "@babel/plugin-transform-arrow-functions@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
@@ -987,15 +639,6 @@
     "@babel/helper-remap-async-to-generator" "^7.22.5"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-async-to-generator@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
-  integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
-  dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-
 "@babel/plugin-transform-async-to-generator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
@@ -1005,13 +648,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-remap-async-to-generator" "^7.22.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
-  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-block-scoped-functions@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
@@ -1019,13 +655,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoping@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
-  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
 "@babel/plugin-transform-block-scoping@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b"
@@ -1050,21 +679,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
-  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    globals "^11.1.0"
-
 "@babel/plugin-transform-classes@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1"
@@ -1080,14 +694,6 @@
     "@babel/helper-split-export-declaration" "^7.22.5"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
-  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/template" "^7.20.7"
-
 "@babel/plugin-transform-computed-properties@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
@@ -1096,13 +702,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401"
-  integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
 "@babel/plugin-transform-destructuring@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc"
@@ -1110,15 +709,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
-  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-transform-dotall-regex@^7.22.5":
+"@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
   integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
@@ -1126,13 +717,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
-  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
 "@babel/plugin-transform-duplicate-keys@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
@@ -1148,14 +732,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-exponentiation-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
-  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-exponentiation-operator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
@@ -1180,13 +756,6 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-flow" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
-  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
 "@babel/plugin-transform-for-of@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
@@ -1194,15 +763,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
-  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-
 "@babel/plugin-transform-function-name@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
@@ -1220,13 +780,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
-  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
 "@babel/plugin-transform-literals@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
@@ -1242,13 +795,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
-  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-member-expression-literals@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
@@ -1256,14 +802,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.20.11":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
-  integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
-
 "@babel/plugin-transform-modules-amd@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
@@ -1272,16 +810,7 @@
     "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.1.0", "@babel/plugin-transform-modules-commonjs@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
-  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-simple-access" "^7.20.2"
-
-"@babel/plugin-transform-modules-commonjs@^7.22.5":
+"@babel/plugin-transform-modules-commonjs@^7.1.0", "@babel/plugin-transform-modules-commonjs@^7.21.2", "@babel/plugin-transform-modules-commonjs@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
   integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
@@ -1290,16 +819,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.20.11":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
-  integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-identifier" "^7.19.1"
-
 "@babel/plugin-transform-modules-systemjs@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
@@ -1310,14 +829,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-validator-identifier" "^7.22.5"
 
-"@babel/plugin-transform-modules-umd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
-  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-modules-umd@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
@@ -1326,14 +837,6 @@
     "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
-  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
-    "@babel/helper-plugin-utils" "^7.20.2"
-
 "@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
@@ -1342,13 +845,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
-  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-new-target@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
@@ -1383,14 +879,6 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.22.5"
 
-"@babel/plugin-transform-object-super@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
-  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
-
 "@babel/plugin-transform-object-super@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
@@ -1416,14 +904,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db"
-  integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-
-"@babel/plugin-transform-parameters@^7.22.5":
+"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
   integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
@@ -1448,13 +929,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-transform-property-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
-  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-property-literals@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
@@ -1502,14 +976,6 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
-  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    regenerator-transform "^0.15.1"
-
 "@babel/plugin-transform-regenerator@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa"
@@ -1518,13 +984,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     regenerator-transform "^0.15.1"
 
-"@babel/plugin-transform-reserved-words@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
-  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-reserved-words@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
@@ -1544,13 +1003,6 @@
     babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
-  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-shorthand-properties@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
@@ -1558,14 +1010,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
-  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-
 "@babel/plugin-transform-spread@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
@@ -1574,13 +1018,6 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
-  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-sticky-regex@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
@@ -1588,13 +1025,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-template-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
-  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
 "@babel/plugin-transform-template-literals@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
@@ -1602,13 +1032,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
-  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
 "@babel/plugin-transform-typeof-symbol@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
@@ -1626,13 +1049,6 @@
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-typescript" "^7.20.0"
 
-"@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
-  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-
 "@babel/plugin-transform-unicode-escapes@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c"
@@ -1648,14 +1064,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
-  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-unicode-regex@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
@@ -1672,88 +1080,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.14.7", "@babel/preset-env@^7.16.0", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58"
-  integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==
-  dependencies:
-    "@babel/compat-data" "^7.21.4"
-    "@babel/helper-compilation-targets" "^7.21.4"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-option" "^7.21.0"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.20.7"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.21.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-proposal-json-strings" "^7.18.6"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.21.0"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.21.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.20.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.20.7"
-    "@babel/plugin-transform-async-to-generator" "^7.20.7"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.21.0"
-    "@babel/plugin-transform-classes" "^7.21.0"
-    "@babel/plugin-transform-computed-properties" "^7.20.7"
-    "@babel/plugin-transform-destructuring" "^7.21.3"
-    "@babel/plugin-transform-dotall-regex" "^7.18.6"
-    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.21.0"
-    "@babel/plugin-transform-function-name" "^7.18.9"
-    "@babel/plugin-transform-literals" "^7.18.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.20.11"
-    "@babel/plugin-transform-modules-commonjs" "^7.21.2"
-    "@babel/plugin-transform-modules-systemjs" "^7.20.11"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.21.3"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.20.5"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.20.7"
-    "@babel/plugin-transform-sticky-regex" "^7.18.6"
-    "@babel/plugin-transform-template-literals" "^7.18.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.21.4"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    core-js-compat "^3.25.1"
-    semver "^6.3.0"
-
-"@babel/preset-env@^7.8.4":
+"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.14.7", "@babel/preset-env@^7.16.0", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.4", "@babel/preset-env@^7.8.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e"
   integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==
@@ -1905,7 +1232,7 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.10.4", "@babel/template@^7.22.5":
+"@babel/template@^7.10.4", "@babel/template@^7.22.5", "@babel/template@^7.3.3":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
   integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
@@ -1914,16 +1241,7 @@
     "@babel/parser" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
-  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.22.5":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.22.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.7.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
   integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
@@ -1939,22 +1257,6 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.7.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36"
-  integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
-  dependencies:
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.4"
-    "@babel/types" "^7.21.4"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
 "@babel/types@7.15.0":
   version "7.15.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"
@@ -1963,16 +1265,7 @@
     "@babel/helper-validator-identifier" "^7.14.9"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
-  integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.12.1", "@babel/types@^7.22.5":
+"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.22.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
   integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
@@ -2202,583 +1495,583 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@dhis2-ui/alert@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-8.13.11.tgz#6f754331c04cdb4b4206fce7b928b57dacb4f2a9"
-  integrity sha512-/h9m4GcpY/0nYNRDqoV/4VB3mPNB27uKZvcid2rQ2pitnzDCTr+Rd5XSOppNxRw8Ur470YkTVO0+DNh8jrUxTw==
+"@dhis2-ui/alert@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-8.13.15.tgz#5f9a9665e751bc94d96b1d2993683731ac63c019"
+  integrity sha512-6KiE4TGaJC3FdChyc5FvghInSlPl4hZNDjukq5lYy0XXgnaKBSz9yUPmod5+NLHFsEr0DCISBKFhVeKAexz/hg==
   dependencies:
-    "@dhis2-ui/portal" "8.13.11"
+    "@dhis2-ui/portal" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/box@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-8.13.11.tgz#f6b42e99c4e4638dd16c36594342ece5336593d6"
-  integrity sha512-+S+lkdUEYnbB6oe/BI87cJXMfJZJs4unGNvEAFJnqPBUMQc+0YvnI6AZUyyNMTXCXw+bA0qt2E2hrfGdGjJLaw==
+"@dhis2-ui/box@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-8.13.15.tgz#fb8fce7ee20e27b9e25e7a294c1109a881b123a4"
+  integrity sha512-SwzPGXbySpU/e0lJyxOfxXipFAc3C9GKKsSQYKVOo2/kxwZDui9zaUcw1hCv4rK4vy2hB1b2GLEvJLnQAE3VIQ==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/button@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-8.13.11.tgz#eea1dfb741967a26d751e3ebbe2591adef797204"
-  integrity sha512-2Q/W2IS0Hlkd+aehoeoTdZRgjBnEgPI7UFV698Y3VUlW7fD9SVqx3EmkfAtyLHGhkfnicZew6E00T0zyI7bVJA==
+"@dhis2-ui/button@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-8.13.15.tgz#0bcb2365a9dd200c303b4bea003a5b403382c981"
+  integrity sha512-rzHPLBAbG6Q0k8JZU21eWABa/+GqOvl9WV6ay8ODahJmvauOpKKNOYn2AfUZEjbwrWgVbiuGhPOvnC+bVI+jDw==
   dependencies:
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/loader" "8.13.11"
-    "@dhis2-ui/popper" "8.13.11"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/loader" "8.13.15"
+    "@dhis2-ui/popper" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/calendar@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-8.13.11.tgz#63baf8a9a5ca96596a60b9cf8a14b1743af422b2"
-  integrity sha512-zYG1NYxFbnPPTGT16vveutccT5oeB/BIKoJxWTjMLOxj2kvlWDaiGNbUHSqcItvrVlktGrmlwbSgoK7IvBQF8g==
+"@dhis2-ui/calendar@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-8.13.15.tgz#d37395674df24565258d76aa6f771f76801c8adb"
+  integrity sha512-/2FVtXI6vGQlFvPul3I/EdWJfpo3QXx5aF/YKZVEEQaM5nhVmdLMVqNoIvNGzh1PJsAyrc6JhqdqqbK5AO2u0w==
   dependencies:
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/card" "8.13.11"
-    "@dhis2-ui/input" "8.13.11"
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/popper" "8.13.11"
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/card" "8.13.15"
+    "@dhis2-ui/input" "8.13.15"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/popper" "8.13.15"
     "@dhis2/multi-calendar-dates" "1.0.2"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/card@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-8.13.11.tgz#302cb163f5992fd7c494d6c00ee8f373976a3786"
-  integrity sha512-vXBBsARxgSMDqRdfhQwYC3iCPHzNSh4rI+CBMXoqELeJsLdoYQDY+jSnBO9sV8Jmoah7zHSnEutTGbfQBzus9g==
+"@dhis2-ui/card@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-8.13.15.tgz#87e67ebc2c92512fb729016571d0be40cbf079ca"
+  integrity sha512-70VZHAuHGBqw4AKBJd1HgcsMyTfQ++yzip5c8ykLU7AZQi7WS8W/fMDvV9DGFE5Lc3JyIZdr15Uh31d/v+EBUA==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/center@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-8.13.11.tgz#19f10c200920f576894b9177ec64d5fb4ca0075b"
-  integrity sha512-tz4J6PMrieiy4XaerdDnsajCxg9LS6mNnODWKC5PPQcMgk9cnFp6bjpDKZynHh0cCpEyqsKDJkz4hW7fsOly9A==
+"@dhis2-ui/center@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-8.13.15.tgz#fd434cd37e6d5eb4a01b4830c2c316fbb814c188"
+  integrity sha512-+YQFxzNrwYQWsZZYEHM4ywzaGbrjfQWcK4WIPAHifVYau2efPDXAMGQ8cpDrRUivpxCYi3Rpvpp965Dp5+KOYQ==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/checkbox@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-8.13.11.tgz#5a01e903989c5fc10ed6ca75b4573e2b62487387"
-  integrity sha512-FPXxP64NCRbzLchfe0/2YHutFuGabtMH1y2q/2Z2XJKvsxt4KnzCgT7AsaoskFcGoprq0+xV+4ikcQbKLnk3Mw==
+"@dhis2-ui/checkbox@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-8.13.15.tgz#ed8beaf55fe32c222f35e2ee2497191dee2ddefe"
+  integrity sha512-fhi50vBK8v5fXzkNOcZlZR8pxO72GwwVKuTmDkrDeAIKIiNQuNZoxkAkU3vwEGv/rdO3TREbAfzTbtjRui3XHQ==
   dependencies:
-    "@dhis2-ui/field" "8.13.11"
-    "@dhis2-ui/required" "8.13.11"
+    "@dhis2-ui/field" "8.13.15"
+    "@dhis2-ui/required" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/chip@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-8.13.11.tgz#3a94ae9ae4c20e06a28f93bfb68037d42d41280c"
-  integrity sha512-I7LfR2FwvPXG/NG2vQM9nMpINf/E8y4dl6IIu1pojPL068wye7dZJY6biIZdu+4qZ1P+8gDFgw3mLH8uWsjGag==
+"@dhis2-ui/chip@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-8.13.15.tgz#efd576e7556b241c852b7176762e70e22f84b2e0"
+  integrity sha512-MJSKIX/KIZBKjQPhIUTwMasmvY4M2ftlYQ61d9Px1YAuivuE+VTvGCsFF0q5EAKMx5ETd6SD1X3PrwzdtHru4Q==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/cover@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-8.13.11.tgz#680f1745d795f098842922d037e4df0260f3f771"
-  integrity sha512-9HkQRlVLfYGcEk3CzhllAKhIMInwZnodHj6Gqc/c++4fjx4lJNsY09XnRWVfU4UBUex/jHiUb5Pl+P787g+0fA==
+"@dhis2-ui/cover@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-8.13.15.tgz#28ac0f54a39f217518a0df501665829188d5945d"
+  integrity sha512-3e4XwsnhaVNSNTF2wNk6V+3CzsKCZuLsqMq049ScdaCCrv83qro1cRfRTNqNUJiXnmTubrgU8yxV0kXrFIKZJg==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/css@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-8.13.11.tgz#f1a4d669a7d49ef5f1dfc1e648970aeecb0d3396"
-  integrity sha512-EQ5C5Dc4Wm1EAeVoUZxWI0U63pd8v8pciUyFtTq0x82BF0tXTK/9jjuvnImlS76Wm74MYbHQaYn6h7O1ShBjbA==
+"@dhis2-ui/css@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-8.13.15.tgz#8e8073a0c69070f598c27abdef52c36981d77421"
+  integrity sha512-9aAWUpE36SVS17AQXz3x9KkoRpIkvruat+tk2eabw0vfTB6xVRPzC1oO28mltYhpWNOLLS+k1USwfhDSiiqASw==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/divider@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-8.13.11.tgz#fab8c8871b89a156622baad236c9e4c39f308b66"
-  integrity sha512-4KnKw0MB0HGF6SGBiXHdQgIEaSiHJtGVxix3pMZ8UHMe484RmQm22Dhc7ZfaEnTXBWAr2KPC0NG/UZFK8qfbxQ==
+"@dhis2-ui/divider@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-8.13.15.tgz#c4ef063b31aa80735c2288dd9f5cbaa2c79b123e"
+  integrity sha512-bIQKnaCddH2Pr9e3j3CFFWMvGR51gvw71G4NTHsNGZTWNbVL54tZo4ifhkmkfNvf3cLuF/V6IlpQzrf/X8Iu9g==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/field@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-8.13.11.tgz#c680010ad018910d9b6abec53cad110dbff6d8f4"
-  integrity sha512-49vDnMA1aYlN/3trzHPC18EIDzHH0NrrwSFQ5q8XkiOiBqLYq4kNXX4i8YYkhLkM+cABPuziOw6YhR0bWhddJg==
+"@dhis2-ui/field@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-8.13.15.tgz#f91ca25936ea926e82ac17c62b28faa2eae2898b"
+  integrity sha512-2aBumqc77kBC0gl0A+zGOv+en/pu2YUNYwEEpvq5TE2NOvSktWgUOR6Pk/5NDGtB8ugkxgdjAbgcOk/SRuxQJA==
   dependencies:
-    "@dhis2-ui/box" "8.13.11"
-    "@dhis2-ui/help" "8.13.11"
-    "@dhis2-ui/label" "8.13.11"
+    "@dhis2-ui/box" "8.13.15"
+    "@dhis2-ui/help" "8.13.15"
+    "@dhis2-ui/label" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/file-input@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-8.13.11.tgz#f72f5d62bb46d25c2424fb9b68597f1b5671e2ac"
-  integrity sha512-t2Ls829VYLAvikXzZiPWXQFXg97UUXWP828acgGQYBZKF0wsIz1J9/77znOgV2iWCHTQsOzz3ca8OePT7/m/ug==
+"@dhis2-ui/file-input@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-8.13.15.tgz#df974db2ea5cf072b63b4336c84eaa5f989dbcaa"
+  integrity sha512-il5j+6s+874XX/uS4teXQCrFjnmJgVg5RTViZ5toDUZRUpjx86zLKUcTDANfrxG3eUR+F4dkdsvccXFTkA1dTg==
   dependencies:
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/field" "8.13.11"
-    "@dhis2-ui/label" "8.13.11"
-    "@dhis2-ui/loader" "8.13.11"
-    "@dhis2-ui/status-icon" "8.13.11"
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/field" "8.13.15"
+    "@dhis2-ui/label" "8.13.15"
+    "@dhis2-ui/loader" "8.13.15"
+    "@dhis2-ui/status-icon" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/header-bar@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-8.13.11.tgz#24173fe00870da9c9bf4db9c0120a80be7ef8e55"
-  integrity sha512-FpEcP2avPmudR2+BNbPCllOjphV0dSFTZwpcsZHZnlC1PChCiUj5ftzWymSuCbEeYpSA7gWBAIWKEPdtHMzeeQ==
-  dependencies:
-    "@dhis2-ui/box" "8.13.11"
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/card" "8.13.11"
-    "@dhis2-ui/center" "8.13.11"
-    "@dhis2-ui/divider" "8.13.11"
-    "@dhis2-ui/input" "8.13.11"
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/loader" "8.13.11"
-    "@dhis2-ui/logo" "8.13.11"
-    "@dhis2-ui/menu" "8.13.11"
-    "@dhis2-ui/modal" "8.13.11"
-    "@dhis2-ui/user-avatar" "8.13.11"
+"@dhis2-ui/header-bar@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-8.13.15.tgz#40d5c5fb0ba3ff5dce2870125ededa83cd3f1cc6"
+  integrity sha512-OjGKPU0ia+q53NM0hZMfnNkb8Sh/Ty4q/WcDw9qr0Yzow29G30Z4TH+B8le9SSvUBXBiZ8Q/Rv170JMON0Zygg==
+  dependencies:
+    "@dhis2-ui/box" "8.13.15"
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/card" "8.13.15"
+    "@dhis2-ui/center" "8.13.15"
+    "@dhis2-ui/divider" "8.13.15"
+    "@dhis2-ui/input" "8.13.15"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/loader" "8.13.15"
+    "@dhis2-ui/logo" "8.13.15"
+    "@dhis2-ui/menu" "8.13.15"
+    "@dhis2-ui/modal" "8.13.15"
+    "@dhis2-ui/user-avatar" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     moment "^2.29.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/help@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-8.13.11.tgz#1783e6ffa81574368e9b280e066eec413cb54e52"
-  integrity sha512-u3QMhrRXeSGHDekgs/F/I0DvZWy1355Xs/V3dn3nSr8UgOyKGhbQBeTGPtXM5DrlKBkxnq/C78nYjzyAKvDgFA==
+"@dhis2-ui/help@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-8.13.15.tgz#a3c1adcc655afcc9f24cf13aa9f0597b24593810"
+  integrity sha512-7obQDeD0dZOyf+Sm808EZeTeCLIFndd0fdPD1vTmTOnevv+W2grT7dCwsFwZ2AsX+GLbzzd+10ikXE8da6OPPQ==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/input@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-8.13.11.tgz#7d34ff02aa4bae0260b23c9724b1607364b05873"
-  integrity sha512-iELgimNfKYO0ERzx+WELjL6uWT1AhI3IGSCiRo6XzDSxTS/ntbDfnfbXnXMcSitGlax0gDWE6DJ5qEflOOchaA==
+"@dhis2-ui/input@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-8.13.15.tgz#cdeb7bf5b63814b4a571b843e580527868f57f32"
+  integrity sha512-8K4yqeZmYQpvNA+TRWtFwWWC4HbzgotxJ6FoXdUJ34LVHQZJNCaRC0L0B1lHLCnP41WHnY0uYcFovY0kl0G/vA==
   dependencies:
-    "@dhis2-ui/box" "8.13.11"
-    "@dhis2-ui/field" "8.13.11"
-    "@dhis2-ui/input" "8.13.11"
-    "@dhis2-ui/loader" "8.13.11"
-    "@dhis2-ui/status-icon" "8.13.11"
+    "@dhis2-ui/box" "8.13.15"
+    "@dhis2-ui/field" "8.13.15"
+    "@dhis2-ui/input" "8.13.15"
+    "@dhis2-ui/loader" "8.13.15"
+    "@dhis2-ui/status-icon" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/intersection-detector@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-8.13.11.tgz#eacc3efa14ad21161454d357cce2da0a7cade85b"
-  integrity sha512-64Eel4Y4WDkTNiVe/ZEZfj51TtsDB7X/ribxNxYWNWN6kIKGObcf2NoPV2FdfRgAF3AWmQl78Oae8R4EgnknRQ==
+"@dhis2-ui/intersection-detector@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-8.13.15.tgz#460389648c7cd95a45b881db7a4f997ca7fce045"
+  integrity sha512-M7gaWb50eu3LPoU6vd5CAz9uLDsyFmacr7RCUQO5FlBQ/cGU6Xvfd8+oaH5R7PqP/YSyNsPi4yP9cpXSlzU1Gw==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/label@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-8.13.11.tgz#c7b7f6e71f63075962bac21190edcce88b9f0a51"
-  integrity sha512-B6ugpNqtzWhjL0DZ9XwvEa9f8C793sXoMKWE5xivrhsN6Iq/k0TgDrZhwI0iyKIavCnyzlIB3Qg22QxjWKHfDw==
+"@dhis2-ui/label@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-8.13.15.tgz#6a5a42fce24f2d11507f58c3a4782d50ac2fe764"
+  integrity sha512-+lC8gJTxB81n0/83Nfs1KrgkR7SitdHb40nZh3/VgfRzWJzxESL/VMpA/dz1Y+7eZ8To/exRYvrfoHGI6qpvog==
   dependencies:
-    "@dhis2-ui/required" "8.13.11"
+    "@dhis2-ui/required" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/layer@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-8.13.11.tgz#85f74c313cb8acb7b06775962e169ad2f9324fa5"
-  integrity sha512-j8u3s+ReKwOfSGn9Rq5wVfhuGVMWCMRa6pUrIfn8pSCbI1r1O73o3kL21G9H77qMG5gPS1QnAruJJER1Ew8n9Q==
+"@dhis2-ui/layer@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-8.13.15.tgz#ab0f15ea5dea3666718faf08f0e812830ec536c4"
+  integrity sha512-OWlwvW1a4/SKdYCy+Dc7OkGT2Cc+6GHIHRDTQwNQdBGUAtosx/AmsmBv+sCPKl2CMaZQTwL7dRbN/80YOWdklA==
   dependencies:
-    "@dhis2-ui/portal" "8.13.11"
+    "@dhis2-ui/portal" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/legend@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-8.13.11.tgz#d8f2e7c0b7611742299383074f78aa747c49d601"
-  integrity sha512-++BMaey6YhpYpM+Vb9RqRlmGriibzfpJT6eR1uF7LUQwqbphuhmA3fSRHqUpTgtGhuukRzfD7Rm6kZdgO4jBVw==
+"@dhis2-ui/legend@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-8.13.15.tgz#0ba933eac4839d31b37083b4291e637c99a9188e"
+  integrity sha512-KE5+YBs+YUHmUB1EKfWa/yWc5WcICP3+RH1g9zqK+L6FmO+iH+pFHzF+grtaeOM7ZbrqvXGSamK+UbUYlcn5TA==
   dependencies:
-    "@dhis2-ui/required" "8.13.11"
+    "@dhis2-ui/required" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/loader@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-8.13.11.tgz#3d3467a071362401a84c4552ebca1fcbc16d4a6a"
-  integrity sha512-nK2+FQTgkXzpjhA0pHMrVCxCcHQtxlyXmrdseeLqa1N5hlOhwWUAMlcDHWhEkVZPdSbsuVEJqNEW7uFHhrS+fg==
+"@dhis2-ui/loader@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-8.13.15.tgz#726a3f7c43ec268d1ba4fa115e2ff45f4d983017"
+  integrity sha512-P/uMn84ME4NVlVNnHcCjbf6Gi042tuRHxAWoYf/R35rYoKnVCJTul4dKf1JCBNRJUpQtEuaT/EGk0G11iZIBog==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/logo@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-8.13.11.tgz#6d938ccf6498cdd635c49ee8d83697ed8e85bfb6"
-  integrity sha512-MU1llLOLsG4ysrHOj1a5DxfZsHCj+z3fyCox5KWZJ+73A/ke07qRqnLmEtjp/KKZ7kxDPFjZWLpkdg3JMQmnGg==
+"@dhis2-ui/logo@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-8.13.15.tgz#c1c9fe8a6e0ed3055027202790d19e6234b01eee"
+  integrity sha512-dRW5doMz57kjn+CeHtRXy5eVjkHj2xFzU0CA4A+pfTb6mXlwDrC8C7ixpbwIcYky51AS02zKaygoGmODRZt9Ow==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/menu@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-8.13.11.tgz#1de3be9ef24d60ce1bc3af2dcf454bc35bbd026d"
-  integrity sha512-kcWuwKzvHp/SUp+T4yEGqiaAHQ/5hBBHIiUJCIMm8zHy1qfJmYh14oAz0i1M/hHB8VAhCPr7Jf7/m3voGnAJ6g==
+"@dhis2-ui/menu@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-8.13.15.tgz#9193a0fc5cc2610ad5b9a68b97acd0f1f218be70"
+  integrity sha512-dzkRRRk2eogzHlJuR6JONd7NeVU1Ct1zmhlsHDqTHc8p1vO3/FYIF6SWBJErFTXmWSs9kYA4WnZHk/xiyKWFQA==
   dependencies:
-    "@dhis2-ui/card" "8.13.11"
-    "@dhis2-ui/divider" "8.13.11"
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/popper" "8.13.11"
-    "@dhis2-ui/portal" "8.13.11"
+    "@dhis2-ui/card" "8.13.15"
+    "@dhis2-ui/divider" "8.13.15"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/popper" "8.13.15"
+    "@dhis2-ui/portal" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/modal@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-8.13.11.tgz#43bf9c030d7334a778919e2a4face6783a494ffa"
-  integrity sha512-O/VBrnQdXNU1uRmV1Aq1aFLXSXe6zbbtq1N4DgwyHeuQxDqlXcPdA8ERXa88InysI2Al2VQ++QdLKicwVyQ0kA==
+"@dhis2-ui/modal@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-8.13.15.tgz#d0865e7b60bc4baf2865133007d730f959592713"
+  integrity sha512-ptCxzIXnHv9AOcwW33XgmMqb072Z8ZishfjLzlZVhNdiFbwBmCvr+yu5zpTj0I0fISotz7fpAF38tWIsp9CPOA==
   dependencies:
-    "@dhis2-ui/card" "8.13.11"
-    "@dhis2-ui/center" "8.13.11"
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/portal" "8.13.11"
+    "@dhis2-ui/card" "8.13.15"
+    "@dhis2-ui/center" "8.13.15"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/portal" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/node@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-8.13.11.tgz#4c0b769fe7b6f87b89dce1b7aac852070679566e"
-  integrity sha512-KTPnrBTHLk24YArNQb6bvDZBphslwGxG/gFIAZEf+IWDRZI5JEDXlbIXxFNesUQB3KOc+Bl8s6Bq+2GKNerREw==
+"@dhis2-ui/node@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-8.13.15.tgz#c0221389511bf571fc08f9b3c55963b37d65aac3"
+  integrity sha512-yG39zK1UEBnABqfrVL9dnoZWaqUY4WTnkfHOwxBI8k7DhTDmoFA/Otqlfu1ILgdnz/W1SLpxGhqRqa1pg4m4Gg==
   dependencies:
-    "@dhis2-ui/loader" "8.13.11"
+    "@dhis2-ui/loader" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/notice-box@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-8.13.11.tgz#6e1271b25afbdc9f35571e5359a4e1444cbe676b"
-  integrity sha512-RIDVAJ9BjTTifpWHUaDLjn1zI7V92dNuDFhOJizXyUFduc7DbZ72/GZ9RmtzJXsLbO2+9J3IoklhP8CJseZbog==
+"@dhis2-ui/notice-box@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-8.13.15.tgz#e53a8f4db842bae0966b8a562bafc685cf17af83"
+  integrity sha512-vY7vAwlRQMYZvNvByVRQqGTjTnMHbKPWWcNlAx23otZDIPJG4z+hxBV0dX+e6hKpZFjtW+5zAOMe4JgS8McrmA==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/organisation-unit-tree@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-8.13.11.tgz#82721340ed3b52583b402d0460810ca1ce67fbff"
-  integrity sha512-RTTrQkWnpBR2+snPkSb8OFpE47U1ij/fX6hgRmebleY1ARWbkdeTUdDH3FsDIyEnHLyHkm14ds5Y1rHNRfPAJg==
+"@dhis2-ui/organisation-unit-tree@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-8.13.15.tgz#b9750f10d945baca95b8cfb43684d3e1858f7b8a"
+  integrity sha512-jGPiSBqo9vtvIzKpRVMUeDpmqxmjz6vwEcMqLwyWTh8YxC5nGw20wwj33z6SW/5BoSIgbgQZxxH3B6NBUbO8fA==
   dependencies:
-    "@dhis2-ui/checkbox" "8.13.11"
-    "@dhis2-ui/loader" "8.13.11"
-    "@dhis2-ui/node" "8.13.11"
+    "@dhis2-ui/checkbox" "8.13.15"
+    "@dhis2-ui/loader" "8.13.15"
+    "@dhis2-ui/node" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/pagination@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-8.13.11.tgz#dafe48a5a9104d453741e4265ddf2367cf94a880"
-  integrity sha512-mDNDQxJRbCuB5pLI3Dj5qjSU/4ZQEVJhkh8NAPoWpikJmP4eob4TB1zx0iFragdYNfHO0BLaTKZVvt2HBGpMZw==
+"@dhis2-ui/pagination@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-8.13.15.tgz#ec73473380339ab646db0a5e336e5571e024f9ff"
+  integrity sha512-Kbixe3HFW168EiLkPu8hNe2CqnI+B6n0maVOeZJv90l0bW5FSXLHs669Fr6y2sTl0YVgwK94IoLOCJSWFldvIA==
   dependencies:
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/select" "8.13.11"
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/select" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/popover@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-8.13.11.tgz#3bd2b2c97574a83582c6930976fd290e40e90361"
-  integrity sha512-Uw4JgxVckqOsJBoyyMLKuEcLZfbZ4f8jjW0ckPdlj8fN8vZOaSt6jzWUOViXItPf5k9NaTx8zVvuV8DevC54/A==
+"@dhis2-ui/popover@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-8.13.15.tgz#41bb965b8fddd8b88349c9174ff7c63a392fab25"
+  integrity sha512-i32u23IAKkCi26Adcom8P8kMEP+EIw/rBcTYNHmPc1wrfVPnMfkVf+fFsVcoY7t1gcNFO88SiyJNffso7S1BPg==
   dependencies:
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/popper" "8.13.11"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/popper" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/popper@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-8.13.11.tgz#35c1b7efa10bd6cffd33e530931abdb1e93c2110"
-  integrity sha512-BpvFcpDo0W1uMSP4+FjO7TMHH/UhMhLjtStfOYrS0DaCvAg6QyVUSCMnoPru0gxy5nZTNxj5aP3vCMXgIAO4FQ==
+"@dhis2-ui/popper@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-8.13.15.tgz#c4c29c16c92221716a8806791bc383b6209acee6"
+  integrity sha512-gOIDZzvfH8oA0Hf7V0HEi3Y99KRcDdmog/BqnsiqEV/EAV/VRHq5qk239bIqKATM1Ei7Xv7G0lEBXJIZqOeNVA==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     "@popperjs/core" "^2.10.1"
     classnames "^2.3.1"
     prop-types "^15.7.2"
     react-popper "^2.2.5"
     resize-observer-polyfill "^1.5.1"
 
-"@dhis2-ui/portal@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-8.13.11.tgz#e1086e63fdeab2f208114e9a66accb7e2d3fafaf"
-  integrity sha512-d2cRvIJYuu2H+Tfc5p0Kr48JgsiKmKEud9n3Qaj31e3+cM8bVklgPInFaZOCChh4aKzwjrkzxsHc78yECIvoDw==
+"@dhis2-ui/portal@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-8.13.15.tgz#701b0294d069239c7afefd1e1e211b9b80f72dc1"
+  integrity sha512-oqSbsOyznJwpdpAUiur5v24SOlThcWEbhnvniXSZzZy4thSJpcdF6OLMhgvVcjfO8kyAGgMbQjEx+hZ6cVpCFQ==
   dependencies:
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/radio@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-8.13.11.tgz#0ee99d5e8fe993fd20b55f7e87651e4c5cb1be78"
-  integrity sha512-GRsF3WjGvJG7m30WNew0iz0D0ysXTLyb5bOdgRM8c3KjB7i1W8iHPXm2jiGdyCJJZ9Fp+swqcLbDGtwFVPyWIA==
+"@dhis2-ui/radio@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-8.13.15.tgz#4475abe33148bef6cd532888ee6077864674ebeb"
+  integrity sha512-k+ahM17CLIwquuN6XD9LCzkjPR+Zkvpcl8Cb8GzJNpovkhqdDJMvFezmBu7oxyABzVzNYILnuouqGsQwF6G4UQ==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/required@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-8.13.11.tgz#ac1b5a7e5054e7650dd5713b512d890877f585bf"
-  integrity sha512-m2I2Ja5r/hkQcH2F4SLdutq3nwIoopIuT0uUbNuIcIacSttwgZYw8Co9cFqtHog4j/lrloNeDG9Q72sM9e7/EQ==
+"@dhis2-ui/required@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-8.13.15.tgz#bba0fda4f693ab9d53f0822b3ad0375ee6c217e7"
+  integrity sha512-Qlt84rdcsP4i0faaOvOcedP2dFbZp08ASh3ylNwSbLcP2R+aNv9mXQCR6U2mW2WjCMsgAfGzApdMFgYZJfI9QQ==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/segmented-control@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-8.13.11.tgz#139430dc94f2864d816b35feeae6c061422e953e"
-  integrity sha512-vU1p2ptJTkrT9tIpN/ClK+2iDDuPjb+N+vCHiPSF37nUzFhMCN9knpHbEvwrHYpxHvEajaQGqwGYrgzc6CilyA==
+"@dhis2-ui/segmented-control@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-8.13.15.tgz#2ecbd81075ea81b974912bab05d9d23f15c12382"
+  integrity sha512-+oulCoUVDHkxV5WPjGwzpgN9qmIwVW1/9TbW6JvC87gbiywAWaN59dhIIRoBRqeBOy0Ll9DW2L3siBYfMY43vg==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/select@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-8.13.11.tgz#b72206e9b1821e9edb2efc6a5d941e6b9f98f4bb"
-  integrity sha512-gW4eB00TkY8GBWrzigvlUAe0bv8jSZ/ffpdqYgkkL7V/Exdr5Jn2iSsAVhf3gvjnBCDOBJE9lbgrXoh07CsNdA==
-  dependencies:
-    "@dhis2-ui/box" "8.13.11"
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/card" "8.13.11"
-    "@dhis2-ui/checkbox" "8.13.11"
-    "@dhis2-ui/chip" "8.13.11"
-    "@dhis2-ui/field" "8.13.11"
-    "@dhis2-ui/input" "8.13.11"
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/loader" "8.13.11"
-    "@dhis2-ui/popper" "8.13.11"
-    "@dhis2-ui/status-icon" "8.13.11"
+"@dhis2-ui/select@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-8.13.15.tgz#3125ddb871da60bb1cbdf663ec4109c579fba0fb"
+  integrity sha512-yVNCws1GUmbXCOBKx2ZdwC5OEVt3wLPOSUOswVrJA3/ZjE0/ji5Or193/u9dhvLgDBzTt/ZIhKVksa4sT/pGCg==
+  dependencies:
+    "@dhis2-ui/box" "8.13.15"
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/card" "8.13.15"
+    "@dhis2-ui/checkbox" "8.13.15"
+    "@dhis2-ui/chip" "8.13.15"
+    "@dhis2-ui/field" "8.13.15"
+    "@dhis2-ui/input" "8.13.15"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/loader" "8.13.15"
+    "@dhis2-ui/popper" "8.13.15"
+    "@dhis2-ui/status-icon" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/selector-bar@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-8.13.11.tgz#48c707e1f16a000c3aa2c16b93d8f3916b02eca9"
-  integrity sha512-5+K2dv8gxd+GWKa5U+v/LNjgavX9v6spu/BUlqzce5luGf0ZPorxx0PWhOj9IdRPsk+fgugzddXevUkcVYrLBw==
-  dependencies:
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/card" "8.13.11"
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/popper" "8.13.11"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+"@dhis2-ui/selector-bar@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-8.13.15.tgz#96239ca8025b55999c6823c1a16ccfd95913ca46"
+  integrity sha512-QSNuy3nx3bh8LRvLnx+1ygovyB9kEcS965Gdfm4l3no2wVcD2GMBsQlhKGtoIgxEWSJKKQ15oGrybEsWWuMAAw==
+  dependencies:
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/card" "8.13.15"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/popper" "8.13.15"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     "@testing-library/react" "^12.1.2"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/sharing-dialog@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-8.13.11.tgz#ad8d65e5ec783cf0215a8efb3b16a6e9149e48fb"
-  integrity sha512-0yzWa4pSZrrAEZWqvwVqAnilru/d+gz7JgiM8ljNC1jTVqGKC5SnIQoNE8awup7W7K/9eJvHEj7IXDIZO1imEQ==
-  dependencies:
-    "@dhis2-ui/box" "8.13.11"
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/card" "8.13.11"
-    "@dhis2-ui/divider" "8.13.11"
-    "@dhis2-ui/input" "8.13.11"
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/menu" "8.13.11"
-    "@dhis2-ui/modal" "8.13.11"
-    "@dhis2-ui/notice-box" "8.13.11"
-    "@dhis2-ui/popper" "8.13.11"
-    "@dhis2-ui/select" "8.13.11"
-    "@dhis2-ui/tab" "8.13.11"
-    "@dhis2-ui/tooltip" "8.13.11"
-    "@dhis2-ui/user-avatar" "8.13.11"
+"@dhis2-ui/sharing-dialog@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-8.13.15.tgz#0dd96295d200e22f937e9bfab21b444a7680f3bd"
+  integrity sha512-IRA5xD3vNwASnEoNV10+j/YXy5s9LqxolDWI/GlCHPGnuYxdlCb4NdbwWSFdyuzBtB3XrrGN4/h3BVMRtCKXBA==
+  dependencies:
+    "@dhis2-ui/box" "8.13.15"
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/card" "8.13.15"
+    "@dhis2-ui/divider" "8.13.15"
+    "@dhis2-ui/input" "8.13.15"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/menu" "8.13.15"
+    "@dhis2-ui/modal" "8.13.15"
+    "@dhis2-ui/notice-box" "8.13.15"
+    "@dhis2-ui/popper" "8.13.15"
+    "@dhis2-ui/select" "8.13.15"
+    "@dhis2-ui/tab" "8.13.15"
+    "@dhis2-ui/tooltip" "8.13.15"
+    "@dhis2-ui/user-avatar" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     "@react-hook/size" "^2.1.2"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/status-icon@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-8.13.11.tgz#c5b877d51ccc0c4fb4c62081f98101a498ce23d3"
-  integrity sha512-qiV//TZAyiKQ4B+/Ac+8Ds5EX6Zyu3Q4+Ek7o/Dvw7OakY7BUR4sE6cE2Y7wj6szdZGarG1LvafFo4ljYqzP2Q==
+"@dhis2-ui/status-icon@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-8.13.15.tgz#b97326cb30fab4f6c8913eabc06b9a1f19c7e670"
+  integrity sha512-+MBRhmaLA9b0bkXEr5eCwN8FFdGq5u3RWXanvAGXlZ0WT7xYUfnqFellJ7qkM/tQQEoBzwuK1nrMLt4YWCrEuw==
   dependencies:
-    "@dhis2-ui/loader" "8.13.11"
+    "@dhis2-ui/loader" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/switch@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-8.13.11.tgz#a804d951549161adc98480d8a58e6ecdaf5bf592"
-  integrity sha512-kCguGy5u+jAgyiiizCEleYyPjzEegtxSfIpaa64V2dRTjv8fFoUKcsfAstVzUQ4/MpgNtu8PZ3++nkZ+g1mjcA==
+"@dhis2-ui/switch@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-8.13.15.tgz#b064e8b1af0666756282da7ae59b40218e454ffb"
+  integrity sha512-E7o3SsNAN6OAt6zmizIfq1Uh4o0GPnwkK4l65JR32/4aMu6oC8omZFBtigmx26bo2P3AS0iIzar0gXwz4LIdyA==
   dependencies:
-    "@dhis2-ui/field" "8.13.11"
-    "@dhis2-ui/required" "8.13.11"
+    "@dhis2-ui/field" "8.13.15"
+    "@dhis2-ui/required" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/tab@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-8.13.11.tgz#44d06ed28581f4c0f78c3d7320bd0d71fc775bf7"
-  integrity sha512-H+omNuMu3E2MU+X6/rPvcFe/xrV3YoJjs/kAlrvOdOD4S21hCqzFzIP8wOJ6BGfCma/zcCWXVVv3cUQVMVZTtA==
+"@dhis2-ui/tab@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-8.13.15.tgz#a076b19761d327d481a25fc33d13be8996889b93"
+  integrity sha512-ak/OVhhHjnBAGPNuEl8Bekh/i7zroeP6BvkHMljpdDpbUN5Ex6+bgnwMpCEZ4qtwwTlZykbIsYelXDlRIGn7rQ==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/table@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-8.13.11.tgz#ea83b707e3cea8a71929360e540b8c92243b393c"
-  integrity sha512-d6CopZZETAC/wsTyS6Er0SgT8aM+WUj8ROtgwmYohw4T6MOgGVhzkRSII/BTupZmeieM53rVKyjW1VY4P8VObA==
+"@dhis2-ui/table@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-8.13.15.tgz#b71680bef5209a4d30c47edb07edcb4a1e9def15"
+  integrity sha512-tJVQAA1pwji9AjyFr6oKWRzU01Vp/Lbk/5CQnrCqU9kh+uLIoyAfeyjF0kWGCB2uE37WrR5gC6/zOlSow3QqXw==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/tag@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-8.13.11.tgz#cf6425e27ac316a6d1d542ca0ea9d5886c075699"
-  integrity sha512-tTiS0A47B152ptj3Pt+7DQAkFxJN8NbTp4dkHA4JDKCGqybX5HEnb8ygFqtfyng06OC8vFJLOj0dsDxq7eBVQA==
+"@dhis2-ui/tag@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-8.13.15.tgz#cd6ccdb55bfba2ff102ae0cca0ae4fb1a9aea0b9"
+  integrity sha512-KzQYvRWEwOt2jkiv98tdyIH4Ibv2iUtoGo2Dik9Y0LAWRrPW5N8+x+/7Lr6G0ggBL10AhVrKOqA0PVxLYbFjMw==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/text-area@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-8.13.11.tgz#7cc4241fe8e73ec90897c0cdf5663661bb02eb14"
-  integrity sha512-7mp3z5gXoNcJsKSJl7Y3yT3POL4gUeWK/FkvoSGEv5OhRE2H9CxncJyALzLe0Sol2/ggKOsgy1avOY5Nmj9BwQ==
+"@dhis2-ui/text-area@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-8.13.15.tgz#48d21eb7093fae2a2a6667f28c996ddd83251d54"
+  integrity sha512-djZt2OQH1CBaTPOg4iAgllNLYfbcvMuSQ9AR/hr1mf3/85e9ZLc12enXN0AaVkSQopemHvH/KcgNhA8ogEGWhQ==
   dependencies:
-    "@dhis2-ui/box" "8.13.11"
-    "@dhis2-ui/field" "8.13.11"
-    "@dhis2-ui/loader" "8.13.11"
-    "@dhis2-ui/status-icon" "8.13.11"
+    "@dhis2-ui/box" "8.13.15"
+    "@dhis2-ui/field" "8.13.15"
+    "@dhis2-ui/loader" "8.13.15"
+    "@dhis2-ui/status-icon" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/tooltip@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-8.13.11.tgz#12ea4ebf67ecdff4990cc8de1963eb3bfe587333"
-  integrity sha512-0fzMeDPGpsWdgTtnD0jPKV/d4tmzG4pTJUIgQLVD6lms35lPrKeL3rfBtx3+hQqS2yVRMjTmev3PZH6kJ9dEJQ==
+"@dhis2-ui/tooltip@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-8.13.15.tgz#22acbbf785c51fd9a924621ae9c50f7a58fa88a5"
+  integrity sha512-6igahGDmonAJJIqmQsm93UCb/mn2Qvivk8NWk6SFDTRVFj6g2I/5ugK5oEn0BQcbIC98bddIj+rBKO2Gzj7oPA==
   dependencies:
-    "@dhis2-ui/popper" "8.13.11"
-    "@dhis2-ui/portal" "8.13.11"
+    "@dhis2-ui/popper" "8.13.15"
+    "@dhis2-ui/portal" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/transfer@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-8.13.11.tgz#c1f4df94d29bcbd8ac8ef939ecf0c878db4fe986"
-  integrity sha512-i2PidKhj7TbyGjJBqOxA8IUNRvYYSvgXBMYyInxXfle0Wd7y66j6o19UqZyoGQj47+yxKbZcTLghMbd3IHjdTw==
+"@dhis2-ui/transfer@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-8.13.15.tgz#de7199c68664821c3653a0e123e9bc9cd22ec745"
+  integrity sha512-blcrk8S3YXwVwlPS7UUkdVq6eg48j4Uqi/nir3t2HbfcnJDl3EjQW22xv/nSHcvDi5rzZ6cflVHWLzp4lJdObg==
   dependencies:
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/field" "8.13.11"
-    "@dhis2-ui/input" "8.13.11"
-    "@dhis2-ui/intersection-detector" "8.13.11"
-    "@dhis2-ui/loader" "8.13.11"
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/field" "8.13.15"
+    "@dhis2-ui/input" "8.13.15"
+    "@dhis2-ui/intersection-detector" "8.13.15"
+    "@dhis2-ui/loader" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/user-avatar@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-8.13.11.tgz#8da2e4a9d8206cad612cf6eeeede1d3473621c30"
-  integrity sha512-NFzoOI+hZPC9mdUVhn4B/8cA7Lx31Y8RiQ8OduCP4yqApn+UAP9cLob7z+AbBEAreDQ5CmMtNup3mHtmAJJFeQ==
+"@dhis2-ui/user-avatar@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-8.13.15.tgz#619150face6561ecd679385a9fdd099d53a6b86e"
+  integrity sha512-wo6hYzTYY3rTtwiR1iSGunk02h5rvMfWok5HfCrvV4Dy+aSiegygS1ZQ806Dttmq4s03sVvMuZUX15v7GIfE4w==
   dependencies:
     "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "8.13.11"
+    "@dhis2/ui-constants" "8.13.15"
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
@@ -2790,7 +2083,7 @@
     "@dhis2/pwa" "9.0.1"
     moment "^2.24.0"
 
-"@dhis2/app-runtime@^3.2.3", "@dhis2/app-runtime@^3.8.0":
+"@dhis2/app-runtime@^3.2.3", "@dhis2/app-runtime@^3.9.3":
   version "3.9.4"
   resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.9.4.tgz#88243dbb9a4a805be744a61cffd13a4c3d2d031d"
   integrity sha512-CBwMXer5/Kcxf6MgfwPgpEaUSXbDXzwItCkH3i0nsjmkD0KIaEOZ6Y1pQL+/5RYnziZ5glYCFWsCKn0eCJrdJg==
@@ -3061,91 +2354,91 @@
     workbox-routing "^6.1.5"
     workbox-strategies "^6.1.5"
 
-"@dhis2/ui-constants@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-8.13.11.tgz#0a486c5ce7adff75633a9c7d75e5c47db9428ace"
-  integrity sha512-R6M++JeAnqetTBkFyly/of4KlaNq35DLjbxChOOFiWuY0ErBU83RaoUx+ZyaSM7UtWsUFfMuWDLIWef1OU9BBQ==
+"@dhis2/ui-constants@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-8.13.15.tgz#e1124e79f077aed6b3a9703b8a257701ec68717b"
+  integrity sha512-XrwKXNM0Xiv7O3E9vAukOJv8sD1QD9ruLOUS66+fs4pBLd0L+W6Gjr7LYG1B19rANXAShmfR+dqgD/pLVLAqsw==
   dependencies:
     prop-types "^15.7.2"
 
-"@dhis2/ui-forms@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-8.13.11.tgz#5dab105a3e4a0ad0110633c647942ad2b08a3858"
-  integrity sha512-VFy0gMNWogPfWiwAnY2hBG6vvJkpx6/BVKWxzsbRNLGn+7ZZPcmU4GtGWfue9oxBrwWXtT8PU4iGcJfAj/HsqQ==
-  dependencies:
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/checkbox" "8.13.11"
-    "@dhis2-ui/field" "8.13.11"
-    "@dhis2-ui/file-input" "8.13.11"
-    "@dhis2-ui/input" "8.13.11"
-    "@dhis2-ui/radio" "8.13.11"
-    "@dhis2-ui/select" "8.13.11"
-    "@dhis2-ui/switch" "8.13.11"
-    "@dhis2-ui/text-area" "8.13.11"
+"@dhis2/ui-forms@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-8.13.15.tgz#5098893acada5fb06d263ce271f556fc1bae1acf"
+  integrity sha512-+skh3quuARmzVlVJUYnN8EM5Dz9OLOsnh/GpCMXyiO4yjhajpbQ0QtMh/dFyQhCB3LzywDVaoge+kwJyrIS82Q==
+  dependencies:
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/checkbox" "8.13.15"
+    "@dhis2-ui/field" "8.13.15"
+    "@dhis2-ui/file-input" "8.13.15"
+    "@dhis2-ui/input" "8.13.15"
+    "@dhis2-ui/radio" "8.13.15"
+    "@dhis2-ui/select" "8.13.15"
+    "@dhis2-ui/switch" "8.13.15"
+    "@dhis2-ui/text-area" "8.13.15"
     "@dhis2/prop-types" "^3.1.2"
     classnames "^2.3.1"
     final-form "^4.20.2"
     prop-types "^15.7.2"
     react-final-form "^6.5.3"
 
-"@dhis2/ui-icons@8.13.11":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-8.13.11.tgz#7dc89bf3a84c0b452b9f2f365d039ae1338a4ed5"
-  integrity sha512-+wZZOB9lq1hpTj4IxoEV+vFij0Pho4T7NijEBdm6pd8+O24D8Tnkpb8fv8ZsDdkOob2X1WXM7ruswkku0kxZRg==
-
-"@dhis2/ui@^8.0.0", "@dhis2/ui@^8.7.7":
-  version "8.13.11"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-8.13.11.tgz#5702c5258676f5aba266783e4a21aaeb0c88333e"
-  integrity sha512-G4tfKDN/m3/VqyirViCkGgRSCQ3yFtSIrMwY8AjQesoGzBidXNEIITXdhUkpmJH9Lp/sTHFfk/G7vNVdWWLqKg==
-  dependencies:
-    "@dhis2-ui/alert" "8.13.11"
-    "@dhis2-ui/box" "8.13.11"
-    "@dhis2-ui/button" "8.13.11"
-    "@dhis2-ui/calendar" "8.13.11"
-    "@dhis2-ui/card" "8.13.11"
-    "@dhis2-ui/center" "8.13.11"
-    "@dhis2-ui/checkbox" "8.13.11"
-    "@dhis2-ui/chip" "8.13.11"
-    "@dhis2-ui/cover" "8.13.11"
-    "@dhis2-ui/css" "8.13.11"
-    "@dhis2-ui/divider" "8.13.11"
-    "@dhis2-ui/field" "8.13.11"
-    "@dhis2-ui/file-input" "8.13.11"
-    "@dhis2-ui/header-bar" "8.13.11"
-    "@dhis2-ui/help" "8.13.11"
-    "@dhis2-ui/input" "8.13.11"
-    "@dhis2-ui/intersection-detector" "8.13.11"
-    "@dhis2-ui/label" "8.13.11"
-    "@dhis2-ui/layer" "8.13.11"
-    "@dhis2-ui/legend" "8.13.11"
-    "@dhis2-ui/loader" "8.13.11"
-    "@dhis2-ui/logo" "8.13.11"
-    "@dhis2-ui/menu" "8.13.11"
-    "@dhis2-ui/modal" "8.13.11"
-    "@dhis2-ui/node" "8.13.11"
-    "@dhis2-ui/notice-box" "8.13.11"
-    "@dhis2-ui/organisation-unit-tree" "8.13.11"
-    "@dhis2-ui/pagination" "8.13.11"
-    "@dhis2-ui/popover" "8.13.11"
-    "@dhis2-ui/popper" "8.13.11"
-    "@dhis2-ui/portal" "8.13.11"
-    "@dhis2-ui/radio" "8.13.11"
-    "@dhis2-ui/required" "8.13.11"
-    "@dhis2-ui/segmented-control" "8.13.11"
-    "@dhis2-ui/select" "8.13.11"
-    "@dhis2-ui/selector-bar" "8.13.11"
-    "@dhis2-ui/sharing-dialog" "8.13.11"
-    "@dhis2-ui/switch" "8.13.11"
-    "@dhis2-ui/tab" "8.13.11"
-    "@dhis2-ui/table" "8.13.11"
-    "@dhis2-ui/tag" "8.13.11"
-    "@dhis2-ui/text-area" "8.13.11"
-    "@dhis2-ui/tooltip" "8.13.11"
-    "@dhis2-ui/transfer" "8.13.11"
-    "@dhis2-ui/user-avatar" "8.13.11"
-    "@dhis2/ui-constants" "8.13.11"
-    "@dhis2/ui-forms" "8.13.11"
-    "@dhis2/ui-icons" "8.13.11"
+"@dhis2/ui-icons@8.13.15":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-8.13.15.tgz#eb83784975d9686058ce71377928a0d4f726b517"
+  integrity sha512-d4A7oPgT6HKZgQDGaY8mX04EvQrnDmOv/L9n52JtnmEcPrPTqqhmCqdr/CQ8B/NP91nhFACDFBQ4ez4/YJVYKw==
+
+"@dhis2/ui@^8.0.0", "@dhis2/ui@^8.13.8":
+  version "8.13.15"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-8.13.15.tgz#d270dd9d1fcbc76f015adea97b033d4ca0fe95f4"
+  integrity sha512-bHg2CtXq8IRE86sDwlty3I5v8SrYmi2z469ugbEgrvNoVfgXxKeQZXzLMKxednt/sGDnSbveAduiq/QUMuKyQA==
+  dependencies:
+    "@dhis2-ui/alert" "8.13.15"
+    "@dhis2-ui/box" "8.13.15"
+    "@dhis2-ui/button" "8.13.15"
+    "@dhis2-ui/calendar" "8.13.15"
+    "@dhis2-ui/card" "8.13.15"
+    "@dhis2-ui/center" "8.13.15"
+    "@dhis2-ui/checkbox" "8.13.15"
+    "@dhis2-ui/chip" "8.13.15"
+    "@dhis2-ui/cover" "8.13.15"
+    "@dhis2-ui/css" "8.13.15"
+    "@dhis2-ui/divider" "8.13.15"
+    "@dhis2-ui/field" "8.13.15"
+    "@dhis2-ui/file-input" "8.13.15"
+    "@dhis2-ui/header-bar" "8.13.15"
+    "@dhis2-ui/help" "8.13.15"
+    "@dhis2-ui/input" "8.13.15"
+    "@dhis2-ui/intersection-detector" "8.13.15"
+    "@dhis2-ui/label" "8.13.15"
+    "@dhis2-ui/layer" "8.13.15"
+    "@dhis2-ui/legend" "8.13.15"
+    "@dhis2-ui/loader" "8.13.15"
+    "@dhis2-ui/logo" "8.13.15"
+    "@dhis2-ui/menu" "8.13.15"
+    "@dhis2-ui/modal" "8.13.15"
+    "@dhis2-ui/node" "8.13.15"
+    "@dhis2-ui/notice-box" "8.13.15"
+    "@dhis2-ui/organisation-unit-tree" "8.13.15"
+    "@dhis2-ui/pagination" "8.13.15"
+    "@dhis2-ui/popover" "8.13.15"
+    "@dhis2-ui/popper" "8.13.15"
+    "@dhis2-ui/portal" "8.13.15"
+    "@dhis2-ui/radio" "8.13.15"
+    "@dhis2-ui/required" "8.13.15"
+    "@dhis2-ui/segmented-control" "8.13.15"
+    "@dhis2-ui/select" "8.13.15"
+    "@dhis2-ui/selector-bar" "8.13.15"
+    "@dhis2-ui/sharing-dialog" "8.13.15"
+    "@dhis2-ui/switch" "8.13.15"
+    "@dhis2-ui/tab" "8.13.15"
+    "@dhis2-ui/table" "8.13.15"
+    "@dhis2-ui/tag" "8.13.15"
+    "@dhis2-ui/text-area" "8.13.15"
+    "@dhis2-ui/tooltip" "8.13.15"
+    "@dhis2-ui/transfer" "8.13.15"
+    "@dhis2-ui/user-avatar" "8.13.15"
+    "@dhis2/ui-constants" "8.13.15"
+    "@dhis2/ui-forms" "8.13.15"
+    "@dhis2/ui-icons" "8.13.15"
     prop-types "^15.7.2"
 
 "@emotion/is-prop-valid@^0.7.3":
@@ -3634,14 +2927,6 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
 "@jridgewell/source-map@^0.3.3":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda"
@@ -4119,18 +3404,7 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
   integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891"
-  integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==
-  dependencies:
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__core@^7.1.7":
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
   version "7.20.1"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
   integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==
@@ -4249,12 +3523,7 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/json-schema@^7.0.3":
+"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
   version "7.0.12"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
   integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
@@ -4320,16 +3589,11 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
-"@types/prettier@^2.0.0":
+"@types/prettier@^2.0.0", "@types/prettier@^2.1.5":
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
   integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
 
-"@types/prettier@^2.1.5":
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0"
-  integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==
-
 "@types/prop-types@*":
   version "15.7.5"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
@@ -5017,12 +4281,7 @@ acorn@^7.0.0, acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
-acorn@^8.8.2:
+acorn@^8.2.4, acorn@^8.7.1, acorn@^8.8.2:
   version "8.9.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59"
   integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==
@@ -6416,17 +5675,7 @@ browserslist@4.14.2:
     escalade "^3.0.2"
     node-releases "^1.1.61"
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.5:
-  version "4.21.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
-  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
-  dependencies:
-    caniuse-lite "^1.0.30001449"
-    electron-to-chromium "^1.4.284"
-    node-releases "^2.0.8"
-    update-browserslist-db "^1.0.10"
-
-browserslist@^4.12.0, browserslist@^4.6.2, browserslist@^4.6.4:
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.5, browserslist@^4.6.2, browserslist@^4.6.4:
   version "4.21.9"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635"
   integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
@@ -6675,12 +5924,7 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449:
-  version "1.0.30001474"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz#13b6fe301a831fe666cce8ca4ef89352334133d5"
-  integrity sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q==
-
-caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001503:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001503:
   version "1.0.30001508"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001508.tgz#4461bbc895c692a96da399639cc1e146e7302a33"
   integrity sha512-sdQZOJdmt3GJs1UMNpCCCyeuS2IEGLXnHyAo9yIO5JJDjbjoVRij4M1qep6P6gFpptD1PqIYgzM+gwJbOi92mw==
@@ -7418,14 +6662,7 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
-core-js-compat@^3.25.1:
-  version "3.30.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.0.tgz#99aa2789f6ed2debfa1df3232784126ee97f4d80"
-  integrity sha512-P5A2h/9mRYZFIAP+5Ab8ns6083IyVpSclU74UNvbGVQ8VM7n3n3/g2yF3AkKQ9NXz2O+ioxLbEWKnDtgsFamhg==
-  dependencies:
-    browserslist "^4.21.5"
-
-core-js-compat@^3.30.1, core-js-compat@^3.30.2:
+core-js-compat@^3.25.1, core-js-compat@^3.30.1, core-js-compat@^3.30.2:
   version "3.31.0"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1"
   integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==
@@ -8753,11 +7990,6 @@ electron-to-chromium@^1.3.564, electron-to-chromium@^1.4.431:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.441.tgz#94dd9c1cbf081d83f032a4f1cd9f787e21fc24ce"
   integrity sha512-LlCgQ8zgYZPymf5H4aE9itwiIWH4YlCiv1HFLmmcBeFYi5E+3eaIFnjHzYtcFQbaKfAW+CqZ9pgxo33DZuoqPg==
 
-electron-to-chromium@^1.4.284:
-  version "1.4.352"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.352.tgz#be96bd7c2f4b980deebc9338a49a67430a33ed73"
-  integrity sha512-ikFUEyu5/q+wJpMOxWxTaEVk2M1qKqTGKKyfJmod1CPZxKfYnxVS41/GCBQg21ItBpZybyN8sNpRqCUGm+Zc4Q==
-
 elliptic@^6.5.3:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
@@ -11543,20 +10775,13 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.0.0:
+is-core-module@^2.0.0, is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.7.0, is-core-module@^2.8.0, is-core-module@^2.9.0:
   version "2.12.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
   integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
   dependencies:
     has "^1.0.3"
 
-is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.7.0, is-core-module@^2.8.0, is-core-module@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
-  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
-  dependencies:
-    has "^1.0.3"
-
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -14666,11 +13891,6 @@ node-releases@^2.0.12:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
   integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
 
-node-releases@^2.0.8:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
-  integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
-
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -14850,7 +14070,7 @@ object.fromentries@^2.0.5, object.fromentries@^2.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-object.getownpropertydescriptors@^2.0.3:
+object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312"
   integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==
@@ -14861,16 +14081,6 @@ object.getownpropertydescriptors@^2.0.3:
     es-abstract "^1.21.2"
     safe-array-concat "^1.0.0"
 
-object.getownpropertydescriptors@^2.1.0:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz#db5a9002489b64eef903df81d6623c07e5b4b4d3"
-  integrity sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==
-  dependencies:
-    array.prototype.reduce "^1.0.5"
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-
 object.hasown@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
@@ -16070,7 +15280,7 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.0:
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
   version "6.0.13"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
   integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
@@ -16078,14 +15288,6 @@ postcss-selector-parser@^6.0.0:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-selector-parser@^6.0.2:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
-  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
 postcss-svgo@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e"
@@ -17150,7 +16352,7 @@ regex-parser@^2.2.11:
   resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
   integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
 
-regexp.prototype.flags@^1.2.0:
+regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
   integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
@@ -17159,15 +16361,6 @@ regexp.prototype.flags@^1.2.0:
     define-properties "^1.2.0"
     functions-have-names "^1.2.3"
 
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
-
 regexpp@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
@@ -17433,16 +16626,7 @@ resolve@1.18.1:
     is-core-module "^2.0.0"
     path-parse "^1.0.6"
 
-resolve@^1.1.4, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.3.3, resolve@^1.4.0:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
-  dependencies:
-    is-core-module "^2.9.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.18.1, resolve@^1.3.2:
+resolve@^1.1.4, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0:
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -18988,17 +18172,7 @@ terser@^4.1.2, terser@^4.6.2, terser@^4.6.3:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.0.0, terser@^5.16.5:
-  version "5.16.8"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.8.tgz#ccde583dabe71df3f4ed02b65eb6532e0fae15d5"
-  integrity sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
-terser@^5.3.4:
+terser@^5.0.0, terser@^5.16.5, terser@^5.3.4:
   version "5.18.1"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.18.1.tgz#6d8642508ae9fb7b48768e48f16d675c89a78460"
   integrity sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==
@@ -19665,14 +18839,6 @@ upath@^1.1.1, upath@^1.1.2, upath@^1.2.0:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-browserslist-db@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
-  dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
-
 update-browserslist-db@^1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
@@ -20031,8 +19197,10 @@ watchpack@^1.7.4:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
   integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
+    chokidar "^3.4.1"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
+    watchpack-chokidar2 "^2.0.1"
   optionalDependencies:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"

From 9dd1b6a046e94021ae4e63a67a3d6b16a099212d Mon Sep 17 00:00:00 2001
From: Tony Valle <79843014+superskip@users.noreply.github.com>
Date: Wed, 6 Sep 2023 10:59:37 +0200
Subject: [PATCH 14/16] feat: [DHIS2-14334] edit enrollment date (#3350)

---
 .../WidgetEnrollment/index.js                 |  12 +-
 i18n/en.pot                                   |   3 +
 package.json                                  |   1 +
 .../Enrollment/EnrollmentPage.actions.js      |   4 +
 .../EnrollmentPageDefault.component.js        |   4 +
 .../EnrollmentPageDefault.container.js        |  20 ++-
 .../EnrollmentPageDefault.types.js            |   2 +
 ...EnrollmentAddEventPageDefault.component.js |   1 +
 .../EnrollmentEditEventPage.component.js      |   1 +
 .../enrollment.actions.js                     |  12 ++
 .../common/EnrollmentOverviewDomain/index.js  |   2 +
 .../Actions/Actions.container.js              |   8 +-
 .../WidgetEnrollment/Date/Date.component.js   | 151 ++++++++++++++++++
 .../components/WidgetEnrollment/Date/index.js |   2 +
 .../WidgetEnrollment.component.js             |  52 +++---
 .../WidgetEnrollment.container.js             |  33 +++-
 .../WidgetEnrollment/enrollment.types.js      |   9 +-
 .../WidgetEnrollment/hooks/useEnrollment.js   |  49 +++++-
 .../WidgetEnrollment/hooks/useProgram.js      |   2 +-
 .../hooks/useUpdateEnrollment.js              |  42 +++++
 .../WidgetEnrollment/processErrorReports.js   |   8 +
 .../enrollmentDomain.reducerDescription.js    |  16 ++
 .../enrollmentPage.reducerDescription.js      |  11 ++
 yarn.lock                                     |   2 +-
 24 files changed, 400 insertions(+), 47 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollment/Date/Date.component.js
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollment/Date/index.js
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollment/hooks/useUpdateEnrollment.js
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollment/processErrorReports.js

diff --git a/cypress/integration/WidgetsForEnrollmentPages/WidgetEnrollment/index.js b/cypress/integration/WidgetsForEnrollmentPages/WidgetEnrollment/index.js
index 26146624d7..4584e1ba2a 100644
--- a/cypress/integration/WidgetsForEnrollmentPages/WidgetEnrollment/index.js
+++ b/cypress/integration/WidgetsForEnrollmentPages/WidgetEnrollment/index.js
@@ -19,18 +19,18 @@ Then('the enrollment widget should be opened', () => {
 });
 
 Then('the user sees the enrollment date', () => {
-    cy.get('[data-test="widget-enrollment"]').within(() => {
+    cy.get('[data-test="widget-enrollment-enrollment-date"]').within(() => {
         cy.get('[data-test="widget-enrollment-icon-calendar"]').should('exist');
-        cy.get('[data-test="widget-enrollment-enrollment-date"]')
-            .contains(`Date of enrollment ${getCurrentYear()}-08-01`)
+        cy.get('[data-test="widget-enrollment-date"]')
+            .contains(`Date of enrollment: ${getCurrentYear()}-08-01`)
             .should('exist');
     });
 });
 
 Then('the user sees the incident date', () => {
-    cy.get('[data-test="widget-enrollment"]').within(() => {
-        cy.get('[data-test="widget-enrollment-incident-date"]')
-            .contains(`Date of birth ${getCurrentYear()}-08-01`)
+    cy.get('[data-test="widget-enrollment-incident-date"]').within(() => {
+        cy.get('[data-test="widget-enrollment-date"]')
+            .contains(`Date of birth: ${getCurrentYear()}-08-01`)
             .should('exist');
     });
 });
diff --git a/i18n/en.pot b/i18n/en.pot
index 52dcc1b13e..9674ac525a 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -1158,6 +1158,9 @@ msgstr "Remove mark for follow-up"
 msgid "Mark for follow-up"
 msgstr "Mark for follow-up"
 
+msgid "Existing dates for auto-generated events will not be updated."
+msgstr "Existing dates for auto-generated events will not be updated."
+
 msgid "Enrollment date"
 msgstr "Enrollment date"
 
diff --git a/package.json b/package.json
index 6f9a6db16c..b2ed536c77 100644
--- a/package.json
+++ b/package.json
@@ -131,6 +131,7 @@
     },
     "resolutions": {
         "@babel/preset-react": "7.16.7",
+        "@js-temporal/polyfill": "0.4.3",
         "core-js": "2.5.7"
     },
     "browserslist": {
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPage.actions.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPage.actions.js
index a1f8c3250a..5f29c4daac 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPage.actions.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPage.actions.js
@@ -22,6 +22,7 @@ export const enrollmentPageActionTypes = {
 
     DELETE_ENROLLMENT: 'EnrollmentPage.DeleteEnrollment',
     UPDATE_TEI_DISPLAY_NAME: 'EnrollmentPage.UpdateTeiDisplayName',
+    UPDATE_ENROLLMENT_DATE: 'EnrollmentPage.UpdateEnrollmentDate',
 };
 
 export const fetchEnrollmentPageInformation = () =>
@@ -73,3 +74,6 @@ export const updateTeiDisplayName = (teiDisplayName: string) =>
     actionCreator(enrollmentPageActionTypes.UPDATE_TEI_DISPLAY_NAME)({
         teiDisplayName,
     });
+
+export const updateEnrollmentDate = ({ enrollmentId, enrollmentDate }: { enrollmentId: string, enrollmentDate: string }) =>
+    actionCreator(enrollmentPageActionTypes.UPDATE_ENROLLMENT_DATE)({ enrollmentId, enrollmentDate });
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.component.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.component.js
index d2b5b6f091..dac5ca2c8a 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.component.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.component.js
@@ -60,6 +60,8 @@ export const EnrollmentPageDefaultPlain = ({
     classes,
     onEventClick,
     onUpdateTeiAttributeValues,
+    onUpdateEnrollmentDate,
+    onUpdateIncidentDate,
     onEnrollmentError,
 }: PlainProps) => (
     <>
@@ -108,6 +110,8 @@ export const EnrollmentPageDefaultPlain = ({
                     programId={program.id}
                     onDelete={onDelete}
                     onAddNew={onAddNew}
+                    onUpdateEnrollmentDate={onUpdateEnrollmentDate}
+                    onUpdateIncidentDate={onUpdateIncidentDate}
                     onError={onEnrollmentError}
                 />}
             </div>
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js
index 976e03492a..12eb12de18 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js
@@ -8,8 +8,15 @@ import { useHistory } from 'react-router-dom';
 import {
     useCommonEnrollmentDomainData,
     updateEnrollmentAttributeValues,
+    updateEnrollmentDate,
+    updateIncidentDate,
     showEnrollmentError,
 } from '../../common/EnrollmentOverviewDomain';
+import {
+    updateEnrollmentDate as updateTopBarEnrollmentDate,
+    deleteEnrollment,
+    updateTeiDisplayName,
+} from '../EnrollmentPage.actions';
 import { useTrackerProgram } from '../../../../hooks/useTrackerProgram';
 import { useRulesEngineOrgUnit } from '../../../../hooks/useRulesEngineOrgUnit';
 import { EnrollmentPageDefaultComponent } from './EnrollmentPageDefault.component';
@@ -20,7 +27,6 @@ import {
     useRuleEffects,
 } from './hooks';
 import { buildUrlQueryString, useLocationQuery } from '../../../../utils/routing';
-import { deleteEnrollment, updateTeiDisplayName } from '../EnrollmentPage.actions';
 import { useFilteredWidgetData } from './hooks/useFilteredWidgetData';
 
 export const EnrollmentPageDefault = () => {
@@ -74,6 +80,7 @@ export const EnrollmentPageDefault = () => {
     const onEventClick = (eventId: string) => {
         history.push(`/enrollmentEventEdit?${buildUrlQueryString({ orgUnitId, eventId })}`);
     };
+
     const onUpdateTeiAttributeValues = useCallback((updatedAttributeValues, teiDisplayName) => {
         dispatch(updateEnrollmentAttributeValues(updatedAttributeValues
             .map(({ attribute, value }) => ({ id: attribute, value })),
@@ -81,6 +88,15 @@ export const EnrollmentPageDefault = () => {
         dispatch(updateTeiDisplayName(teiDisplayName));
     }, [dispatch]);
 
+    const onUpdateEnrollmentDate = useCallback((enrollmentDate) => {
+        dispatch(updateEnrollmentDate(enrollmentDate));
+        dispatch(updateTopBarEnrollmentDate({ enrollmentId, enrollmentDate }));
+    }, [dispatch, enrollmentId]);
+
+    const onUpdateIncidentDate = useCallback((incidentDate) => {
+        dispatch(updateIncidentDate(incidentDate));
+    }, [dispatch]);
+
     const onAddNew = () => {
         history.push(`/new?${buildUrlQueryString({ orgUnitId, programId, teiId })}`);
     };
@@ -107,6 +123,8 @@ export const EnrollmentPageDefault = () => {
             hideWidgets={hideWidgets}
             onEventClick={onEventClick}
             onUpdateTeiAttributeValues={onUpdateTeiAttributeValues}
+            onUpdateEnrollmentDate={onUpdateEnrollmentDate}
+            onUpdateIncidentDate={onUpdateIncidentDate}
             onEnrollmentError={onEnrollmentError}
         />
     );
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.js
index 3822b286a0..b8e3dbd4dd 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.js
@@ -19,6 +19,8 @@ export type Props = {|
     onCreateNew: (stageId: string) => void,
     onEventClick: (eventId: string) => void,
     onUpdateTeiAttributeValues: (attributes: Array<{ [key: string]: string }>, teiDisplayName: string) => void,
+    onUpdateEnrollmentDate: (enrollmentDate: string) => void,
+    onUpdateIncidentDate: (incidentDate: string) => void,
     onEnrollmentError: (message: string) => void,
 |};
 
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.component.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.component.js
index e741014b20..f7abac3990 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.component.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.component.js
@@ -126,6 +126,7 @@ const EnrollmentAddEventPagePain = ({
                             teiId={teiId}
                             enrollmentId={enrollmentId}
                             programId={programId}
+                            readOnlyMode
                             onDelete={onDelete}
                             onAddNew={onAddNew}
                             onError={onEnrollmentError}
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.component.js b/src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.component.js
index b5efd930b9..1add434b21 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.component.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentEditEvent/EnrollmentEditEventPage.component.js
@@ -138,6 +138,7 @@ const EnrollmentEditEventPagePain = ({
                         teiId={teiId}
                         enrollmentId={enrollmentId}
                         programId={programId}
+                        readOnlyMode
                         onDelete={onDelete}
                         onAddNew={onAddNew}
                         onError={onEnrollmentError}
diff --git a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js
index 6cdbe894ba..beb3832f89 100644
--- a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js
@@ -4,6 +4,8 @@ import { actionCreator } from '../../../../actions/actions.utils';
 
 export const enrollmentSiteActionTypes = {
     COMMON_ENROLLMENT_SITE_DATA_SET: 'EnrollmentSite.SetCommonData',
+    UPDATE_ENROLLMENT_DATE: 'Enrollment.UpdateEnrollmentDate',
+    UPDATE_INCIDENT_DATE: 'Enrollment.UpdateIncidentDate',
     UPDATE_ENROLLMENT_EVENTS: 'Enrollment.UpdateEnrollmentEvents',
     UPDATE_ENROLLMENT_EVENTS_WITHOUT_ID: 'Enrollment.UpdateEnrollmentEventsWithoutId',
     UPDATE_ENROLLMENT_ATTRIBUTE_VALUES: 'Enrollment.UpdateEnrollmentAttributeValues',
@@ -18,6 +20,16 @@ export const enrollmentSiteActionTypes = {
 export const setCommonEnrollmentSiteData = (enrollment: ApiEnrollment, attributeValues: ApiAttributeValues) =>
     actionCreator(enrollmentSiteActionTypes.COMMON_ENROLLMENT_SITE_DATA_SET)({ enrollment, attributeValues });
 
+export const updateEnrollmentDate = (enrollmentDate: string) =>
+    actionCreator(enrollmentSiteActionTypes.UPDATE_ENROLLMENT_DATE)({
+        enrollmentDate,
+    });
+
+export const updateIncidentDate = (incidentDate: string) =>
+    actionCreator(enrollmentSiteActionTypes.UPDATE_INCIDENT_DATE)({
+        incidentDate,
+    });
+
 export const updateEnrollmentEvents = (eventId: string, eventData: Object) =>
     actionCreator(enrollmentSiteActionTypes.UPDATE_ENROLLMENT_EVENTS)({
         eventId,
diff --git a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js
index e7a9b66f5b..f79612916d 100644
--- a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js
@@ -2,6 +2,8 @@
 export type { HideWidgets, WidgetEffects } from './enrollmentOverviewDomain.types';
 export {
     enrollmentSiteActionTypes,
+    updateEnrollmentDate,
+    updateIncidentDate,
     updateEnrollmentEvents,
     commitEnrollmentEvent,
     rollbackEnrollmentEvent,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js
index e83fdfda17..2ce98fcb38 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/Actions/Actions.container.js
@@ -3,6 +3,7 @@ import { useDataMutation } from '@dhis2/app-runtime';
 import React from 'react';
 import { ActionsComponent } from './Actions.component';
 import type { Props } from './actions.types';
+import { processErrorReports } from '../processErrorReports';
 
 const enrollmentUpdate = {
     resource: 'tracker?async=false&importStrategy=UPDATE',
@@ -18,13 +19,6 @@ const enrollmentDelete = {
         enrollments: [enrollment],
     }),
 };
-const processErrorReports = (error) => {
-    // $FlowFixMe[prop-missing]
-    const errorReports = error?.details?.validationReport?.errorReports;
-    return errorReports?.length > 0
-        ? errorReports.reduce((acc, errorReport) => `${acc} ${errorReport.message}`, '')
-        : error.message;
-};
 
 export const Actions = ({
     enrollment = {},
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Date/Date.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/Date/Date.component.js
new file mode 100644
index 0000000000..f3c7f36617
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/Date/Date.component.js
@@ -0,0 +1,151 @@
+// @flow
+import React, { useState, useCallback } from 'react';
+import moment from 'moment';
+import {
+    Button,
+    CalendarInput,
+    IconCalendar16,
+    IconEdit16,
+    colors,
+    spacersNum,
+} from '@dhis2/ui';
+import i18n from '@dhis2/d2-i18n';
+import { withStyles } from '@material-ui/core';
+import { convertValue as convertValueClientToView } from '../../../converters/clientToView';
+import { dataElementTypes } from '../../../metaData';
+
+type Props = {
+    date: string,
+    dateLabel: string,
+    editEnabled: boolean,
+    displayAutoGeneratedEventWarning: boolean,
+    onSave: (string) => void,
+    ...CssClasses,
+}
+
+const styles = {
+    editButton: {
+        display: 'inline-flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        flexShrink: 0,
+        cursor: 'pointer',
+        border: 'none',
+        borderRadius: '3px',
+        background: 'transparent',
+        color: colors.grey600,
+        padding: 0,
+        marginLeft: '2px',
+        '&:focus': {
+            outline: 'none',
+            background: colors.grey200,
+            color: colors.grey800,
+        },
+        '&:hover': {
+            background: colors.grey200,
+            color: colors.grey800,
+        },
+    },
+    calendar: {
+        paddingTop: '6px',
+    },
+    inputField: {
+        maxWidth: '200px',
+    },
+    buttonStrip: {
+        display: 'flex',
+        gap: `${spacersNum.dp4}px`,
+        margin: `${spacersNum.dp4}px 0`,
+    },
+    note: {
+        fontSize: '12px',
+        color: colors.grey700,
+    },
+};
+
+const DateComponentPlain = ({
+    date,
+    dateLabel,
+    editEnabled,
+    displayAutoGeneratedEventWarning,
+    onSave,
+    classes,
+}: Props) => {
+    const [editMode, setEditMode] = useState(false);
+    const [selectedDate, setSelectedDate] = useState();
+    const dateChangeHandler = useCallback(({ calendarDateString }) => {
+        setSelectedDate(calendarDateString);
+    }, [setSelectedDate]);
+    const displayDate = String(convertValueClientToView(date, dataElementTypes.DATE));
+
+    const onOpenEdit = () => {
+        // CalendarInput component only supports the YYYY-MM-DD format
+        setSelectedDate(moment(date).format('YYYY-MM-DD'));
+        setEditMode(true);
+    };
+    const saveHandler = () => {
+        // CalendarInput component only supports the YYYY-MM-DD format
+        if (selectedDate) {
+            const newDate = moment.utc(selectedDate, 'YYYY-MM-DD').format('YYYY-MM-DDTHH:mm:ss.SSS');
+            if (newDate !== date) {
+                onSave(newDate);
+            }
+        }
+        setEditMode(false);
+    };
+
+    return editMode ? (
+        <div data-test="widget-enrollment-date">
+            <div className={classes.inputField}>
+                <CalendarInput
+                    calendar="gregory"
+                    dense
+                    className={classes.calendar}
+                    label={dateLabel}
+                    date={selectedDate}
+                    onDateSelect={dateChangeHandler}
+                />
+            </div>
+            <div className={classes.buttonStrip}>
+                <Button
+                    primary
+                    small
+                    onClick={saveHandler}
+                >
+                    {i18n.t('Save')}
+                </Button>
+                <Button
+                    secondary
+                    small
+                    onClick={() => setEditMode(false)}
+                >
+                    {i18n.t('Cancel')}
+                </Button>
+            </div>
+            {displayAutoGeneratedEventWarning && (
+                <div className={classes.note}>
+                    {i18n.t('Existing dates for auto-generated events will not be updated.')}
+                </div>
+            )}
+        </div>
+    ) : (
+        <div className={classes.row} data-test="widget-enrollment-date">
+            <span data-test="widget-enrollment-icon-calendar">
+                <IconCalendar16 color={colors.grey600} />
+            </span>
+            {dateLabel}{': '}
+            {displayDate}
+            {editEnabled &&
+                <button
+                    className={classes.editButton}
+                    data-test="widget-enrollment-icon-edit-date"
+                    onClick={onOpenEdit}
+                >
+                    <IconEdit16 />
+                </button>
+            }
+        </div>
+    );
+};
+
+export const Date = withStyles(styles)(DateComponentPlain);
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/Date/index.js b/src/core_modules/capture-core/components/WidgetEnrollment/Date/index.js
new file mode 100644
index 0000000000..5fc124daa8
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/Date/index.js
@@ -0,0 +1,2 @@
+// @flow
+export { Date } from './Date.component';
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.component.js b/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.component.js
index 977793676c..15ebdb7c41 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.component.js
@@ -4,7 +4,6 @@ import moment from 'moment';
 import {
     IconClock16,
     IconDimensionOrgUnit16,
-    IconCalendar16,
     IconLocation16,
     colors,
     Tag,
@@ -20,6 +19,7 @@ import { Status } from './Status';
 import { convertValue as convertValueServerToClient } from '../../converters/serverToClient';
 import { convertValue as convertValueClientToView } from '../../converters/clientToView';
 import { dataElementTypes } from '../../metaData';
+import { Date } from './Date';
 import { Actions } from './Actions';
 
 const styles = {
@@ -52,11 +52,15 @@ export const WidgetEnrollmentPlain = ({
     ownerOrgUnit = {},
     refetchEnrollment,
     refetchTEI,
-    error,
+    initError,
     loading,
     canAddNew,
+    editDateEnabled,
+    displayAutoGeneratedEventWarning,
     onDelete,
     onAddNew,
+    updateEnrollmentDate,
+    updateIncidentDate,
     onError,
     onSuccess,
 }: PlainProps) => {
@@ -72,13 +76,13 @@ export const WidgetEnrollmentPlain = ({
                 onClose={useCallback(() => setOpenStatus(false), [setOpenStatus])}
                 open={open}
             >
-                {error && (
+                {initError && (
                     <div className={classes.enrollment}>
                         {i18n.t('Enrollment widget could not be loaded. Please try again later')}
                     </div>
                 )}
                 {loading && <LoadingMaskElementCenter />}
-                {!error && !loading && (
+                {!initError && !loading && (
                     <div className={classes.enrollment}>
                         <div className={classes.statuses} data-test="widget-enrollment-status">
                             {enrollment.followUp && (
@@ -89,28 +93,28 @@ export const WidgetEnrollmentPlain = ({
                             <Status status={enrollment.status} />
                         </div>
 
-                        <div className={classes.row} data-test="widget-enrollment-enrollment-date">
-                            <span className={classes.icon} data-test="widget-enrollment-icon-calendar">
-                                <IconCalendar16 color={colors.grey600} />
-                            </span>
-                            {getEnrollmentDateLabel(program)}{' '}
-                            {convertValueClientToView(
-                                convertValueServerToClient(enrollment.enrolledAt, dataElementTypes.DATE),
-                                dataElementTypes.DATE,
-                            )}
-                        </div>
+                        <span data-test="widget-enrollment-enrollment-date">
+                            <Date
+                                date={enrollment.enrolledAt}
+                                dateLabel={getEnrollmentDateLabel(program)}
+                                editEnabled={editDateEnabled}
+                                displayAutoGeneratedEventWarning={displayAutoGeneratedEventWarning}
+                                onSave={updateEnrollmentDate}
+                                classes={classes}
+                            />
+                        </span>
 
                         {program.displayIncidentDate && (
-                            <div className={classes.row} data-test="widget-enrollment-incident-date">
-                                <span className={classes.icon}>
-                                    <IconCalendar16 color={colors.grey600} />
-                                </span>
-                                {getIncidentDateLabel(program)}{' '}
-                                {convertValueClientToView(
-                                    convertValueServerToClient(enrollment.occurredAt, dataElementTypes.DATE),
-                                    dataElementTypes.DATE,
-                                )}
-                            </div>
+                            <span data-test="widget-enrollment-incident-date">
+                                <Date
+                                    date={enrollment.occurredAt}
+                                    dateLabel={getIncidentDateLabel(program)}
+                                    editEnabled={editDateEnabled}
+                                    displayAutoGeneratedEventWarning={displayAutoGeneratedEventWarning}
+                                    onSave={updateIncidentDate}
+                                    classes={classes}
+                                />
+                            </span>
                         )}
 
                         <div className={classes.row} data-test="widget-enrollment-orgunit">
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js b/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js
index 8660f704f4..38296cfa32 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js
@@ -10,8 +10,30 @@ import { useProgram } from './hooks/useProgram';
 import type { Props } from './enrollment.types';
 import { plainStatus } from './constants/status.const';
 
-export const WidgetEnrollment = ({ teiId, enrollmentId, programId, onDelete, onAddNew, onError, onSuccess }: Props) => {
-    const { error: errorEnrollment, enrollment, refetch: refetchEnrollment } = useEnrollment(enrollmentId);
+export const WidgetEnrollment = ({
+    teiId,
+    enrollmentId,
+    programId,
+    readOnlyMode = false,
+    onDelete,
+    onAddNew,
+    onUpdateEnrollmentDate,
+    onUpdateIncidentDate,
+    onError,
+    onSuccess,
+}: Props) => {
+    const {
+        enrollment,
+        updateEnrollmentDate,
+        updateIncidentDate,
+        error: errorEnrollment,
+        refetch: refetchEnrollment,
+    } = useEnrollment({
+        enrollmentId,
+        onUpdateEnrollmentDate,
+        onUpdateIncidentDate,
+        onError,
+    });
     const { error: errorProgram, program } = useProgram(programId);
     const {
         error: errorOwnerOrgUnit,
@@ -23,6 +45,7 @@ export const WidgetEnrollment = ({ teiId, enrollmentId, programId, onDelete, onA
     const canAddNew = enrollments
         .filter(item => item.program === programId)
         .every(item => item.status !== plainStatus.ACTIVE);
+    const containsAutoGeneratedEvent = program && program.programStages.some(({ autoGenerateEvent }) => autoGenerateEvent);
     const error = errorEnrollment || errorProgram || errorOwnerOrgUnit || errorOrgUnit;
 
     if (error) {
@@ -33,6 +56,8 @@ export const WidgetEnrollment = ({ teiId, enrollmentId, programId, onDelete, onA
         <WidgetEnrollmentComponent
             enrollment={enrollment}
             canAddNew={canAddNew}
+            editDateEnabled={!readOnlyMode && program && program.access.data.write}
+            displayAutoGeneratedEventWarning={containsAutoGeneratedEvent}
             program={program}
             refetchEnrollment={refetchEnrollment}
             refetchTEI={refetchTEI}
@@ -40,7 +65,9 @@ export const WidgetEnrollment = ({ teiId, enrollmentId, programId, onDelete, onA
             loading={!(enrollment && program && displayName)}
             onDelete={onDelete}
             onAddNew={onAddNew}
-            error={error}
+            updateEnrollmentDate={updateEnrollmentDate}
+            updateIncidentDate={updateIncidentDate}
+            initError={error}
             onError={onError}
             onSuccess={onSuccess}
         />
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js b/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js
index a3eacd0fdb..d4e14794b8 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js
@@ -5,8 +5,11 @@ export type Props = {|
     teiId: string,
     enrollmentId: string,
     programId: string,
+    readOnlyMode?: boolean,
     onDelete: () => void,
     onAddNew: () => void,
+    onUpdateEnrollmentDate?: (enrollmentDate: string) => void,
+    onUpdateIncidentDate?: (enrollmentDate: string) => void,
     onError?: (message: string) => void,
     onSuccess?: () => void,
 |};
@@ -17,9 +20,13 @@ export type PlainProps = {|
     ownerOrgUnit: Object,
     refetchEnrollment: QueryRefetchFunction,
     refetchTEI: QueryRefetchFunction,
-    error?: FetchError,
+    initError?: FetchError,
     loading: boolean,
     canAddNew: boolean,
+    editDateEnabled: boolean,
+    displayAutoGeneratedEventWarning: boolean,
+    updateEnrollmentDate: (enrollmentDate: string) => void,
+    updateIncidentDate: (incidentDate: string) => void,
     onDelete: () => void,
     onAddNew: () => void,
     onError?: (message: string) => void,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js
index 87ae5120c4..e9b2d305fd 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js
@@ -1,8 +1,23 @@
 // @flow
-import { useMemo, useEffect } from 'react';
+import { useMemo, useEffect, useState } from 'react';
 import { useDataQuery } from '@dhis2/app-runtime';
+import { useUpdateEnrollment } from './useUpdateEnrollment';
+
+type Props = {
+    enrollmentId: string,
+    onUpdateEnrollmentDate?: (date: string) => void,
+    onUpdateIncidentDate?: (date: string) => void,
+    onError?: (error: any) => void,
+}
+
+export const useEnrollment = ({
+    enrollmentId,
+    onUpdateEnrollmentDate,
+    onUpdateIncidentDate,
+    onError,
+}: Props) => {
+    const [enrollment, setEnrollment] = useState();
 
-export const useEnrollment = (enrollmentId: string) => {
     const { error, loading, data, refetch } = useDataQuery(
         useMemo(
             () => ({
@@ -20,5 +35,33 @@ export const useEnrollment = (enrollmentId: string) => {
         enrollmentId && refetch({ variables: { enrollmentId } });
     }, [refetch, enrollmentId]);
 
-    return { error, refetch, enrollment: !loading && data?.enrollment };
+    useEffect(() => {
+        if (data) {
+            setEnrollment(data.enrollment);
+        }
+    }, [setEnrollment, data]);
+
+    const updateEnrollmentDate = useUpdateEnrollment({
+        enrollment,
+        setEnrollment,
+        propertyName: 'enrolledAt',
+        updateHandler: onUpdateEnrollmentDate,
+        onError,
+    });
+
+    const updateIncidentDate = useUpdateEnrollment({
+        enrollment,
+        setEnrollment,
+        propertyName: 'occurredAt',
+        updateHandler: onUpdateIncidentDate,
+        onError,
+    });
+
+    return {
+        error,
+        refetch,
+        enrollment: !loading && enrollment,
+        updateEnrollmentDate,
+        updateIncidentDate,
+    };
 };
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js
index 937f5644c6..fec7939f6d 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js
@@ -10,7 +10,7 @@ export const useProgram = (programId: string) => {
                     resource: `programs/${programId}`,
                     params: {
                         fields: [
-                            'displayIncidentDate,incidentDateLabel,enrollmentDateLabel,onlyEnrollOnce,trackedEntityType[displayName]',
+                            'displayIncidentDate,incidentDateLabel,enrollmentDateLabel,onlyEnrollOnce,trackedEntityType[displayName],programStages[autoGenerateEvent],access',
                         ],
                     },
                 },
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useUpdateEnrollment.js b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useUpdateEnrollment.js
new file mode 100644
index 0000000000..fd7c96f827
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useUpdateEnrollment.js
@@ -0,0 +1,42 @@
+// @flow
+import { useCallback } from 'react';
+import { useDataMutation } from '@dhis2/app-runtime';
+import { processErrorReports } from '../processErrorReports';
+
+const enrollmentUpdate = {
+    resource: 'tracker?async=false&importStrategy=UPDATE',
+    type: 'create',
+    data: enrollment => ({
+        enrollments: [enrollment],
+    }),
+};
+
+export const useUpdateEnrollment = ({
+    enrollment,
+    setEnrollment,
+    propertyName,
+    updateHandler,
+    onError,
+}: {
+    enrollment: any,
+    setEnrollment: (enrollment: any) => void,
+    propertyName: string,
+    updateHandler?: (value: any) => void,
+    onError?: (error: any) => void,
+}) => {
+    const [updateEnrollmentMutation] = useDataMutation(enrollmentUpdate, {
+        onError: (e) => {
+            setEnrollment(enrollment);
+            updateHandler && updateHandler(enrollment[propertyName]);
+            onError && onError(processErrorReports(e));
+        },
+    });
+
+    return useCallback((value: string) => {
+        const updatedEnrollment = { ...enrollment };
+        updatedEnrollment[propertyName] = value;
+        setEnrollment(updatedEnrollment);
+        updateEnrollmentMutation(updatedEnrollment);
+        updateHandler && updateHandler(value);
+    }, [enrollment, setEnrollment, propertyName, updateHandler, updateEnrollmentMutation]);
+};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/processErrorReports.js b/src/core_modules/capture-core/components/WidgetEnrollment/processErrorReports.js
new file mode 100644
index 0000000000..d60fa40b31
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/processErrorReports.js
@@ -0,0 +1,8 @@
+// @flow
+export const processErrorReports = (error: any) => {
+    // $FlowFixMe[prop-missing]
+    const errorReports = error?.details?.validationReport?.errorReports;
+    return errorReports?.length > 0
+        ? errorReports.reduce((acc, errorReport) => `${acc} ${errorReport.message}`, '')
+        : error.message;
+};
diff --git a/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js b/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
index b3470cbe24..9e0745fa5b 100644
--- a/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
+++ b/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
@@ -8,6 +8,8 @@ import { actionTypes as editEventActionTypes } from '../../components/WidgetEven
 const initialReducerValue = {};
 const {
     COMMON_ENROLLMENT_SITE_DATA_SET,
+    UPDATE_ENROLLMENT_DATE,
+    UPDATE_INCIDENT_DATE,
     UPDATE_ENROLLMENT_EVENTS,
     UPDATE_ENROLLMENT_EVENTS_WITHOUT_ID,
     UPDATE_ENROLLMENT_ATTRIBUTE_VALUES,
@@ -25,6 +27,20 @@ export const enrollmentDomainDesc = createReducerDescription(
             attributeValues,
             enrollmentId: enrollment?.enrollment,
         }),
+        [UPDATE_ENROLLMENT_DATE]: (state, { payload: { enrollmentDate } }) => ({
+            ...state,
+            enrollment: {
+                ...state.enrollment,
+                enrolledAt: enrollmentDate,
+            },
+        }),
+        [UPDATE_INCIDENT_DATE]: (state, { payload: { incidentDate } }) => ({
+            ...state,
+            enrollment: {
+                ...state.enrollment,
+                occurredAt: incidentDate,
+            },
+        }),
         [UPDATE_ENROLLMENT_EVENTS]: (
             state,
             { payload: { eventId, eventData } },
diff --git a/src/core_modules/capture-core/reducers/descriptions/enrollmentPage.reducerDescription.js b/src/core_modules/capture-core/reducers/descriptions/enrollmentPage.reducerDescription.js
index bfff16fabb..87827640b1 100644
--- a/src/core_modules/capture-core/reducers/descriptions/enrollmentPage.reducerDescription.js
+++ b/src/core_modules/capture-core/reducers/descriptions/enrollmentPage.reducerDescription.js
@@ -20,6 +20,7 @@ const {
     MISSING_MESSAGE_VIEW,
     DELETE_ENROLLMENT,
     UPDATE_TEI_DISPLAY_NAME,
+    UPDATE_ENROLLMENT_DATE,
 } = enrollmentPageActionTypes;
 
 export const enrollmentPageDesc = createReducerDescription({
@@ -73,6 +74,16 @@ export const enrollmentPageDesc = createReducerDescription({
            ...state,
            teiDisplayName,
        }),
+    [UPDATE_ENROLLMENT_DATE]:
+        (state, { payload: { enrollmentId, enrollmentDate } }) => ({
+            ...state,
+            enrollments: state.enrollments.map((enrollment) => {
+                if (enrollment.enrollment === enrollmentId) {
+                    enrollment.enrolledAt = enrollmentDate;
+                }
+                return enrollment;
+            }),
+        }),
     [PAGE_CLEAN]: () => initialReducerValue,
     [DELETE_ENROLLMENT]: (state, { payload: { enrollmentId } }) => ({
         ...state,
diff --git a/yarn.lock b/yarn.lock
index 0c0d33e902..983b457b91 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2948,7 +2948,7 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@js-temporal/polyfill@^0.4.2":
+"@js-temporal/polyfill@0.4.3", "@js-temporal/polyfill@^0.4.2":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@js-temporal/polyfill/-/polyfill-0.4.3.tgz#e8f8cf86745eb5050679c46a5ebedb9a9cc1f09b"
   integrity sha512-6Fmjo/HlkyVCmJzAPnvtEWlcbQUSRhi8qlN9EtJA/wP7FqXsevLLrlojR44kzNzrRkpf7eDJ+z7b4xQD/Ycypw==

From 85a67db8fe81843bdfb8a6b6a1fd19ad05faad72 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Wed, 6 Sep 2023 09:10:30 +0000
Subject: [PATCH 15/16] chore(release): cut 100.38.0 [skip release]

# [100.38.0](https://github.com/dhis2/capture-app/compare/v100.37.0...v100.38.0) (2023-09-06)

### Features

* [DHIS2-14334] edit enrollment date ([#3350](https://github.com/dhis2/capture-app/issues/3350)) ([9dd1b6a](https://github.com/dhis2/capture-app/commit/9dd1b6a046e94021ae4e63a67a3d6b16a099212d))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6487c20723..4e24ce53c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [100.38.0](https://github.com/dhis2/capture-app/compare/v100.37.0...v100.38.0) (2023-09-06)
+
+
+### Features
+
+* [DHIS2-14334] edit enrollment date ([#3350](https://github.com/dhis2/capture-app/issues/3350)) ([9dd1b6a](https://github.com/dhis2/capture-app/commit/9dd1b6a046e94021ae4e63a67a3d6b16a099212d))
+
 # [100.37.0](https://github.com/dhis2/capture-app/compare/v100.36.0...v100.37.0) (2023-08-22)
 
 
diff --git a/package.json b/package.json
index b2ed536c77..523f6082d0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.37.0",
+    "version": "100.38.0",
     "cacheVersion": "5",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.37.0",
+        "@dhis2/rules-engine-javascript": "100.38.0",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 7e57d9d6a2..9764aec92c 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.37.0",
+    "version": "100.38.0",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From 4ef2973b71d6376f99db07e70bc4d51facb8018e Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Thu, 7 Sep 2023 15:32:12 +0300
Subject: [PATCH 16/16] feat: [DHIS2-13343] hidden program stage rule effect
 (#3406)

---
 .../EnrollmentPage/HiddenProgramStage.feature |  7 ++
 .../HiddenProgramStage/index.js               | 66 +++++++++++++++++++
 i18n/en.pot                                   |  4 +-
 .../rulesEffectsProcessor.js                  | 13 ++++
 .../rules-engine/src/rulesEngine.types.js     |  4 ++
 .../EnrollmentPageDefault.component.js        |  3 +
 .../EnrollmentPageDefault.container.js        |  3 +-
 .../EnrollmentPageDefault.types.js            |  2 +
 .../EnrollmentQuickActions.component.js       | 18 +++--
 .../EnrollmentPageDefault/hooks/index.js      |  3 +-
 .../ProgramStageSelector.component.js         |  3 +-
 .../ProgramStageSelector.container.js         | 20 +++++-
 .../common/EnrollmentOverviewDomain/index.js  |  1 +
 .../useRuleEffects/index.js                   |  3 +
 .../useRuleEffects}/useRuleEffects.js         |  7 +-
 .../useRuleEffects}/useRuleEffects.types.js   |  2 +-
 .../ErrorText/ErrorText.component.js          | 20 ++++++
 .../ErrorText/ErrorText.types.js              |  5 ++
 .../ErrorText/index.js                        |  2 +
 .../FinishButtons/FinishButtons.component.js  | 42 ++++++++----
 .../FinishButtons/finishButtons.types.js      |  4 ++
 .../Validated/Validated.component.js          | 12 ++--
 .../Validated/Validated.container.js          |  8 ++-
 .../Validated/validated.types.js              |  1 +
 .../Stages/Stage/Stage.component.js           | 44 +++++++++----
 .../StageDetail/StageDetail.component.js      | 12 +++-
 .../Stage/StageDetail/stageDetail.types.js    |  1 +
 .../types/common.types.js                     |  4 +-
 .../rulesEffects.reducerDescription.js        | 17 +++++
 .../rulesEffectsForTrackerProgram.test.js     |  2 +
 .../trackerCapture.reducerDescriptions.js     |  2 +
 31 files changed, 287 insertions(+), 48 deletions(-)
 create mode 100644 cypress/integration/EnrollmentPage/HiddenProgramStage.feature
 create mode 100644 cypress/integration/EnrollmentPage/HiddenProgramStage/index.js
 create mode 100644 src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/index.js
 rename src/core_modules/capture-core/components/Pages/{Enrollment/EnrollmentPageDefault/hooks => common/EnrollmentOverviewDomain/useRuleEffects}/useRuleEffects.js (94%)
 rename src/core_modules/capture-core/components/Pages/{Enrollment/EnrollmentPageDefault/hooks => common/EnrollmentOverviewDomain/useRuleEffects}/useRuleEffects.types.js (81%)
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.component.js
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.types.js
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/index.js

diff --git a/cypress/integration/EnrollmentPage/HiddenProgramStage.feature b/cypress/integration/EnrollmentPage/HiddenProgramStage.feature
new file mode 100644
index 0000000000..4e6e427e3e
--- /dev/null
+++ b/cypress/integration/EnrollmentPage/HiddenProgramStage.feature
@@ -0,0 +1,7 @@
+Feature: Hidden program stage
+
+    Scenario: The user cannot add an event in a hidden program stage
+        Given you add an enrollment event that will result in a rule effect to hide a program stage
+        Then the New Postpartum care visit event button is disabled in the stages and events widget
+        And and an error is show in the Postpartum care visit stage
+        And the Postpartum care visit button is disabled in the enrollmentEventNew page
diff --git a/cypress/integration/EnrollmentPage/HiddenProgramStage/index.js b/cypress/integration/EnrollmentPage/HiddenProgramStage/index.js
new file mode 100644
index 0000000000..edf6b833bd
--- /dev/null
+++ b/cypress/integration/EnrollmentPage/HiddenProgramStage/index.js
@@ -0,0 +1,66 @@
+import moment from 'moment';
+
+const cleanUpIfApplicable = () => {
+    cy.buildApiUrl(
+        'tracker',
+        'trackedEntities/uW8Y7AIcRKA?program=WSGAb5XwJ3Y&fields=enrollments',
+    )
+        .then(url => cy.request(url))
+        .then(({ body }) => {
+            const enrollment = body.enrollments?.find(e => e.enrollment === 'fmhIsWXVDmS');
+            const event = enrollment?.events?.find(e => e.programStage === 'PFDfvmGpsR3');
+            if (!event) {
+                return null;
+            }
+            return cy
+                .buildApiUrl('events', event.event)
+                .then(eventUrl =>
+                    cy.request('DELETE', eventUrl));
+        });
+};
+
+Given('you add an enrollment event that will result in a rule effect to hide a program stage', () => {
+    cleanUpIfApplicable();
+    cy.visit(
+        '/#/enrollmentEventNew?enrollmentId=fmhIsWXVDmS&orgUnitId=s7SLtx8wmRA&programId=WSGAb5XwJ3Y&stageId=PFDfvmGpsR3&teiId=uW8Y7AIcRKA',
+    );
+
+    cy.get('[data-test="capture-ui-input"]')
+        .eq(0)
+        .type(moment().format('YYYY-MM-DD'))
+        .blur();
+
+    cy
+        .get('[data-test="virtualized-select"]')
+        .eq(6)
+        .click()
+        .contains('Termination of pregnancy')
+        .click();
+
+    cy.contains('[data-test="dhis2-uicore-button"]', 'Save without completing').click();
+});
+
+Then('the New Postpartum care visit event button is disabled in the stages and events widget', () => {
+    cy.contains('[data-test="create-new-button"]', 'New Postpartum care visit event')
+        .should('be.disabled');
+});
+
+Then('and an error is show in the Postpartum care visit stage', () => {
+    cy.visit(
+        '/#/enrollmentEventNew?enrollmentId=fmhIsWXVDmS&orgUnitId=s7SLtx8wmRA&programId=WSGAb5XwJ3Y&teiId=uW8Y7AIcRKA&stageId=bbKtnxRZKEP',
+    );
+    cy.contains('[data-test="dhis2-uicore-button"]', 'Complete')
+        .should('be.disabled');
+    cy.contains('[data-test="dhis2-uicore-button"]', 'Save without completing')
+        .should('be.disabled');
+    cy.contains('[data-test="dhis2-uicore-noticebox-content"]', 'You can\'t add any more Postpartum care visit events')
+        .should('exist');
+});
+
+Then('the Postpartum care visit button is disabled in the enrollmentEventNew page', () => {
+    cy.visit(
+        '/#/enrollmentEventNew?enrollmentId=fmhIsWXVDmS&orgUnitId=s7SLtx8wmRA&programId=WSGAb5XwJ3Y&teiId=uW8Y7AIcRKA',
+    );
+
+    cy.contains('[data-test="program-stage-selector-button"]', 'Postpartum care visit').should('be.disabled');
+});
diff --git a/i18n/en.pot b/i18n/en.pot
index 9674ac525a..e179d736a4 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2023-08-22T12:04:52.436Z\n"
-"PO-Revision-Date: 2023-08-22T12:04:52.436Z\n"
+"POT-Creation-Date: 2023-09-04T07:07:59.195Z\n"
+"PO-Revision-Date: 2023-09-04T07:07:59.195Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
diff --git a/packages/rules-engine/src/processors/rulesEffectsProcessor/rulesEffectsProcessor.js b/packages/rules-engine/src/processors/rulesEffectsProcessor/rulesEffectsProcessor.js
index da59fe6d94..15951dbc57 100644
--- a/packages/rules-engine/src/processors/rulesEffectsProcessor/rulesEffectsProcessor.js
+++ b/packages/rules-engine/src/processors/rulesEffectsProcessor/rulesEffectsProcessor.js
@@ -12,6 +12,7 @@ import type {
     IConvertOutputRulesEffectsValue,
     AssignOutputEffect,
     HideOutputEffect,
+    HideProgramStageEffect,
     MessageEffect,
     GeneralErrorEffect,
     GeneralWarningEffect,
@@ -207,6 +208,17 @@ export function getRulesEffectsProcessor(
         };
     }
 
+    function processHideProgramStage(effect: ProgramRuleEffect): ?HideProgramStageEffect {
+        if (!effect.programStageId) {
+            return null;
+        }
+
+        return {
+            type: effectActions.HIDE_PROGRAM_STAGE,
+            id: effect.programStageId,
+        };
+    }
+
     function processMakeCompulsory(effect: ProgramRuleEffect): Array<CompulsoryEffect> {
         return createEffectsForConfiguredDataTypes(effect, () => ({
             type: effectActions.MAKE_COMPULSORY,
@@ -267,6 +279,7 @@ export function getRulesEffectsProcessor(
         [effectActions.SHOW_WARNING]: processShowWarning,
         [effectActions.SHOW_ERROR_ONCOMPLETE]: processShowErrorOnComplete,
         [effectActions.SHOW_WARNING_ONCOMPLETE]: processShowWarningOnComplete,
+        [effectActions.HIDE_PROGRAM_STAGE]: processHideProgramStage,
         [effectActions.HIDE_SECTION]: processHideSection,
         [effectActions.MAKE_COMPULSORY]: processMakeCompulsory,
         [effectActions.DISPLAY_TEXT]: processDisplayText,
diff --git a/packages/rules-engine/src/rulesEngine.types.js b/packages/rules-engine/src/rulesEngine.types.js
index e2edca905b..decb2154a0 100644
--- a/packages/rules-engine/src/rulesEngine.types.js
+++ b/packages/rules-engine/src/rulesEngine.types.js
@@ -30,6 +30,10 @@ export type HideOutputEffect = OutputEffect & {
 
 };
 
+export type HideProgramStageEffect = OutputEffect & {
+
+};
+
 export type MessageEffect = OutputEffect & {
     message: string,
 };
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.component.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.component.js
index dac5ca2c8a..0759fcd558 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.component.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.component.js
@@ -63,6 +63,7 @@ export const EnrollmentPageDefaultPlain = ({
     onUpdateEnrollmentDate,
     onUpdateIncidentDate,
     onEnrollmentError,
+    ruleEffects,
 }: PlainProps) => (
     <>
         <div className={classes.title}>{i18n.t('Enrollment Dashboard')}</div>
@@ -71,6 +72,7 @@ export const EnrollmentPageDefaultPlain = ({
                 <EnrollmentQuickActions
                     stages={stages}
                     events={events}
+                    ruleEffects={ruleEffects}
                 />
                 <WidgetStagesAndEvents
                     programId={program.id}
@@ -79,6 +81,7 @@ export const EnrollmentPageDefaultPlain = ({
                     onViewAll={onViewAll}
                     onCreateNew={onCreateNew}
                     onEventClick={onEventClick}
+                    ruleEffects={ruleEffects}
                 />
             </div>
             <div className={classes.rightColumn}>
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js
index 12eb12de18..2e7b8da1bc 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.js
@@ -7,6 +7,7 @@ import { useDispatch } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import {
     useCommonEnrollmentDomainData,
+    useRuleEffects,
     updateEnrollmentAttributeValues,
     updateEnrollmentDate,
     updateIncidentDate,
@@ -24,7 +25,6 @@ import {
     useProgramMetadata,
     useHideWidgetByRuleLocations,
     useProgramStages,
-    useRuleEffects,
 } from './hooks';
 import { buildUrlQueryString, useLocationQuery } from '../../../../utils/routing';
 import { useFilteredWidgetData } from './hooks/useFilteredWidgetData';
@@ -126,6 +126,7 @@ export const EnrollmentPageDefault = () => {
             onUpdateEnrollmentDate={onUpdateEnrollmentDate}
             onUpdateIncidentDate={onUpdateIncidentDate}
             onEnrollmentError={onEnrollmentError}
+            ruleEffects={ruleEffects}
         />
     );
 };
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.js
index b8e3dbd4dd..4e88f4a39b 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.js
@@ -1,4 +1,5 @@
 // @flow
+import { typeof effectActions } from '@dhis2/rules-engine-javascript';
 import type { Program } from 'capture-core/metaData';
 import type { Stage } from 'capture-core/components/WidgetStagesAndEvents/types/common.types';
 import type { WidgetEffects, HideWidgets } from '../../common/EnrollmentOverviewDomain';
@@ -22,6 +23,7 @@ export type Props = {|
     onUpdateEnrollmentDate: (enrollmentDate: string) => void,
     onUpdateIncidentDate: (incidentDate: string) => void,
     onEnrollmentError: (message: string) => void,
+    ruleEffects?: Array<{id: string, type: $Values<effectActions>}>;
 |};
 
 export type PlainProps = {|
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.component.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.component.js
index 2853c9986e..e5621d7449 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.component.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.component.js
@@ -19,7 +19,7 @@ const styles = {
 
 };
 
-const EnrollmentQuickActionsComponent = ({ stages, events, classes }) => {
+const EnrollmentQuickActionsComponent = ({ stages, events, ruleEffects, classes }) => {
     const [open, setOpen] = useState(true);
     const history = useHistory();
     const { enrollmentId, programId, teiId, orgUnitId } = useLocationQuery();
@@ -33,10 +33,20 @@ const EnrollmentQuickActionsComponent = ({ stages, events, classes }) => {
         return mutatedStage;
     }), [events, stages]);
 
+    const hiddenProgramStageRuleEffects = useMemo(
+        () => ruleEffects?.filter(ruleEffect => ruleEffect.type === 'HIDEPROGRAMSTAGE'),
+        [ruleEffects],
+    );
+
     const noStageAvailable = useMemo(
-        () => stagesWithEventCount.every(programStage =>
-            (!programStage.repeatable && programStage.eventCount > 0),
-        ), [stagesWithEventCount]);
+        () =>
+            stagesWithEventCount.every(
+                programStage =>
+                    (!programStage.repeatable && programStage.eventCount > 0) ||
+                    hiddenProgramStageRuleEffects?.find(ruleEffect => ruleEffect.id === programStage.id),
+            ),
+        [stagesWithEventCount, hiddenProgramStageRuleEffects],
+    );
 
     const onNavigationFromQuickActions = (tab: string) => {
         history.push(`/enrollmentEventNew?${buildUrlQueryString({ programId, teiId, enrollmentId, orgUnitId, tab })}`);
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/index.js b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/index.js
index 3b0cdd75eb..049aa3b303 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/index.js
+++ b/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/index.js
@@ -3,5 +3,4 @@ export { useTeiAttributes } from './useTeiAttributes';
 export { useProgramMetadata } from './useProgramMetadata';
 export { useHideWidgetByRuleLocations } from './useHideWidgetByRuleLocations';
 export { useProgramStages } from './useProgramStages';
-export { useRuleEffects } from './useRuleEffects';
-export type { UseRuleEffectsInput } from './useRuleEffects.types';
+
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js
index 20f5b1b8dd..092ddf13f6 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.component.js
@@ -26,7 +26,8 @@ const styles = {
 const ProgramStageSelectorComponentPlain = ({ programStages, onSelectProgramStage, onCancel, classes }) => (
     <div className={classes.container}>
         {programStages.map((programStage) => {
-            const disableStage = !programStage.repeatable && programStage.eventCount > 0;
+            const disableStage =
+                (!programStage.repeatable && programStage.eventCount > 0) || programStage.hiddenProgramStage;
             return (
                 <div
                     key={programStage.id}
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.container.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.container.js
index cbe6b8dbd6..1bd16b7a80 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.container.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/ProgramStageSelector/ProgramStageSelector.container.js
@@ -6,22 +6,33 @@ import log from 'loglevel';
 import { ProgramStageSelectorComponent } from './ProgramStageSelector.component';
 import { Widget } from '../../../Widget';
 import { errorCreator } from '../../../../../capture-core-utils';
-import { useCommonEnrollmentDomainData } from '../../common/EnrollmentOverviewDomain';
+import { useCommonEnrollmentDomainData, useRuleEffects } from '../../common/EnrollmentOverviewDomain';
 import type { Props } from './ProgramStageSelector.types';
 import { useProgramFromIndexedDB } from '../../../../utils/cachedDataHooks/useProgramFromIndexedDB';
 import { useLocationQuery, buildUrlQueryString } from '../../../../utils/routing';
+import { useRulesEngineOrgUnit } from '../../../../hooks/useRulesEngineOrgUnit';
+import { useTrackerProgram } from '../../../../hooks/useTrackerProgram';
 
 
 export const ProgramStageSelector = ({ programId, orgUnitId, teiId, enrollmentId }: Props) => {
     const history = useHistory();
     const { tab } = useLocationQuery();
-    const { error: enrollmentsError, enrollment } = useCommonEnrollmentDomainData(teiId, enrollmentId, programId);
+    const { error: enrollmentsError, enrollment, attributeValues } = useCommonEnrollmentDomainData(teiId, enrollmentId, programId);
     const {
         program,
         isLoading: programLoading,
         isError: programError,
     } = useProgramFromIndexedDB(programId);
 
+    const { orgUnit } = useRulesEngineOrgUnit(orgUnitId);
+    const programRules = useTrackerProgram(programId);
+
+    const ruleEffects = useRuleEffects({
+        orgUnit,
+        program: programRules,
+        apiEnrollment: enrollment,
+        apiAttributeValues: attributeValues,
+    });
 
     useEffect(() => {
         if (enrollmentsError || programError) {
@@ -42,9 +53,12 @@ export const ProgramStageSelector = ({ programId, orgUnitId, teiId, enrollmentId
             displayName: currentStage.displayName,
             style: currentStage.style,
             repeatable: currentStage.repeatable,
+            hiddenProgramStage: ruleEffects?.find(
+                ruleEffect => ruleEffect.type === 'HIDEPROGRAMSTAGE' && ruleEffect.id === currentStage.id,
+            ),
         });
         return accStage;
-    }, []), [enrollment?.events, program?.programStages, programLoading]);
+    }, []), [enrollment?.events, program?.programStages, programLoading, ruleEffects]);
 
     const onSelectProgramStage = (newStageId: string) =>
         history.push(`enrollmentEventNew?${buildUrlQueryString({
diff --git a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js
index f79612916d..067f6b41cd 100644
--- a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js
@@ -12,3 +12,4 @@ export {
     showEnrollmentError,
 } from './enrollment.actions';
 export { useCommonEnrollmentDomainData } from './useCommonEnrollmentDomainData';
+export { useRuleEffects } from './useRuleEffects';
diff --git a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/index.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/index.js
new file mode 100644
index 0000000000..b8f1e7545a
--- /dev/null
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/index.js
@@ -0,0 +1,3 @@
+// @flow
+export { useRuleEffects } from './useRuleEffects';
+export type * from './useRuleEffects.types';
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useRuleEffects.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/useRuleEffects.js
similarity index 94%
rename from src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useRuleEffects.js
rename to src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/useRuleEffects.js
index bc38ec206c..74f6a96735 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useRuleEffects.js
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/useRuleEffects.js
@@ -79,13 +79,16 @@ export const useRuleEffects = ({ orgUnit, program, apiEnrollment, apiAttributeVa
 
     useEffect(() => {
         if (orgUnit && attributeValues && enrollmentData && otherEvents) {
-            setRuleEffects(getApplicableRuleEffectsForTrackerProgram({
+            const effects = getApplicableRuleEffectsForTrackerProgram({
                 program,
                 orgUnit,
                 otherEvents,
                 attributeValues,
                 enrollmentData,
-            }, true));
+            }, true);
+            if (Array.isArray(effects)) {
+                setRuleEffects(effects);
+            }
         }
     }, [attributeValues, enrollmentData, orgUnit, otherEvents, program]);
 
diff --git a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useRuleEffects.types.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/useRuleEffects.types.js
similarity index 81%
rename from src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useRuleEffects.types.js
rename to src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/useRuleEffects.types.js
index e2a28b85f3..3ce69affc9 100644
--- a/src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/hooks/useRuleEffects.types.js
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useRuleEffects/useRuleEffects.types.js
@@ -4,7 +4,7 @@ import type { TrackerProgram } from 'capture-core/metaData';
 import type {
     EnrollmentData,
     AttributeValue,
-} from '../../../common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData';
+} from '../useCommonEnrollmentDomainData';
 
 export type UseRuleEffectsInput = {|
     orgUnit?: ?OrgUnit,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.component.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.component.js
new file mode 100644
index 0000000000..a885a48a6d
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.component.js
@@ -0,0 +1,20 @@
+// @flow
+import React from 'react';
+import i18n from '@dhis2/d2-i18n';
+import { NoticeBox } from '@dhis2/ui';
+import type { Props } from './ErrorText.types';
+
+export const ErrorText = ({ stageName }: Props) => (
+    <>
+        <br />
+        <NoticeBox error>
+            <span>
+                {i18n.t("You can't add any more {{ programStageName }} events", {
+                    programStageName: stageName,
+                    interpolation: { escapeValue: false },
+                })}
+            </span>
+        </NoticeBox>
+        <br />
+    </>
+);
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.types.js
new file mode 100644
index 0000000000..07785c7e1a
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/ErrorText.types.js
@@ -0,0 +1,5 @@
+// @flow
+
+export type Props = {|
+    stageName: string,
+|};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/index.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/index.js
new file mode 100644
index 0000000000..2b26086840
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/ErrorText/index.js
@@ -0,0 +1,2 @@
+// @flow
+export { ErrorText } from './ErrorText.component';
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js
index ae5f972510..1c0a36c1c8 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js
@@ -3,6 +3,7 @@ import React, { type ComponentType } from 'react';
 import i18n from '@dhis2/d2-i18n';
 import { withStyles } from '@material-ui/core';
 import { Button, spacersNum } from '@dhis2/ui';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { withCancelButton } from '../../DataEntry/withCancelButton';
 import { addEventSaveTypes } from '../DataEntry/addEventSaveTypes';
 import type { InputProps, Props } from './finishButtons.types';
@@ -17,26 +18,43 @@ const styles = {
     },
 };
 
-const FinishButtonsPlain = ({ onSave, cancelButton, classes }: Props) => (
+const FinishButtonsPlain = ({ onSave, cancelButton, hiddenProgramStage, stageName, classes }: Props) => (
     <div className={classes.container}>
         <div className={classes.button}>
-            <Button
-                onClick={() => onSave(addEventSaveTypes.COMPLETE)}
-                primary
+            <ConditionalTooltip
+                content={i18n.t("You can't add any more {{ programStageName }} events", {
+                    programStageName: stageName,
+                    interpolation: { escapeValue: false },
+                })}
+                enabled={hiddenProgramStage}
             >
-                {i18n.t('Complete')}
-            </Button>
+                <Button
+                    disabled={hiddenProgramStage}
+                    onClick={() => onSave(addEventSaveTypes.COMPLETE)}
+                    primary
+                >
+                    {i18n.t('Complete')}
+                </Button>
+            </ConditionalTooltip>
         </div>
         <div className={classes.button}>
-            <Button
-                onClick={() => onSave(addEventSaveTypes.SAVE_WITHOUT_COMPLETING)}
+            <ConditionalTooltip
+                content={i18n.t("You can't add any more {{ programStageName }} events", {
+                    programStageName: stageName,
+                    interpolation: { escapeValue: false },
+                })}
+                enabled={hiddenProgramStage}
             >
-                {i18n.t('Save without completing')}
-            </Button>
+                <Button
+                    disabled={hiddenProgramStage}
+                    onClick={() => onSave(addEventSaveTypes.SAVE_WITHOUT_COMPLETING)}
+                >
+                    {i18n.t('Save without completing')}
+                </Button>
+            </ConditionalTooltip>
         </div>
         {cancelButton}
     </div>
 );
 
-export const FinishButtons: ComponentType<InputProps> =
-    withCancelButton()(withStyles(styles)(FinishButtonsPlain));
+export const FinishButtons: ComponentType<InputProps> = withCancelButton()(withStyles(styles)(FinishButtonsPlain));
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js
index dd3acb8e32..079708e30a 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js
@@ -6,10 +6,14 @@ export type InputProps = {|
     onSave: (saveType: $Keys<addEventSaveTypes>) => void,
     onCancel: () => void,
     id: string,
+    hiddenProgramStage: boolean,
+    stageName: string,
 |};
 
 export type Props = {|
     onSave: (saveType: $Keys<addEventSaveTypes>) => void,
     cancelButton: Element<any>,
+    hiddenProgramStage: boolean,
+    stageName: string,
     ...CssClasses,
 |};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
index ed59d6dc4e..4f784d2b9a 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
@@ -6,6 +6,7 @@ import { Widget } from '../../Widget';
 import { DataEntry } from '../DataEntry';
 import { FinishButtons } from '../FinishButtons';
 import { SavingText } from '../SavingText';
+import { ErrorText } from '../ErrorText';
 import type { Props } from './validated.types';
 
 const styles = () => ({
@@ -23,6 +24,7 @@ const ValidatedPlain = ({
     onSave,
     onCancel,
     orgUnit,
+    hiddenProgramStage,
     id,
     ...passOnProps
 }: Props) => (
@@ -46,12 +48,14 @@ const ValidatedPlain = ({
                     onSave={onSave}
                     onCancel={onCancel}
                     id={id}
-                />
-                <SavingText
-                    programName={programName}
+                    hiddenProgramStage={hiddenProgramStage}
                     stageName={stage.name}
-                    orgUnitName={orgUnit.name}
                 />
+                {hiddenProgramStage ? (
+                    <ErrorText stageName={stage.name} />
+                ) : (
+                    <SavingText programName={programName} stageName={stage.name} orgUnitName={orgUnit.name} />
+                )}
             </div>
         )}
     </Widget>
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js
index 3d85e67cbf..c0245b477f 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js
@@ -1,6 +1,6 @@
 // @flow
 import React, { useCallback } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { withAskToCreateNew, withSaveHandler } from '../../DataEntry';
 import { useLifecycle } from './useLifecycle';
 import { useClientFormattedRulesExecutionDependencies } from './useClientFormattedRulesExecutionDependencies';
@@ -29,6 +29,11 @@ export const Validated = ({
 }: ContainerProps) => {
     const dataEntryId = 'enrollmentEvent';
     const itemId = 'newEvent';
+    const rulesEffectsHiddenProgram = useSelector(
+        ({ rulesEffectsHiddenProgramStageDesc }) =>
+            rulesEffectsHiddenProgramStageDesc && rulesEffectsHiddenProgramStageDesc[`${dataEntryId}-${itemId}`],
+    );
+    const hiddenProgramStage = rulesEffectsHiddenProgram && rulesEffectsHiddenProgram[stage.id];
 
     const rulesExecutionDependenciesClientFormatted =
         useClientFormattedRulesExecutionDependencies(rulesExecutionDependencies, program);
@@ -127,6 +132,7 @@ export const Validated = ({
             programName={program.name}
             orgUnit={orgUnit}
             rulesExecutionDependenciesClientFormatted={rulesExecutionDependenciesClientFormatted}
+            hiddenProgramStage={hiddenProgramStage}
         />
     );
 };
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js
index a5194d88af..932e61a6d8 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js
@@ -25,5 +25,6 @@ export type Props = {|
     formRef: (formInstance: any) => void,
     dataEntryFieldRef: (instance: any, id: string) => void,
     rulesExecutionDependenciesClientFormatted: RulesExecutionDependenciesClientFormatted,
+    hiddenProgramStage: boolean,
     ...CssClasses,
 |};
diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js
index b50d0134a2..f8a8908b20 100644
--- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js
+++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/Stage.component.js
@@ -4,6 +4,7 @@ import cx from 'classnames';
 import i18n from '@dhis2/d2-i18n';
 import { withStyles } from '@material-ui/core';
 import { spacersNum, colors, IconAdd16, Button } from '@dhis2/ui';
+import { ConditionalTooltip } from 'capture-core/components/ConditionalTooltip';
 import { StageOverview } from './StageOverview';
 import type { Props } from './stage.types';
 import { Widget } from '../../../Widget';
@@ -23,11 +24,15 @@ const styles = {
         alignItems: 'center',
     },
 };
+const hideProgramStage = (ruleEffects, stageId) => (
+    Boolean(ruleEffects?.find(ruleEffect => ruleEffect.type === 'HIDEPROGRAMSTAGE' && ruleEffect.id === stageId))
+);
 
-
-export const StagePlain = ({ stage, events, classes, className, onCreateNew, ...passOnProps }: Props) => {
+export const StagePlain = ({ stage, events, classes, className, onCreateNew, ruleEffects, ...passOnProps }: Props) => {
     const [open, setOpenStatus] = useState(true);
     const { id, name, icon, description, dataElements, hideDueDate, repeatable } = stage;
+    const hiddenProgramStage = hideProgramStage(ruleEffects, id);
+
     return (
         <div
             data-test="stage-content"
@@ -53,17 +58,32 @@ export const StagePlain = ({ stage, events, classes, className, onCreateNew, ...
                     hideDueDate={hideDueDate}
                     repeatable={repeatable}
                     onCreateNew={onCreateNew}
+                    hiddenProgramStage={hiddenProgramStage}
                     {...passOnProps}
-                /> : <Button
-                    small
-                    secondary
-                    icon={<IconAdd16 />}
-                    className={classes.button}
-                    dataTest="create-new-button"
-                    onClick={() => onCreateNew(id)}
-                >
-                    {i18n.t('New {{ eventName }} event', { eventName: name, interpolation: { escapeValue: false } })}
-                </Button>}
+                /> : (
+                    <ConditionalTooltip
+                        content={i18n.t("You can't add any more {{ programStageName }} events", {
+                            programStageName: name,
+                            interpolation: { escapeValue: false },
+                        })}
+                        enabled={hiddenProgramStage}
+                    >
+                        <Button
+                            small
+                            secondary
+                            disabled={hiddenProgramStage}
+                            icon={<IconAdd16 />}
+                            className={classes.button}
+                            dataTest="create-new-button"
+                            onClick={() => onCreateNew(id)}
+                        >
+                            {i18n.t('New {{ eventName }} event', {
+                                eventName: name,
+                                interpolation: { escapeValue: false },
+                            })}
+                        </Button>
+                    </ConditionalTooltip>
+                )}
             </Widget>
         </div>
     );
diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
index 5b45f31d6f..6d5da181fa 100644
--- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
+++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/StageDetail.component.js
@@ -69,6 +69,7 @@ const StageDetailPlain = (props: Props) => {
         onEventClick,
         onViewAll,
         onCreateNew,
+        hiddenProgramStage,
         classes } = props;
     const defaultSortState = {
         columnName: 'status',
@@ -214,11 +215,18 @@ const StageDetailPlain = (props: Props) => {
         >{i18n.t('Go to full {{ eventName }}', { eventName, interpolation: { escapeValue: false } })}</Button> : null);
 
         const renderCreateNewButton = () => {
-            const shouldDisableCreateNew = !repeatable && events.length > 0;
+            const shouldDisableCreateNew = (!repeatable && events.length > 0) || hiddenProgramStage;
+
+            const tooltipContent = hiddenProgramStage
+                ? i18n.t("You can't add any more {{ programStageName }} events", {
+                    programStageName: eventName,
+                    interpolation: { escapeValue: false },
+                })
+                : i18n.t('This stage can only have one event');
 
             return (
                 <ConditionalTooltip
-                    content={i18n.t('This stage can only have one event')}
+                    content={tooltipContent}
                     enabled={shouldDisableCreateNew}
                     closeDelay={50}
                 >
diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/stageDetail.types.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/stageDetail.types.js
index ac5c02c897..a5edeeab75 100644
--- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/stageDetail.types.js
+++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageDetail/stageDetail.types.js
@@ -8,6 +8,7 @@ import type { StageDataElement, StageCommonProps } from '../../../types/common.t
     hideDueDate?: boolean,
     repeatable?: boolean,
     stageId: string,
+    hiddenProgramStage?: boolean,
     ...CssClasses,
 |};
 
diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js
index 9ec7b002ac..a3b0c008d4 100644
--- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js
+++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/types/common.types.js
@@ -1,4 +1,5 @@
 // @flow
+import { typeof effectActions } from '@dhis2/rules-engine-javascript';
 import type { Icon } from 'capture-core/metaData';
 import { dataElementTypes, Option } from '../../../metaData';
 
@@ -29,7 +30,8 @@ export type StageCommonProps = {|
     programId: string,
     onViewAll: (stageId: string) => void,
     onCreateNew: (stageId: string) => void,
-    onEventClick: (eventId: string) => void
+    onEventClick: (eventId: string) => void,
+    ruleEffects?: Array<{id: string, type: $Values<effectActions>}>,
 |}
 
 export type DataValue = {
diff --git a/src/core_modules/capture-core/reducers/descriptions/rulesEffects.reducerDescription.js b/src/core_modules/capture-core/reducers/descriptions/rulesEffects.reducerDescription.js
index 1a3493638c..becca6ede0 100644
--- a/src/core_modules/capture-core/reducers/descriptions/rulesEffects.reducerDescription.js
+++ b/src/core_modules/capture-core/reducers/descriptions/rulesEffects.reducerDescription.js
@@ -64,6 +64,23 @@ export const rulesEffectsHiddenSectionsDesc = createReducerDescription({
     },
 }, 'rulesEffectsHiddenSections');
 
+export const rulesEffectsHiddenProgramStageDesc = createReducerDescription({
+    [rulesEffectsActionTypes.UPDATE_RULES_EFFECTS]: (state, action) => {
+        const newState = { ...state };
+
+        const hideEffects: { [id: string]: Array<OutputEffect> } = action.payload.rulesEffects && action.payload.rulesEffects[effectActions.HIDE_PROGRAM_STAGE];
+        newState[action.payload.formId] = hideEffects ?
+            Object.keys(hideEffects).reduce((accState, key) => {
+                accState[key] = true;
+                return accState;
+            }, {}) :
+            null;
+
+        return newState;
+    },
+}, 'rulesEffectsHiddenProgramStageDesc');
+
+
 const mapMessageEffectTypeToStateKey = {
     [effectActions.SHOW_ERROR]: messageStateKeys.ERROR,
     [effectActions.SHOW_WARNING]: messageStateKeys.WARNING,
diff --git a/src/core_modules/capture-core/rules/__tests__/rulesEffectsForTrackerProgram.test.js b/src/core_modules/capture-core/rules/__tests__/rulesEffectsForTrackerProgram.test.js
index c0990a714d..bbd2514ae8 100644
--- a/src/core_modules/capture-core/rules/__tests__/rulesEffectsForTrackerProgram.test.js
+++ b/src/core_modules/capture-core/rules/__tests__/rulesEffectsForTrackerProgram.test.js
@@ -31,6 +31,7 @@ test('expressions with d2Functions in tracker program', () => {
             { id: 'Tx4gHcLselM', displayContent: 'd2:oizp( 10000000 ) = ', data: 'd2:oizp( 10000000 )', location: 'feedback', programRuleActionType: 'DISPLAYTEXT' },
             { id: 'f3MrrcCf1z2', displayContent: 'd2:modulus( 12 , 100 ) = ', data: 'd2:modulus( 12 , 100 )', location: 'feedback', programRuleActionType: 'DISPLAYTEXT' },
             { id: 'Eeb7Ixr4Pv6', displayContent: 'd2:floor((5+5) / 2) = ', data: 'd2:floor((5+5) / 2)', location: 'feedback', programRuleActionType: 'DISPLAYTEXT' },
+            { id: 'nKNmayYigcy', programStageId: 'PUZaKR0Jh2k', programRuleActionType: 'HIDEPROGRAMSTAGE' },
         ],
     }];
     const programRulesVariables = [];
@@ -72,5 +73,6 @@ test('expressions with d2Functions in tracker program', () => {
         { type: 'DISPLAYTEXT', id: 'feedback', displayText: { id: 'Tx4gHcLselM', message: 'd2:oizp( 10000000 ) =  1' } },
         { type: 'DISPLAYTEXT', id: 'feedback', displayText: { id: 'f3MrrcCf1z2', message: 'd2:modulus( 12 , 100 ) =  12' } },
         { type: 'DISPLAYTEXT', id: 'feedback', displayText: { id: 'Eeb7Ixr4Pv6', message: 'd2:floor((5+5) / 2) =  5' } },  // check double parentheses
+        { type: 'HIDEPROGRAMSTAGE', id: 'PUZaKR0Jh2k' },
     ]);
 });
diff --git a/src/reducers/descriptions/trackerCapture.reducerDescriptions.js b/src/reducers/descriptions/trackerCapture.reducerDescriptions.js
index 057daf6d81..720ed088fb 100644
--- a/src/reducers/descriptions/trackerCapture.reducerDescriptions.js
+++ b/src/reducers/descriptions/trackerCapture.reducerDescriptions.js
@@ -20,6 +20,7 @@ import {
     rulesEffectsHiddenFieldsDesc,
     rulesEffectsErrorMessagesDesc,
     rulesEffectsHiddenSectionsDesc,
+    rulesEffectsHiddenProgramStageDesc,
     rulesEffectsCompulsoryFieldsDesc,
     rulesEffectsFeedbackDesc,
     rulesEffectsIndicatorsDesc,
@@ -116,6 +117,7 @@ export const reducerDescriptions = [
     rulesEffectsHiddenFieldsDesc,
     rulesEffectsErrorMessagesDesc,
     rulesEffectsHiddenSectionsDesc,
+    rulesEffectsHiddenProgramStageDesc,
     rulesEffectsCompulsoryFieldsDesc,
     rulesEffectsFeedbackDesc,
     rulesEffectsIndicatorsDesc,