From 03b8cb2cb20bd5dc6ebcdfcb4e4b877ec1e3e2fa Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Tue, 16 Apr 2024 09:54:36 +0000
Subject: [PATCH 01/12] chore:first commit

---
 src/views/Home.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Home.js b/src/views/Home.js
index 76ef507..ecfad42 100644
--- a/src/views/Home.js
+++ b/src/views/Home.js
@@ -4,6 +4,6 @@ export const Home = () => (
     <div>
         <h1>Home</h1>
 
-        <p>DHIS2 Web App Academy 2024</p>
+        <p>This is Dhis2 web Acadamy</p>
     </div>
 )

From a56b0c8201f821d94f6e9880108dc15a78bab3d1 Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Tue, 16 Apr 2024 10:24:50 +0000
Subject: [PATCH 02/12] fix:navigation with menu and menuItem

---
 package.json                 |   1 +
 src/navigation/Navigation.js |   7 +-
 yarn.lock                    | 676 +++++++++++++++++++++++++++++++++++
 3 files changed, 681 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 0c33cfc..d59a3c3 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     },
     "dependencies": {
         "@dhis2/app-runtime": "^3.10.3",
+        "@dhis2/ui": "^9.4.4",
         "react-router-dom": "^6.22.3"
     }
 }
diff --git a/src/navigation/Navigation.js b/src/navigation/Navigation.js
index 38b5781..9e4b95b 100644
--- a/src/navigation/Navigation.js
+++ b/src/navigation/Navigation.js
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 // @TODO: Import the `Menu` and `MenuItem` components
+import { Menu, MenuItem } from '@dhis2/ui'
 import { useNavigate, useMatch } from 'react-router-dom'
 
 const NavigationItem = ({ path, label }) => {
@@ -17,7 +18,7 @@ const NavigationItem = ({ path, label }) => {
     const onClick = () => navigate(path)
 
     // @TODO: Use the `MenuItem` component instead of the `div`
-    return <div>{label}</div>
+    return <MenuItem label={label} active={isActive} onClick={onClick} />
 }
 
 NavigationItem.propTypes = {
@@ -27,7 +28,7 @@ NavigationItem.propTypes = {
 
 export const Navigation = () => (
     // @TODO: Use the `Menu` components instead of the `div`
-    <div>
+    <Menu>
         <NavigationItem
             // Menu item for the home page
             label="Home"
@@ -45,5 +46,5 @@ export const Navigation = () => (
             label="Form"
             path="/form"
         />
-    </div>
+    </Menu>
 )
diff --git a/yarn.lock b/yarn.lock
index d63dae1..a96869e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1435,6 +1435,18 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/alert@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-9.4.4.tgz#4045882cb5bc5e6763897e4eca3d779e54f64d71"
+  integrity sha512-v3TjIQEDqUtAqcUsH62/TYqQLehzqRPOwqdw6LDa3Yldqf9iMJ6v66DBESO2QsYd33ZWPj0+ZWw8BDtAP/SubQ==
+  dependencies:
+    "@dhis2-ui/portal" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/box@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-9.4.3.tgz#7a7766e28ab36775d37e6ff7639e8527b8809b9b"
@@ -1445,6 +1457,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/box@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-9.4.4.tgz#646cdb3b30708ba2332d249eae47fa03a1e6d309"
+  integrity sha512-xTkjLlcKm7Z6gESys2QLkgYWZSKyvKXcU4GHDJMZ+HXjiSxLfGSmbKDJfBkGuOsCGYlgCMdM1jMBUQjT7zp/Fg==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/button@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-9.4.3.tgz#0440f3dc390ac9649c1c477452e32e9e61261c1d"
@@ -1459,6 +1481,20 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/button@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-9.4.4.tgz#5fa1765e6b7a26fdeca875bf3114a5039deab8f0"
+  integrity sha512-U0JNzTcQkOlSm0GJsSPGRLDXMA5czS33SkaaL0S7kkNLcsTceZX/4cO6ldTuAJWPJLiuNsR8e/Rklos9xospLg==
+  dependencies:
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2-ui/popper" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/calendar@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-9.4.3.tgz#ffe62abdf68dee9b7afd4e4b4dde0c71f6b2ed8a"
@@ -1476,6 +1512,23 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/calendar@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-9.4.4.tgz#3b5147a42ffbefaab77824f5c95e755508d2291f"
+  integrity sha512-wBzWhJdnCyGJuNYFhLiLh2cwiSm2iSa/JNud449+atCK6O/XygBel96eaLUh63GWgKmM5RE9PIoHWm1xYfn5XA==
+  dependencies:
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/card" "9.4.4"
+    "@dhis2-ui/input" "9.4.4"
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/popper" "9.4.4"
+    "@dhis2/multi-calendar-dates" "^1.1.1"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/card@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-9.4.3.tgz#994052de11162a00daf0e60e47aabd0df4162b23"
@@ -1486,6 +1539,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/card@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-9.4.4.tgz#8bb0ca90f5eef4421beef9506b2c244041f1c1ef"
+  integrity sha512-ZquXjtHeY+/zt5ojXmB8ZeqD5pnEriw7/8LHGi2TYGZovCbw0rN76pTIgL+9X7V2WcVbSQinxUpdlcXex8heGQ==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/center@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-9.4.3.tgz#5b96d1e672921fa418e840a0485e763f81b3951a"
@@ -1496,6 +1559,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/center@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-9.4.4.tgz#c62c32bbe83aa20278845ec22cfcb5cc3a394d26"
+  integrity sha512-I+d1ByUcemZDYCPauiXY/EOjUDjoLPXTzpzAF3AboZNvGjo2+1AgHKNkAMp5WgBBQRaGoAiNLRhhgGEX6f9DhQ==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/checkbox@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-9.4.3.tgz#6bace74d49e58118da1c6d158ca88c18c011d58c"
@@ -1508,6 +1581,18 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/checkbox@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-9.4.4.tgz#61b75fa7d1773e1d9a11b95126c44a465ac59eaa"
+  integrity sha512-i26bv/lBynQ1AeOhMmRJ4rQJr5HOFXe4VNCaQhq/+1q+g2dewyf0gIygJnjYMzcX48eyfQsBDU5JBYhuSz6kWw==
+  dependencies:
+    "@dhis2-ui/field" "9.4.4"
+    "@dhis2-ui/required" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/chip@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-9.4.3.tgz#c1efcbbef2fe4a34d4ca8cf67874f25a43dc59eb"
@@ -1518,6 +1603,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/chip@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-9.4.4.tgz#f1b151e0bc091aca4e288ed7f4889a38bf1f74c6"
+  integrity sha512-+2FLdWcDGNOQmrCU0sKve+JRD1hwCd53sQ0D/OCI4zFCrJwJ5C7Pet5Y3Ys0hv8lAu4hCdwklSyKuwlIjYntjg==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/cover@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-9.4.3.tgz#cdc4393180f56e1f9cb9f9e8d766e61773d20708"
@@ -1528,6 +1623,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/cover@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-9.4.4.tgz#89ed8113be5ba541d7250e32a828c5e2046369e7"
+  integrity sha512-JAywkI+Hebyn4EkiSf3li2E2+iDUvBwcgHH4AW5QkkRaM8YGqgluNnsn+AOL1Igs6lXh3jzGrsiN3xZSoGO6ww==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/css@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-9.4.3.tgz#a9b9573a9ca56062ad5a990e943c056a9c1fa939"
@@ -1538,6 +1643,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/css@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-9.4.4.tgz#c46af291af86eec008f60205c7c46e100ef8188a"
+  integrity sha512-VBmYcTKet0YDEguptZ0+Yc789HmNiaMDTu3iUnJKuvurhYSaFGD/oK7d2Sr6bIo0KTQ+/XpcOL68+wRLktGgwQ==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/divider@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-9.4.3.tgz#c6f934a49a2377044a08def865b607b1e2060a4f"
@@ -1548,6 +1663,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/divider@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-9.4.4.tgz#d904282c0bc8552180923e36189b421dfb4d3853"
+  integrity sha512-YjERDzyV4aznyKpREUDhh5QgykRAhNE6xr7rO5LiCNeFx2MpZY1Xq6AFoPZSuy966iAEU0KmOK+8Ow0NGg/9GA==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/field@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-9.4.3.tgz#b8b006e667cf443fb15fe05a51369cbea564f7c2"
@@ -1561,6 +1686,19 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/field@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-9.4.4.tgz#80753ca3bc2c419dc1066e5e6d662b18ddaec032"
+  integrity sha512-07O3Npth26D0+kOHYdsfoF3fZm8SXfmtonKyOIOpRAmIX1TJZRNO9LuI5S9+z5vh0++x3Y+c9hIFmac0Vvm9aQ==
+  dependencies:
+    "@dhis2-ui/box" "9.4.4"
+    "@dhis2-ui/help" "9.4.4"
+    "@dhis2-ui/label" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/file-input@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-9.4.3.tgz#5c3a1c235ada95a125d4bd4ed3926e16c07b9f34"
@@ -1577,6 +1715,22 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/file-input@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-9.4.4.tgz#02878069f9f4db33a14dba9e18642d8e85f6d2e9"
+  integrity sha512-GS89r/FxYfd9GlXUqscUXjzh1f190mo9qwJN6GrrzeK+gSGwtFDtGHDCyES7qQ8MdtvgDlC8Dgdjl5EU7YP6tQ==
+  dependencies:
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/field" "9.4.4"
+    "@dhis2-ui/label" "9.4.4"
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2-ui/status-icon" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/header-bar@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-9.4.3.tgz#666af097b2c8058ea1ff733e26abd5cfd2ba7074"
@@ -1601,6 +1755,30 @@
     moment "^2.29.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/header-bar@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-9.4.4.tgz#7c26955ea968bb25cac6766e549402ccde34d8c3"
+  integrity sha512-IA6yFbFFimWMYyHSD9idCLCamnWtAgRuoD3FG/8kKvOurTEwUcb0qYaecnQAstwWwZ8C+ZIKiTB0796WXj/SDg==
+  dependencies:
+    "@dhis2-ui/box" "9.4.4"
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/card" "9.4.4"
+    "@dhis2-ui/center" "9.4.4"
+    "@dhis2-ui/divider" "9.4.4"
+    "@dhis2-ui/input" "9.4.4"
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2-ui/logo" "9.4.4"
+    "@dhis2-ui/menu" "9.4.4"
+    "@dhis2-ui/modal" "9.4.4"
+    "@dhis2-ui/user-avatar" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    moment "^2.29.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/help@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-9.4.3.tgz#6bb24d0ebabe26a2b85f453df64e8f07fa52a797"
@@ -1611,6 +1789,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/help@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-9.4.4.tgz#6b3df94b6b8c0f7269dde3c90602dbb6dac889fa"
+  integrity sha512-V/ZNC/QwlN+444rb2wBAzEkqeLToafHQOEWCUUvcYEgC2Vxdh2bXEqBl6w4Bv2Xmh563k+AdxvXZtVL4zLA/og==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/input@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-9.4.3.tgz#99779bfddfc8aa557df3202f1f6bfb489234f30f"
@@ -1627,6 +1815,22 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/input@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-9.4.4.tgz#621eab6b8d535fcb111094f660415ff4136cb156"
+  integrity sha512-F6GEeRUQXFxjhoY3+CuaZWrkS2D54vTuP429uCL77/Wn2HdqYWnDMz3ILubIR+T1C5otmAH5cqW3IinRGlOq+Q==
+  dependencies:
+    "@dhis2-ui/box" "9.4.4"
+    "@dhis2-ui/field" "9.4.4"
+    "@dhis2-ui/input" "9.4.4"
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2-ui/status-icon" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/intersection-detector@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-9.4.3.tgz#4b2df40f73ab6b76d0f94b8721546ab42232e96d"
@@ -1637,6 +1841,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/intersection-detector@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-9.4.4.tgz#1ad2a7b47a84aeb674274272d362302f4b23ba56"
+  integrity sha512-+DhDX7/Y0uKZnTy4r4qTt6kQtdlYxJVnlx42CwAO4KWAJirOISDyepzKUii9ZFMLCcxQgQ2uddiCwdjPqLqiAQ==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/label@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-9.4.3.tgz#9ebab25a734baab05a1680d577bd11cf8d94a086"
@@ -1648,6 +1862,17 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/label@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-9.4.4.tgz#107e21bcc7a8d29e8355d54d5e475c96364fc78d"
+  integrity sha512-uoYpozTDR1kxM+g8tWvvCV9Z4KT9+t4t4IKULICJLwEW8JfwXQxZnVmCvCc3Zv2fHZlmUN9XXGVt00VG1ldWsg==
+  dependencies:
+    "@dhis2-ui/required" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/layer@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-9.4.3.tgz#9cd91dcc8999a9270936fc899262a96f6684088b"
@@ -1659,6 +1884,17 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/layer@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-9.4.4.tgz#980a9e397468b9418937202a0afaae868bed4b4b"
+  integrity sha512-PLqcBHfUB1EV24trWbkDv2m1viU3ijVYZQa13htxa5r800ei+ze6K4x15hnvI9qtCbNAvBv/N1Axxui4Xwjkdg==
+  dependencies:
+    "@dhis2-ui/portal" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/legend@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-9.4.3.tgz#bf1461062aa05e8aefe36356e38437ef1a6d765e"
@@ -1670,6 +1906,17 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/legend@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-9.4.4.tgz#5476cfa7937ca9bbac3b9e64e991b17d51e9ced1"
+  integrity sha512-uqxHCFYMfP8yxV0lOyOgKbOUYRP3TNoO+fHyo78y2OGhjrsanHolZMPokf+POgZAFmBvQDtibOoyp2J7jq1Qog==
+  dependencies:
+    "@dhis2-ui/required" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/loader@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-9.4.3.tgz#41f8a212c7c9a3c62be3c087e0f6ec5838695238"
@@ -1680,6 +1927,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/loader@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-9.4.4.tgz#2bd268cba9310db47c0a9dda04cff760380fc6b0"
+  integrity sha512-2B9PZ/iQIuCWbPIQFihrmX+1YHW5vZlOv+rsJT1SipSIj5sLWy4KYtjvm89lSu+Or60jnrNAJ8Iix5bnlb+dWw==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/logo@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-9.4.3.tgz#9479533737626dab0285445e117776110a475ee6"
@@ -1690,6 +1947,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/logo@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-9.4.4.tgz#a0050a56aabafe33ef4c232a116980d289fbcc34"
+  integrity sha512-Nps/U5rCBaO8X8/A0gbd8SuGRdd1ymCRnXv5FuUvciQ8CcoQnjE8aVi0TMY1h/A8XDrLWZXyAnm3WbmA0GnOvw==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/menu@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-9.4.3.tgz#9042c76f9257f8eaac9eaa8d9f3ffc6eafda8d6b"
@@ -1706,6 +1973,22 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/menu@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-9.4.4.tgz#a25fe07705d8e14e97390d8b59e7330d7fdc335e"
+  integrity sha512-TSIPM9vNswIo59yxPEZN30KTWbxQNXC2BLu6Fkd0FpgLO8ZxnAtG7qbgay8Y3c+9FIAt+Be/N41d+5VlSG8WtA==
+  dependencies:
+    "@dhis2-ui/card" "9.4.4"
+    "@dhis2-ui/divider" "9.4.4"
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/popper" "9.4.4"
+    "@dhis2-ui/portal" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/modal@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-9.4.3.tgz#402d687a231076992ae671e9029f6bb83c8bb2b8"
@@ -1721,6 +2004,21 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/modal@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-9.4.4.tgz#3edbc8e3bb942aba2c8377aadd79514fe2fa7930"
+  integrity sha512-Ny9y9hxinbrnSQxoDCFh902BNozGjHdp1YG5w+sxyg4gfUjP2gh+OyoLILvw8LqvrjoukI7anfmikNoAEwjanw==
+  dependencies:
+    "@dhis2-ui/card" "9.4.4"
+    "@dhis2-ui/center" "9.4.4"
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/portal" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/node@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-9.4.3.tgz#690bb1069efa8d6e1087efb21905ccafbd31768e"
@@ -1732,6 +2030,17 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/node@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-9.4.4.tgz#3c13b7424a172564a0d52893b4d1ac8a7d9ceac3"
+  integrity sha512-8kyvwqFc/cx1U50AhDymUnKR3OvWy6/EBnt8IOGrdFGrIRTk6P+JiRFUMfQ2aRubhtLMsDTpQ3LOMeHeP7/87w==
+  dependencies:
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/notice-box@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-9.4.3.tgz#48ba69fa439b9bdee85190ae40baad55b995cd36"
@@ -1743,6 +2052,17 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/notice-box@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-9.4.4.tgz#c333a0ffa0cddc20431071ec56f0521fa3dbcb5d"
+  integrity sha512-u7zcrq4EqCwCOszyl1FlfpeQj+Tn/UJ/J6mZ3v44+7gCTNMrEfT7Hf/drmTVLmFNquqDUP/ppr1uxwtQOResyA==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/organisation-unit-tree@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-9.4.3.tgz#00c00ab39f811be0f7dc885141bf178093f3799d"
@@ -1756,6 +2076,19 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/organisation-unit-tree@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-9.4.4.tgz#3e952d2fe0fd045d6bc2a6a92872ef8e83a6e7f2"
+  integrity sha512-qUDsQIHPE2QQVizfs+bomsrlPKVrPi8L2MtKVkma2P1/GlDnZaOoLYB70zzLLbqH90dUbwMlGF3ZXnbIhi+A6g==
+  dependencies:
+    "@dhis2-ui/checkbox" "9.4.4"
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2-ui/node" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/pagination@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-9.4.3.tgz#9c5172a74feb10a795866c9f44a98a7a5a80c3b0"
@@ -1769,6 +2102,19 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/pagination@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-9.4.4.tgz#35d4ab7e35a0a37d998fe51394ac1bda26b7052f"
+  integrity sha512-WnruI7k/wcXzZF84fWRcFhfA131p23NwkeUUbt45cm/36+SnDoYAl6Nbh1elEQpYu2jqMWVk2w82u37MT/usxg==
+  dependencies:
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/select" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/popover@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-9.4.3.tgz#2ed3b6b5ad6540982c648bb0aecca4168e0ed34b"
@@ -1781,6 +2127,18 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/popover@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-9.4.4.tgz#547dbffefbfdd838bf401a5a44e1e524ab028440"
+  integrity sha512-UosiUkknLNl3h+IuqNiEcLuGSskP8SV55BOUHEHIyE5HacRVjzyeKyK6ak/g0L8FyscYdpPvAAUqFRq7pnByzg==
+  dependencies:
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/popper" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/popper@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-9.4.3.tgz#4fa1ce4893988f1cb03e2ee11b358940c65468ff"
@@ -1794,6 +2152,19 @@
     react-popper "^2.2.5"
     resize-observer-polyfill "^1.5.1"
 
+"@dhis2-ui/popper@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-9.4.4.tgz#84d3e2155d93bc54cebdf1430dc7b2f207d681ae"
+  integrity sha512-avSwb0Ty25mE7BkoV/dWvwxZFLEWOOkEXSa2z5F/YNfec8gvCODiVGcHU6CEBfDXk7y4dqv7QtLEfaeoa8cpnA==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@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@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-9.4.3.tgz#3f72d076c869ebaa0d495d421a872fc1d944acb6"
@@ -1802,6 +2173,14 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/portal@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-9.4.4.tgz#8de12cd6c0e975b47cd19caae8acc1500034f206"
+  integrity sha512-HSXWzWFlSy9layr9zmxQcITiOIsse9y7bK0kPRlqjqEtSSfF57iGcFSAOTwX4HBW0xE/lQ8n4UfHoGOU76LF0Q==
+  dependencies:
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/radio@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-9.4.3.tgz#c7f40a156ed9cd4362b6ac135356c30285d638bd"
@@ -1812,6 +2191,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/radio@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-9.4.4.tgz#5654713ad8646aac31909ff6009b189975b3eaf5"
+  integrity sha512-JAqnlbX9arPASFNHJw8leeDs0FGKWvIOQDZeye9ApG8Xnl2vdu4Oa/8GfDPSPYHIGdvhx5VVH0D+PzAFLBeIUA==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/required@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-9.4.3.tgz#71a190295a2607dc104a228154163a111f357ac0"
@@ -1822,6 +2211,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/required@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-9.4.4.tgz#fc167134d435a7ee4a86966887f282653e87f9f3"
+  integrity sha512-jwLwL+6y7Wp0IWiXyj28xmBpOsZOdyJlBUpdfmur7akVK46jMMTlugz36SpygU7f9dzExl2hJgDu01X8q/kdng==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/segmented-control@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-9.4.3.tgz#e1b4577b79402cde2d89b6966ac695f6f62ca405"
@@ -1832,6 +2231,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/segmented-control@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-9.4.4.tgz#8f4b756b913f5162f7523c4044be80a068584649"
+  integrity sha512-A8p8VxRea3VV4G9yWc+zTfQarW/ZDIfkEWzKzsmyQEuqIWlTVPf7Hcva9I7Lx1CiDpScJdJbK5vGlglj4PKj5g==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/select@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-9.4.3.tgz#3963a2a0fa3710ea222bf7754a205d77eb4a6a9f"
@@ -1855,6 +2264,29 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/select@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-9.4.4.tgz#39e566dc565a07c783ca9c3be0ad15de2484eec4"
+  integrity sha512-qIJunqROPGcP9Ys/yx4D/jUS20DE8ORxT3W1l+r/RnL/z8gPlyBAYeYB914nxualIhoUYXr7UjhgyJZfQbIafQ==
+  dependencies:
+    "@dhis2-ui/box" "9.4.4"
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/card" "9.4.4"
+    "@dhis2-ui/checkbox" "9.4.4"
+    "@dhis2-ui/chip" "9.4.4"
+    "@dhis2-ui/field" "9.4.4"
+    "@dhis2-ui/input" "9.4.4"
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2-ui/popper" "9.4.4"
+    "@dhis2-ui/status-icon" "9.4.4"
+    "@dhis2-ui/tooltip" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/selector-bar@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-9.4.3.tgz#a25e30dd35ffb93728513ab88bbcee5ee18d02bf"
@@ -1870,6 +2302,21 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/selector-bar@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-9.4.4.tgz#79513f90bdc1f4a2c6270cb8f2083dd14d4b11d9"
+  integrity sha512-9Z9dyrFU6XAEu0KLIa4TDQR/E8KJvjqMeaxWWpSrjnyM2Lmlfn9gH+qZ27TJSUMKqY/mdFJpSSr45aIQGgg2Rw==
+  dependencies:
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/card" "9.4.4"
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/popper" "9.4.4"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    "@testing-library/react" "^12.1.2"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/sharing-dialog@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-9.4.3.tgz#463a1b6faa45dc06380f2c0a1dea0fd448252162"
@@ -1896,6 +2343,32 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/sharing-dialog@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-9.4.4.tgz#dcb9aa7436cd037e59f02231eeece7fbf6d82414"
+  integrity sha512-pYhMR+HXu4gvpFTfwWIe1XtW7+m4DxVzWPHGmHKi7ZbVh42csi466mlpJ29qid8KBo/KmsNASt+R6Vp0I3Dq5w==
+  dependencies:
+    "@dhis2-ui/box" "9.4.4"
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/card" "9.4.4"
+    "@dhis2-ui/divider" "9.4.4"
+    "@dhis2-ui/input" "9.4.4"
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/menu" "9.4.4"
+    "@dhis2-ui/modal" "9.4.4"
+    "@dhis2-ui/notice-box" "9.4.4"
+    "@dhis2-ui/popper" "9.4.4"
+    "@dhis2-ui/select" "9.4.4"
+    "@dhis2-ui/tab" "9.4.4"
+    "@dhis2-ui/tooltip" "9.4.4"
+    "@dhis2-ui/user-avatar" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    "@react-hook/size" "^2.1.2"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/status-icon@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-9.4.3.tgz#4b90cf35ec0569c629f4186dc9041d373432d111"
@@ -1908,6 +2381,18 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/status-icon@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-9.4.4.tgz#ab44a615aee73a6f4edae6c2eeee017e9970b6c9"
+  integrity sha512-Hh/UueN9wrbpfrxegT7/712YlhZPlQ+fYDvPOty1GbAALDdPiMUg0F0YqonNXCeZUAuzX+mzxcxOoHk446GVaA==
+  dependencies:
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/switch@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-9.4.3.tgz#54c7f45e11942657ebbbd1de4f35f3f55ff4576d"
@@ -1920,6 +2405,18 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/switch@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-9.4.4.tgz#181df81c21f369752bacabd62088b9531248ae13"
+  integrity sha512-MH3h3+EPtR9ZSq+fsFQSJkCxuKyzLZolcGCBPX2u+8sVmV+7AZ2P6yJ6YiAUGI9udMwZokLjPZSgp3QWwKEQQg==
+  dependencies:
+    "@dhis2-ui/field" "9.4.4"
+    "@dhis2-ui/required" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/tab@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-9.4.3.tgz#62417dda2594cf307cdb320cae092fd1cac3c12c"
@@ -1931,6 +2428,17 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/tab@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-9.4.4.tgz#66ef74adf7e01c8a2f68327e0616795da1b7b064"
+  integrity sha512-2DqkH+IhiV4uFdvMg9aVJoao2D+U3s4kP+EsUlPPvRxvf2c7P6vjcitvACVgmDBnc2EWGw0jh02QhvOgQezhLA==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/table@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-9.4.3.tgz#4e593ff5d15a4b0d0599e98818c054cd34c303fa"
@@ -1942,6 +2450,17 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/table@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-9.4.4.tgz#b93c9ea878914df7dd3147f067c00ea946602fc4"
+  integrity sha512-i3f8go7JE/+7OyjWXN/ePlRduOC4Pc+9w4P+Sq3VOTFgYnMEPyVpZmz9/dgNtAGTto1Lh54ISU/wxwC+TXfRxw==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/tag@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-9.4.3.tgz#c8bcc942dddf02b8b8659aea497cc5fe0c50cb7d"
@@ -1952,6 +2471,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/tag@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-9.4.4.tgz#493a2369f384cb12f1104b18e34b54d516bce740"
+  integrity sha512-YMKndGKVXdQo5plKYy5RsN8AD233BbGZ9uzd/zmf7u2xs9C/DcK0JL+5UCZwVX++4swXTXbuSblE3Kl26a4U9Q==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/text-area@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-9.4.3.tgz#72953f5dcf75623769740b1ea8ff356610de7068"
@@ -1967,6 +2496,21 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/text-area@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-9.4.4.tgz#f5d6ee3fab9c2f71b129ea6ce4b3f7d7b36e3bf5"
+  integrity sha512-vphcZ42dqr2kXpAbJZPyJpr911B/3dAHM/PmUIIF07CzNs3daiEiIELm38KQ1cs0Na5oqXgrdw3HZyhAo02vsw==
+  dependencies:
+    "@dhis2-ui/box" "9.4.4"
+    "@dhis2-ui/field" "9.4.4"
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2-ui/status-icon" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/tooltip@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-9.4.3.tgz#29820574c938341fc9cbe154806c6e6fbfe03b93"
@@ -1979,6 +2523,18 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/tooltip@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-9.4.4.tgz#268c4d0a395669522d45dd0a5720c18589887929"
+  integrity sha512-qCHsGMuzL9YV3OnWw0j+tK0p5e+tzUd5g7CXbHPsrhtsctgKO5u/VWYnFaJlFh2cbctqvFPpS+buLMe1jndpjw==
+  dependencies:
+    "@dhis2-ui/popper" "9.4.4"
+    "@dhis2-ui/portal" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/transfer@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-9.4.3.tgz#989b262b464b089653f02a746e97dc5958ed8489"
@@ -1994,6 +2550,21 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/transfer@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-9.4.4.tgz#d3f45a4a41eb35363c3f6ac57f8d499dd0ac198b"
+  integrity sha512-JMw2VWbybqOx5+4Sh1C9cPeiWN8xS6+ZNUivEwxOpKv/TBpeRBowOV7q0QEfzE1fGC9qyJqVxevBQhcp+2aUaA==
+  dependencies:
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/field" "9.4.4"
+    "@dhis2-ui/input" "9.4.4"
+    "@dhis2-ui/intersection-detector" "9.4.4"
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2-ui/user-avatar@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-9.4.3.tgz#1874867bd92a44a21969927be8f3d162287466de"
@@ -2004,6 +2575,16 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
+"@dhis2-ui/user-avatar@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-9.4.4.tgz#cb97b581e288c9d6a99d5f98a66fa3c63a6b27be"
+  integrity sha512-GILxEnNh0KwTKEMf5RCIvwV/BOv9GUKstuyLt9o5lX7YhT8QfMC0Uwn+IMOHtV6RoaewLbn0zyZF30NlZGohwg==
+  dependencies:
+    "@dhis2/prop-types" "^3.1.2"
+    "@dhis2/ui-constants" "9.4.4"
+    classnames "^2.3.1"
+    prop-types "^15.7.2"
+
 "@dhis2/app-adapter@11.1.0":
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-11.1.0.tgz#082f69873e997e13120243ee9e0914bcd339659a"
@@ -2186,6 +2767,14 @@
     "@js-temporal/polyfill" "^0.4.2"
     classnames "^2.3.2"
 
+"@dhis2/multi-calendar-dates@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.1.1.tgz#fb76a77114ce0b757db7dd9f588d1a47809732da"
+  integrity sha512-kaisVuRGfdqY/Up6sWqgc81K67ymPVoRYgYRcT29z61ol2WhiTXTSTuRX/gDO1VKjmskeB5/badRrdLMf4BBUA==
+  dependencies:
+    "@js-temporal/polyfill" "^0.4.2"
+    classnames "^2.3.2"
+
 "@dhis2/prop-types@^3.1.2":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9"
@@ -2209,6 +2798,13 @@
   dependencies:
     prop-types "^15.7.2"
 
+"@dhis2/ui-constants@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-9.4.4.tgz#4fe728f96fe92752b4a033b03f2fdb1313eafeb3"
+  integrity sha512-O+jHTT/S3jgcHP7gxcZenpMyOfBktvoB9MVGzoVaAW5rRbYe0cCSe1Zh70h25VMVhwxBTCTIR7G3uvDWcdb5Ww==
+  dependencies:
+    prop-types "^15.7.2"
+
 "@dhis2/ui-forms@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-9.4.3.tgz#0d4ff0ae7dd89d99d1b9fc4d29e382853b621731"
@@ -2229,11 +2825,36 @@
     prop-types "^15.7.2"
     react-final-form "^6.5.3"
 
+"@dhis2/ui-forms@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-9.4.4.tgz#9104665d2a57429df89caac720c59ad509328515"
+  integrity sha512-4QU4NXlExBqHWfoWnKIpDHB3wahDnJYO1CdZ64UcVurjdGKQdiAbX/WbrFYSpWuk8gO/DqQ8AC7JkTtpXXF9Lg==
+  dependencies:
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/checkbox" "9.4.4"
+    "@dhis2-ui/field" "9.4.4"
+    "@dhis2-ui/file-input" "9.4.4"
+    "@dhis2-ui/input" "9.4.4"
+    "@dhis2-ui/radio" "9.4.4"
+    "@dhis2-ui/select" "9.4.4"
+    "@dhis2-ui/switch" "9.4.4"
+    "@dhis2-ui/text-area" "9.4.4"
+    "@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@9.4.3":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.4.3.tgz#b7eac309031351003d0afdde31e5bbe15de928d0"
   integrity sha512-6o6L9gfWGLPlB35aBzyU13v6qGE+f2Xk1Xmt68fhqzcAqBj7e1UZ+XIQPb7b3bQlv2AWftWBhUGaMJJIlddtZg==
 
+"@dhis2/ui-icons@9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.4.4.tgz#c4f488496389687ebd47266e93e0aacf27054ef3"
+  integrity sha512-AGt+aYqpqb7f/2IH5quZ1bJoSz/WB3p7I1CdZHUPk/XP6rQpO2W7mqoLxiZYOHCiNlTU+sjfXcYauHaWZSTdjw==
+
 "@dhis2/ui@^9.2.0":
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.4.3.tgz#2b8606a1cf806750c075873086cb3bae3efa5c28"
@@ -2289,6 +2910,61 @@
     "@dhis2/ui-icons" "9.4.3"
     prop-types "^15.7.2"
 
+"@dhis2/ui@^9.4.4":
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.4.4.tgz#ae7961d42753d72e209f7d11b160b3179e6a6452"
+  integrity sha512-w1NMZy/S5tNbXGt7F5J5OM1P8qgq1Bo1ifV34YV3Cs+8rJYkHHsFOokUN+wSTdXUWqIKxOGrRoQkmgmjQ19WlA==
+  dependencies:
+    "@dhis2-ui/alert" "9.4.4"
+    "@dhis2-ui/box" "9.4.4"
+    "@dhis2-ui/button" "9.4.4"
+    "@dhis2-ui/calendar" "9.4.4"
+    "@dhis2-ui/card" "9.4.4"
+    "@dhis2-ui/center" "9.4.4"
+    "@dhis2-ui/checkbox" "9.4.4"
+    "@dhis2-ui/chip" "9.4.4"
+    "@dhis2-ui/cover" "9.4.4"
+    "@dhis2-ui/css" "9.4.4"
+    "@dhis2-ui/divider" "9.4.4"
+    "@dhis2-ui/field" "9.4.4"
+    "@dhis2-ui/file-input" "9.4.4"
+    "@dhis2-ui/header-bar" "9.4.4"
+    "@dhis2-ui/help" "9.4.4"
+    "@dhis2-ui/input" "9.4.4"
+    "@dhis2-ui/intersection-detector" "9.4.4"
+    "@dhis2-ui/label" "9.4.4"
+    "@dhis2-ui/layer" "9.4.4"
+    "@dhis2-ui/legend" "9.4.4"
+    "@dhis2-ui/loader" "9.4.4"
+    "@dhis2-ui/logo" "9.4.4"
+    "@dhis2-ui/menu" "9.4.4"
+    "@dhis2-ui/modal" "9.4.4"
+    "@dhis2-ui/node" "9.4.4"
+    "@dhis2-ui/notice-box" "9.4.4"
+    "@dhis2-ui/organisation-unit-tree" "9.4.4"
+    "@dhis2-ui/pagination" "9.4.4"
+    "@dhis2-ui/popover" "9.4.4"
+    "@dhis2-ui/popper" "9.4.4"
+    "@dhis2-ui/portal" "9.4.4"
+    "@dhis2-ui/radio" "9.4.4"
+    "@dhis2-ui/required" "9.4.4"
+    "@dhis2-ui/segmented-control" "9.4.4"
+    "@dhis2-ui/select" "9.4.4"
+    "@dhis2-ui/selector-bar" "9.4.4"
+    "@dhis2-ui/sharing-dialog" "9.4.4"
+    "@dhis2-ui/switch" "9.4.4"
+    "@dhis2-ui/tab" "9.4.4"
+    "@dhis2-ui/table" "9.4.4"
+    "@dhis2-ui/tag" "9.4.4"
+    "@dhis2-ui/text-area" "9.4.4"
+    "@dhis2-ui/tooltip" "9.4.4"
+    "@dhis2-ui/transfer" "9.4.4"
+    "@dhis2-ui/user-avatar" "9.4.4"
+    "@dhis2/ui-constants" "9.4.4"
+    "@dhis2/ui-forms" "9.4.4"
+    "@dhis2/ui-icons" "9.4.4"
+    prop-types "^15.7.2"
+
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"

From a5e82b12a6f590048e24328cd0b76f240bcc3291 Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Tue, 16 Apr 2024 11:45:43 +0000
Subject: [PATCH 03/12] chore:Finished working on the second task of day2

---
 src/views/Attributes.js | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/views/Attributes.js b/src/views/Attributes.js
index 87b6a40..140b621 100644
--- a/src/views/Attributes.js
+++ b/src/views/Attributes.js
@@ -1,24 +1,37 @@
 import React from 'react'
 import { useGetAttributes } from '../hooks/index.js'
-
+import { Table ,DataTable, TableHead, TableCellHead, TableBody, TableRow, TableCell,} from '@dhis2/ui'
 export const Attributes = () => {
     // we get the data using a custom hook
     // we will update this implementation after learning about app-runtime
     const { loading, error, data } = useGetAttributes()
-
+    
     return (
         <div>
             <h1>Attributes</h1>
-            <p>loading: {JSON.stringify(loading)}</p>
-            <p>error message: {error?.message}</p>
-            {
-                // if there is any data available
-                data?.attributes?.attributes && (
-                    <pre>
-                        {JSON.stringify(data.attributes.attributes, null, 4)}
-                    </pre>
-                )
-            }
+            {/* <p>loading: {JSON.stringify(loading)}</p>
+            <p>error message: {error?.message}</p> */}
+            <Table>
+                <TableHead>
+                    <TableCellHead>Name</TableCellHead>
+                    <TableCellHead>Unique</TableCellHead>
+                </TableHead>
+
+                <TableBody>
+                    {data.attributes.attributes.map(
+                        ({id,displayName,unique})=>(
+                            <TableRow key={id}>
+                                <TableCell>{displayName}</TableCell>
+                                <TableCell>
+                                    {unique? 'Yes':'No'}
+                                </TableCell>
+                            </TableRow>
+                        )
+                    )}
+                </TableBody>
+            </Table>
+                 
+            
         </div>
     )
 }

From 4d5cdad45ccffbc1f3536ed5bdd83de0dcfa005c Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Tue, 16 Apr 2024 15:54:18 +0000
Subject: [PATCH 04/12] chore: Task 3 of day 2 completed

---
 src/views/Attributes.js   |  15 ++++-
 src/views/Form.js         | 118 ++++++++++++++++++++++++++++++++------
 src/views/Form.module.css |   8 +++
 3 files changed, 122 insertions(+), 19 deletions(-)

diff --git a/src/views/Attributes.js b/src/views/Attributes.js
index 140b621..652cf54 100644
--- a/src/views/Attributes.js
+++ b/src/views/Attributes.js
@@ -1,11 +1,22 @@
 import React from 'react'
 import { useGetAttributes } from '../hooks/index.js'
-import { Table ,DataTable, TableHead, TableCellHead, TableBody, TableRow, TableCell,} from '@dhis2/ui'
+import {CircularLoader,CenteredContent, Table ,DataTable, TableHead, TableCellHead, TableBody, TableRow, TableCell,} from '@dhis2/ui'
 export const Attributes = () => {
     // we get the data using a custom hook
     // we will update this implementation after learning about app-runtime
     const { loading, error, data } = useGetAttributes()
-    
+    if (loading) {
+        return (
+            <CenteredContent>
+                <CircularLoader />
+            </CenteredContent>
+        )
+    }
+
+    if (error) {
+        return <NoticeBox error>{error?.message}</NoticeBox>
+    }
+
     return (
         <div>
             <h1>Attributes</h1>
diff --git a/src/views/Form.js b/src/views/Form.js
index 1713331..a7ad418 100644
--- a/src/views/Form.js
+++ b/src/views/Form.js
@@ -1,20 +1,8 @@
-import { ReactFinalForm } from '@dhis2/ui'
+import {Button,InputFieldFF,SingleSelectFieldFF,SwitchFieldFF,composeValidators,createEqualTo,email,hasValue,dhis2Password,dhis2Username,ReactFinalForm} from '@dhis2/ui'
 import React from 'react'
 import styles from './Form.module.css'
 
-/**
- * This is just a function to demonstrate the values when the form is submitted
- * It takes the form's values (which is an object), transforms it into readable JSON,
- * and then finally displays the values in an alert box
- *
- * @param {Object} values
- * @param {string} values.title
- * @param {string} values.surname
- * @param {string} values.firstname
- * @param {string} values.email
- * @param {string} values.email-confirmation
- * @param {bool} values.newsletter
- */
+
 const alertValues = (values) => {
     const formattedValuesString = JSON.stringify(values, null, 2)
     alert(formattedValuesString)
@@ -31,15 +19,111 @@ export const Form = () => (
                 <form onSubmit={handleSubmit}>
                     <div className={styles.row}>
                         <Field
+                            name="title"
+                            label="Title"
+                            component={SingleSelectFieldFF}
+                            className={styles.title}
+                            initialValue="none"
+                            options={[
+                                { label: 'Professor', value: 'prof' },
+                                { label: 'Doctor', value: 'doc' },
+                                { label: 'None', value: 'none' },
+                            ]}
+                        />
+                    </div>
+
+                    <div className={styles.row}>
+                        <Field
+                            required
                             name="surname"
                             label="Surname"
-                            component={'input'}
+                            component={InputFieldFF}
                             className={styles.surname}
-                            initialValue={'Traore'}
+                            validate={hasValue}
+                        />
+
+                        <Field
+                            required
+                            name="firstname"
+                            label="First name"
+                            component={InputFieldFF}
+                            className={styles.firstname}
+                            validate={hasValue}
+                        />
+                    </div>
+
+                    <div className={styles.row}>
+                        <Field
+                            required
+                            name="username"
+                            label="Username"
+                            component={InputFieldFF}
+                            className={styles.email}
+                            validate={composeValidators(
+                                dhis2Username,
+                                hasValue
+                            )}
+                        />
+                    </div>
+
+                    <div className={styles.row}>
+                        <Field
+                            required
+                            name="password"
+                            label="Password"
+                            type="password"
+                            component={InputFieldFF}
+                            className={styles.password}
+                            validate={composeValidators(
+                                dhis2Password,
+                                hasValue
+                            )}
                         />
                     </div>
+
+                    <div className={styles.row}>
+                        <Field
+                            required
+                            name="email"
+                            label="E-mail address"
+                            component={InputFieldFF}
+                            className={styles.username}
+                            validate={composeValidators(email, hasValue)}
+                        />
+                    </div>
+
+                    <div className={styles.row}>
+                        <Field
+                            required
+                            name="confirm_email"
+                            label="Confirm e-mail address"
+                            component={InputFieldFF}
+                            className={styles.email}
+                            validate={composeValidators(
+                                createEqualTo('email'),
+                                hasValue
+                            )}
+                        />
+                    </div>
+
+                    <div className={styles.row}>
+                        <Field
+                            type="checkbox"
+                            name="newsletter"
+                            label="I want to receive the newsletter"
+                            component={SwitchFieldFF}
+                            className={styles.newsletters}
+                            initialValue={false}
+                        />
+                    </div>
+
+                    <div className={styles.row}>
+                        <Button type="submit" primary>
+                            Submit form
+                        </Button>
+                    </div>
                 </form>
             )}
         </RFForm>
     </div>
-)
+)
\ No newline at end of file
diff --git a/src/views/Form.module.css b/src/views/Form.module.css
index e2b6665..9bc9565 100644
--- a/src/views/Form.module.css
+++ b/src/views/Form.module.css
@@ -22,3 +22,11 @@
 .email {
     flex-grow: 1;
 }
+
+.username {
+    flex-grow: 1;
+}
+
+.password {
+    flex-grow: 1;
+}
\ No newline at end of file

From 96b6476ccc9c68cbddc3eb1f328266ae783f564e Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Tue, 16 Apr 2024 16:13:52 +0000
Subject: [PATCH 05/12] Chore:task 4 of day2 completed

---
 d2.config.js      |  2 +-
 i18n/en.pot       | 15 +++++++++++++++
 i18n/fr.po        | 15 +++++++++++++++
 package.json      |  1 +
 src/App.js        |  2 +-
 src/views/Home.js |  8 ++++----
 yarn.lock         |  2 +-
 7 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 i18n/en.pot
 create mode 100644 i18n/fr.po

diff --git a/d2.config.js b/d2.config.js
index fb32d27..1a65996 100644
--- a/d2.config.js
+++ b/d2.config.js
@@ -1,6 +1,6 @@
 const config = {
     type: 'app',
-
+    
     entryPoints: {
         app: './src/App.js',
     },
diff --git a/i18n/en.pot b/i18n/en.pot
new file mode 100644
index 0000000..c22bb40
--- /dev/null
+++ b/i18n/en.pot
@@ -0,0 +1,15 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: i18next-conv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"POT-Creation-Date: 2024-04-16T16:08:56.474Z\n"
+"PO-Revision-Date: 2024-04-16T16:08:56.474Z\n"
+
+msgid "Home"
+msgstr "Home"
+
+msgid "This is Dhis2 web Acadamy"
+msgstr "This is Dhis2 web Acadamy"
diff --git a/i18n/fr.po b/i18n/fr.po
new file mode 100644
index 0000000..952c17f
--- /dev/null
+++ b/i18n/fr.po
@@ -0,0 +1,15 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: i18next-conv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"POT-Creation-Date: 2024-04-16T16:01:35.096Z\n"
+"PO-Revision-Date: 2024-04-16T16:01:35.096Z\n"
+
+msgid "Home"
+msgstr "Maison"
+
+msgid "This is Dhis2 web Acadamy"
+msgstr "C'est Dhis2 web Acadamy" 
\ No newline at end of file
diff --git a/package.json b/package.json
index d59a3c3..59e9453 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     },
     "dependencies": {
         "@dhis2/app-runtime": "^3.10.3",
+        "@dhis2/d2-i18n": "^1.1.3",
         "@dhis2/ui": "^9.4.4",
         "react-router-dom": "^6.22.3"
     }
diff --git a/src/App.js b/src/App.js
index be72803..6f6b504 100644
--- a/src/App.js
+++ b/src/App.js
@@ -3,7 +3,7 @@ import { HashRouter, Navigate, Route, Routes } from 'react-router-dom'
 import styles from './App.module.css'
 import { Navigation } from './navigation/index.js'
 import { Form, Home, Attributes } from './views/index.js'
-
+import './locales/index.js'
 const MyApp = () => (
     <HashRouter
     // HashRouter is used as there is not integration with DHIS2 server
diff --git a/src/views/Home.js b/src/views/Home.js
index ecfad42..4f2c156 100644
--- a/src/views/Home.js
+++ b/src/views/Home.js
@@ -1,9 +1,9 @@
 import React from 'react'
-
+import i18n from '@dhis2/d2-i18n'
 export const Home = () => (
     <div>
-        <h1>Home</h1>
+        <h1>{i18n.t('Home')}</h1>
 
-        <p>This is Dhis2 web Acadamy</p>
-    </div>
+        <p>{i18n.t('This is Dhis2 web Acadamy')}</p>
+    </div>  
 )
diff --git a/yarn.lock b/yarn.lock
index a96869e..07c8012 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2750,7 +2750,7 @@
     semver "^7.3.5"
     yargs "^16.2.0"
 
-"@dhis2/d2-i18n@^1.1.1":
+"@dhis2/d2-i18n@^1.1.1", "@dhis2/d2-i18n@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@dhis2/d2-i18n/-/d2-i18n-1.1.3.tgz#ad73030f7cfceeed1b5bcaad86a9b336130bdfb1"
   integrity sha512-vOu6RDNumOJM396mHt35bETk9ai9b6XJyAwlUy1HstUZNvfET61F8rjCmMuXZU6zJ8ELux8kMFqlH8IG0vDJmA==

From 3b9bfb1008556df5c8824366cc82ac14050aa23d Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Tue, 16 Apr 2024 16:17:29 +0000
Subject: [PATCH 06/12] chore: last exercise of day 2 completed

---
 d2.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/d2.config.js b/d2.config.js
index 1a65996..a7a4257 100644
--- a/d2.config.js
+++ b/d2.config.js
@@ -1,6 +1,6 @@
 const config = {
     type: 'app',
-    
+    direction:'auto', 
     entryPoints: {
         app: './src/App.js',
     },

From 1dc93ddd40cc48a8f9ce71c99e71cba6547798ff Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Wed, 17 Apr 2024 09:34:14 +0000
Subject: [PATCH 07/12] chore:Task 1 of day 3 completed

---
 src/views/Home.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/Home.js b/src/views/Home.js
index 4f2c156..cf984e1 100644
--- a/src/views/Home.js
+++ b/src/views/Home.js
@@ -1,9 +1,16 @@
 import React from 'react'
 import i18n from '@dhis2/d2-i18n'
-export const Home = () => (
+import { useConfig } from '@dhis2/app-runtime'
+import { Tag } from '@dhis2/ui';
+
+export const Home = () => {
+    const { baseUrl, apiVersion } = useConfig();
+    return(
     <div>
         <h1>{i18n.t('Home')}</h1>
 
         <p>{i18n.t('This is Dhis2 web Acadamy')}</p>
+        <Tag positive>Running on API version: {apiVersion}</Tag>
     </div>  
-)
+    )
+    }

From c80364c4ee914bc537f89e1f02fdcb98be4218d7 Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Wed, 17 Apr 2024 09:59:24 +0000
Subject: [PATCH 08/12] chore: Internationalisation of Task1 completed

---
 i18n/en.pot       |   7 +-
 i18n/fr.po        |   5 +-
 src/views/Home.js |   2 +-
 yarn.lock         | 678 +---------------------------------------------
 4 files changed, 11 insertions(+), 681 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index c22bb40..f8dd9f3 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,11 +5,14 @@ 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: 2024-04-16T16:08:56.474Z\n"
-"PO-Revision-Date: 2024-04-16T16:08:56.474Z\n"
+"POT-Creation-Date: 2024-04-17T09:54:15.648Z\n"
+"PO-Revision-Date: 2024-04-17T09:54:15.648Z\n"
 
 msgid "Home"
 msgstr "Home"
 
 msgid "This is Dhis2 web Acadamy"
 msgstr "This is Dhis2 web Acadamy"
+
+msgid "Running on API version: {{apiVersion}}"
+msgstr "Running on API version: {{apiVersion}}"
diff --git a/i18n/fr.po b/i18n/fr.po
index 952c17f..7443660 100644
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -12,4 +12,7 @@ msgid "Home"
 msgstr "Maison"
 
 msgid "This is Dhis2 web Acadamy"
-msgstr "C'est Dhis2 web Acadamy" 
\ No newline at end of file
+msgstr "C'est Dhis2 web Acadamy" 
+
+msgid "Running on API version: {{apiVersion}}"
+msgstr "fonctionnant sur la version API: {{apiVersion}}"
\ No newline at end of file
diff --git a/src/views/Home.js b/src/views/Home.js
index cf984e1..4274cd3 100644
--- a/src/views/Home.js
+++ b/src/views/Home.js
@@ -10,7 +10,7 @@ export const Home = () => {
         <h1>{i18n.t('Home')}</h1>
 
         <p>{i18n.t('This is Dhis2 web Acadamy')}</p>
-        <Tag positive>Running on API version: {apiVersion}</Tag>
+        <Tag positive>{i18n.t('Running on API version: {{apiVersion}}',{apiVersion, nsSeparator:'~:~'})}</Tag>
     </div>  
     )
     }
diff --git a/yarn.lock b/yarn.lock
index 07c8012..18a45df 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1423,18 +1423,6 @@
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
-"@dhis2-ui/alert@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-9.4.3.tgz#62f628047f8dce01961a7a70aa424504f7beeb57"
-  integrity sha512-lOHs36Mit3pzRgimvcfeh5o1QvokmNgwFmcOmWp8p+Bqi2GEMOhCeZWAf7RlkS4onfU/YA6oIZMeHjJ9hiPVbA==
-  dependencies:
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/alert@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-9.4.4.tgz#4045882cb5bc5e6763897e4eca3d779e54f64d71"
@@ -1447,16 +1435,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/box@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-9.4.3.tgz#7a7766e28ab36775d37e6ff7639e8527b8809b9b"
-  integrity sha512-RsxKBJkjkER3gAkhhE/JLlQFVSa0u4DrwaFRh+05j4Xr+ssH5ABMSjR21vtHo3M9dzNUt63XXgv191H235sLzw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/box@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-9.4.4.tgz#646cdb3b30708ba2332d249eae47fa03a1e6d309"
@@ -1467,20 +1445,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/button@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-9.4.3.tgz#0440f3dc390ac9649c1c477452e32e9e61261c1d"
-  integrity sha512-EXPDMN7t/tCnwxL/8s8TffN6yyakjSEQ8wjGxkaATZR6pt/NfQSlWwVbb7m1MPkjeLOjXwsHtNc/k8atNAHGXQ==
-  dependencies:
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/button@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-9.4.4.tgz#5fa1765e6b7a26fdeca875bf3114a5039deab8f0"
@@ -1495,23 +1459,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/calendar@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-9.4.3.tgz#ffe62abdf68dee9b7afd4e4b4dde0c71f6b2ed8a"
-  integrity sha512-taUBZmCeoTlKr1U9wj2WbymWNg6iEOW8whD8Q6rLLBx6wvn2yLDPJg4A/dQEFUgje42afhzfImrkH80Lt8UtHQ==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2/multi-calendar-dates" "1.0.2"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/calendar@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-9.4.4.tgz#3b5147a42ffbefaab77824f5c95e755508d2291f"
@@ -1529,16 +1476,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/card@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-9.4.3.tgz#994052de11162a00daf0e60e47aabd0df4162b23"
-  integrity sha512-5QyepdsKMGwfRUQ+nERXHfQEtiXHDdXhiVGiwPkV6JByYwM+z49qZH3v7ctOQxyX1Px+j7THfp0RYSEh7DISlA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/card@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-9.4.4.tgz#8bb0ca90f5eef4421beef9506b2c244041f1c1ef"
@@ -1549,16 +1486,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/center@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-9.4.3.tgz#5b96d1e672921fa418e840a0485e763f81b3951a"
-  integrity sha512-mM71RjuBwRuvohls3stz+JpqM28NFXDVWZFV7qZFa75GTGtJLkvGaT5g/+hfxlBL3plSfPLN001jCSfGaKiBog==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/center@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-9.4.4.tgz#c62c32bbe83aa20278845ec22cfcb5cc3a394d26"
@@ -1569,18 +1496,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/checkbox@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-9.4.3.tgz#6bace74d49e58118da1c6d158ca88c18c011d58c"
-  integrity sha512-2sHidyzz+Ss0x4/bFLRpzD8v+BM/f2f6KQRdrU40s+W498R9wZn0KYXqJYG8ClDwOJe0YqoNrDlSHOJcsV+ibQ==
-  dependencies:
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/checkbox@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-9.4.4.tgz#61b75fa7d1773e1d9a11b95126c44a465ac59eaa"
@@ -1593,16 +1508,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/chip@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-9.4.3.tgz#c1efcbbef2fe4a34d4ca8cf67874f25a43dc59eb"
-  integrity sha512-h4UkxiIEHk9+jeUVWAl6Fam0HQ//6qVxCf2vVB61O7LBIprZSjSbGnarITMCGLtDHzkhhvoGTXJUtb8l6pX+cw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/chip@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-9.4.4.tgz#f1b151e0bc091aca4e288ed7f4889a38bf1f74c6"
@@ -1613,16 +1518,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/cover@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-9.4.3.tgz#cdc4393180f56e1f9cb9f9e8d766e61773d20708"
-  integrity sha512-5hNt4WHr2zHVzXYcoj97g2Fb2QRZXWXJ+5bz+sOcRSpZD0RearTky4shCFJeNMVbUjvCJCzmLdRBXwpDJH6YsA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/cover@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-9.4.4.tgz#89ed8113be5ba541d7250e32a828c5e2046369e7"
@@ -1633,16 +1528,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/css@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-9.4.3.tgz#a9b9573a9ca56062ad5a990e943c056a9c1fa939"
-  integrity sha512-afsj1qv2ltDV03QSjebYB4hw3YZTtQAmjn9SAKXfQE4VlIsWzj2B77ByLvUmqMwsgPOjlkYzdt9Kc5g2uZ3wrQ==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/css@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-9.4.4.tgz#c46af291af86eec008f60205c7c46e100ef8188a"
@@ -1653,16 +1538,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/divider@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-9.4.3.tgz#c6f934a49a2377044a08def865b607b1e2060a4f"
-  integrity sha512-knkdyCDxK+NFex0Lu1ucG9BU8e/rsCpGjoU1HzNpnKs1fYJg8+DdbirILmAE4QniywNtiGo4w7xY0N0bX0e0Vg==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/divider@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-9.4.4.tgz#d904282c0bc8552180923e36189b421dfb4d3853"
@@ -1673,19 +1548,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/field@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-9.4.3.tgz#b8b006e667cf443fb15fe05a51369cbea564f7c2"
-  integrity sha512-XEOQ+t/yORg3FiQyqqjD58LJ2faGoMJWvLO1EhM0Tt2P+MPxka+5reEe9MQzouOyyl/dRw5m5jisTHrkONMMig==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/help" "9.4.3"
-    "@dhis2-ui/label" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/field@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-9.4.4.tgz#80753ca3bc2c419dc1066e5e6d662b18ddaec032"
@@ -1699,22 +1561,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/file-input@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-9.4.3.tgz#5c3a1c235ada95a125d4bd4ed3926e16c07b9f34"
-  integrity sha512-45FcrLQvNJtgqMwNGmW9Yx+EpkTqFDImRrFwq0t9dWL7UTaY7Ww5UM7iFAFRAIBKctKt8rVSYENhdbEn2suQwQ==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/label" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/status-icon" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/file-input@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-9.4.4.tgz#02878069f9f4db33a14dba9e18642d8e85f6d2e9"
@@ -1731,30 +1577,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/header-bar@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-9.4.3.tgz#666af097b2c8058ea1ff733e26abd5cfd2ba7074"
-  integrity sha512-2D4QHXXnnSdOTiocHdzjOFyiBMQnF/E9fAmO46MvwJ1s9+TNl5hBMN5kbCwzxVlgoF/3UXcHIQ7n/EO7rNPlZw==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/center" "9.4.3"
-    "@dhis2-ui/divider" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/logo" "9.4.3"
-    "@dhis2-ui/menu" "9.4.3"
-    "@dhis2-ui/modal" "9.4.3"
-    "@dhis2-ui/user-avatar" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    moment "^2.29.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/header-bar@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-9.4.4.tgz#7c26955ea968bb25cac6766e549402ccde34d8c3"
@@ -1779,16 +1601,6 @@
     moment "^2.29.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/help@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-9.4.3.tgz#6bb24d0ebabe26a2b85f453df64e8f07fa52a797"
-  integrity sha512-ufYCWORYaEZk5XbNJ8jeS3hmfERnbjEK4+tsClsU2L4yMzu9vB4cpeG0sXD5Tyim7Sw1OO2+tdT9mV40p3jmVw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/help@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-9.4.4.tgz#6b3df94b6b8c0f7269dde3c90602dbb6dac889fa"
@@ -1799,22 +1611,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/input@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-9.4.3.tgz#99779bfddfc8aa557df3202f1f6bfb489234f30f"
-  integrity sha512-9sXfZpNOSAodfHRNBGOokxSTYvhr7u8irqmNYgtCYCb2jl4wJ3lXBOvBM4hPNxThhM61HV3WMD4SAWRD22O9fQ==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/status-icon" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/input@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-9.4.4.tgz#621eab6b8d535fcb111094f660415ff4136cb156"
@@ -1831,16 +1627,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/intersection-detector@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-9.4.3.tgz#4b2df40f73ab6b76d0f94b8721546ab42232e96d"
-  integrity sha512-Ag+KkVLcNyMCjvre/zmK78UnLpQGT/psogPNgKSh14nlGdyL3gAQcmqF4AnWmBQ07+0fL9hOIv4AIqyVNeYJEQ==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/intersection-detector@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-9.4.4.tgz#1ad2a7b47a84aeb674274272d362302f4b23ba56"
@@ -1851,17 +1637,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/label@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-9.4.3.tgz#9ebab25a734baab05a1680d577bd11cf8d94a086"
-  integrity sha512-Gv6GUVqQJWAz4jvqx6DbNDxszH3YhZlE6EOR3067AXESoQaAiq4Uwkaf2Gs0vdzS1t9vCoG39Qd8w+4D8Ufl7A==
-  dependencies:
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/label@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-9.4.4.tgz#107e21bcc7a8d29e8355d54d5e475c96364fc78d"
@@ -1873,17 +1648,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/layer@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-9.4.3.tgz#9cd91dcc8999a9270936fc899262a96f6684088b"
-  integrity sha512-Cf0zDpwDNfVItg8/h2rVzUQQBY1QBJBYLIw/Lal5YUrJS0hie8yZA5SkxB7su1PYJGirC4Zv96hkrfu5z2OMlA==
-  dependencies:
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/layer@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-9.4.4.tgz#980a9e397468b9418937202a0afaae868bed4b4b"
@@ -1895,17 +1659,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/legend@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-9.4.3.tgz#bf1461062aa05e8aefe36356e38437ef1a6d765e"
-  integrity sha512-Qwxp+VCsGid3gr3uDxuncdUEw3t1R/jjduArz7VdXlzIH07/gcBOjICCG5iTcTx4ZBix5ffIQ1Od1Fq8sJZ82w==
-  dependencies:
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/legend@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-9.4.4.tgz#5476cfa7937ca9bbac3b9e64e991b17d51e9ced1"
@@ -1917,16 +1670,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/loader@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-9.4.3.tgz#41f8a212c7c9a3c62be3c087e0f6ec5838695238"
-  integrity sha512-zSLASWqLuIsHgMsu7YC5fV55/8JaO99FDXMPh78ezcJgT3kZ3h07tzbJi5fDltLlJ48Er5lCdDFliwfCPH9vVA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/loader@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-9.4.4.tgz#2bd268cba9310db47c0a9dda04cff760380fc6b0"
@@ -1937,16 +1680,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/logo@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-9.4.3.tgz#9479533737626dab0285445e117776110a475ee6"
-  integrity sha512-+LEH9n9ZlB289W5wfYfyIhCFPtLnEqQKuWjItrnSmd7bcqocH/wPH0mVtm7GPt8IxhSBMqDidJd1yIhyMMpXhQ==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/logo@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-9.4.4.tgz#a0050a56aabafe33ef4c232a116980d289fbcc34"
@@ -1957,22 +1690,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/menu@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-9.4.3.tgz#9042c76f9257f8eaac9eaa8d9f3ffc6eafda8d6b"
-  integrity sha512-noVyX3Qc4dU+uhD5msbNS6uiUBpxdo9e3unyh56piuBQSseafsGepZIr3lLUs1bWOfIfTrXt/RYnvtXWlkjS7w==
-  dependencies:
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/divider" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/menu@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-9.4.4.tgz#a25fe07705d8e14e97390d8b59e7330d7fdc335e"
@@ -1989,21 +1706,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/modal@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-9.4.3.tgz#402d687a231076992ae671e9029f6bb83c8bb2b8"
-  integrity sha512-7hV8kB4hdoNxiRNWO32Sb78PkRvfDxnh2QSrExnjO/C+hYyhnjkVfCshgEMdyO4WnASKe8gUIMwkLf+v6T3nOg==
-  dependencies:
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/center" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/modal@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-9.4.4.tgz#3edbc8e3bb942aba2c8377aadd79514fe2fa7930"
@@ -2019,17 +1721,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/node@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-9.4.3.tgz#690bb1069efa8d6e1087efb21905ccafbd31768e"
-  integrity sha512-dxhe/Jb79mRellWU6nMTh5Mkuve6brTQ1j255l+xjPzDkQCU5UMRJ9YrijdrLFyD2nBO0868BUUutwHegyvYJw==
-  dependencies:
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/node@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-9.4.4.tgz#3c13b7424a172564a0d52893b4d1ac8a7d9ceac3"
@@ -2041,17 +1732,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/notice-box@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-9.4.3.tgz#48ba69fa439b9bdee85190ae40baad55b995cd36"
-  integrity sha512-z0hiOA4wnzcZZKX4lXCQp6dt5j8c6virnUn5uBhKGCsWzrfRYUaKjn/pUQVHiMlysO9lsw3IdyHC79pEIp74jg==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/notice-box@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-9.4.4.tgz#c333a0ffa0cddc20431071ec56f0521fa3dbcb5d"
@@ -2063,19 +1743,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/organisation-unit-tree@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-9.4.3.tgz#00c00ab39f811be0f7dc885141bf178093f3799d"
-  integrity sha512-q4qdEXGFbsWBkmgII6r2tbVPetQyxS1Sh9/B8vAeSAKBTPXmOKagE0bDH0gwqqoUVGLtLUjGxWYiNhi3uJyTpQ==
-  dependencies:
-    "@dhis2-ui/checkbox" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/node" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/organisation-unit-tree@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-9.4.4.tgz#3e952d2fe0fd045d6bc2a6a92872ef8e83a6e7f2"
@@ -2089,19 +1756,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/pagination@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-9.4.3.tgz#9c5172a74feb10a795866c9f44a98a7a5a80c3b0"
-  integrity sha512-2k0/ty57+MgvwCzKad+90Vbu3muHvCBVgoQ2wX8UMWyH0bGPSnSx/0n6NaUBRISmz4EQF1GNcuNOKnWZREkSfQ==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/select" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/pagination@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-9.4.4.tgz#35d4ab7e35a0a37d998fe51394ac1bda26b7052f"
@@ -2115,18 +1769,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/popover@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-9.4.3.tgz#2ed3b6b5ad6540982c648bb0aecca4168e0ed34b"
-  integrity sha512-uP0gB/doUZ9CHH/9J8+Zb796Erda5z7GhEJFvbq+irOwKYwRR2dfrac2K0qlAOmwX4VjZKAFyMdsEMFNvyXB4Q==
-  dependencies:
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/popover@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-9.4.4.tgz#547dbffefbfdd838bf401a5a44e1e524ab028440"
@@ -2139,19 +1781,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/popper@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-9.4.3.tgz#4fa1ce4893988f1cb03e2ee11b358940c65468ff"
-  integrity sha512-1ETf832VWh2lZOWkJw0YcftyPkOOsX/jVTKJWI2bQG/Sck5aMTc5GU53mg5CowxOFU09yiM9OL5FD/ljey56gg==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@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/popper@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-9.4.4.tgz#84d3e2155d93bc54cebdf1430dc7b2f207d681ae"
@@ -2165,14 +1794,6 @@
     react-popper "^2.2.5"
     resize-observer-polyfill "^1.5.1"
 
-"@dhis2-ui/portal@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-9.4.3.tgz#3f72d076c869ebaa0d495d421a872fc1d944acb6"
-  integrity sha512-v8+1WveMDJKpfoiEfsdF5tju8pzZpilIRIAzoMv636ehPg3jNdwsNUMA4QWL+pO+MjtULIcVjB1e4bdra/cREA==
-  dependencies:
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/portal@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-9.4.4.tgz#8de12cd6c0e975b47cd19caae8acc1500034f206"
@@ -2181,16 +1802,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/radio@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-9.4.3.tgz#c7f40a156ed9cd4362b6ac135356c30285d638bd"
-  integrity sha512-RNbanxBN631xuibjpRo1Agk47ZLFK2Kcoe9O81OyZzZEdDdcT0SiLaXdN9EqIhn2GpU4TJqj4Ky+KA4r1UNvLA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/radio@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-9.4.4.tgz#5654713ad8646aac31909ff6009b189975b3eaf5"
@@ -2201,16 +1812,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/required@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-9.4.3.tgz#71a190295a2607dc104a228154163a111f357ac0"
-  integrity sha512-XEdTPqOcgu8Qwuhbyekqk3WEl8XQvEha2tvTywsBLyimD5bIBf7Z46U7h/8fKXIMySangyk62e99q2PcE/Bt9g==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/required@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-9.4.4.tgz#fc167134d435a7ee4a86966887f282653e87f9f3"
@@ -2221,16 +1822,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/segmented-control@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-9.4.3.tgz#e1b4577b79402cde2d89b6966ac695f6f62ca405"
-  integrity sha512-LqrfMjaANacTaydHHlZwQYcxaDI+/Wkw4Rfsm1L0ISatpqEmGN3XEAeJs/TV9pOLvELYai9UZMtLEtnPt2urFg==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/segmented-control@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-9.4.4.tgz#8f4b756b913f5162f7523c4044be80a068584649"
@@ -2241,29 +1832,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/select@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-9.4.3.tgz#3963a2a0fa3710ea222bf7754a205d77eb4a6a9f"
-  integrity sha512-TBPloheNPvi78VmEPI8aNd4NvBJtmAyT9EOVOh1C8a2XbR3SNeNTK/dDs+uTLfP3y4+dAwGQpZLphnZkIp2rNw==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/checkbox" "9.4.3"
-    "@dhis2-ui/chip" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/status-icon" "9.4.3"
-    "@dhis2-ui/tooltip" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/select@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-9.4.4.tgz#39e566dc565a07c783ca9c3be0ad15de2484eec4"
@@ -2287,21 +1855,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/selector-bar@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-9.4.3.tgz#a25e30dd35ffb93728513ab88bbcee5ee18d02bf"
-  integrity sha512-K4r+P1hTlsiESuHwaKe7LoNz2ALY1d6MjGWdiA3EfwQNCEl8SFb4yrbdp3RpWAKz4F9t2TNIMwEVtqdwTEe07Q==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    "@testing-library/react" "^12.1.2"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/selector-bar@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-9.4.4.tgz#79513f90bdc1f4a2c6270cb8f2083dd14d4b11d9"
@@ -2317,32 +1870,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/sharing-dialog@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-9.4.3.tgz#463a1b6faa45dc06380f2c0a1dea0fd448252162"
-  integrity sha512-x2HJNMz0qAvvbMRVM6yh1ytc3FxffBV+W4Ndakw8NkvqTI7ICp2xQYKD/JXhlfOw5PnR2lopUNQiIKl3tK0v7g==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/divider" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/menu" "9.4.3"
-    "@dhis2-ui/modal" "9.4.3"
-    "@dhis2-ui/notice-box" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/select" "9.4.3"
-    "@dhis2-ui/tab" "9.4.3"
-    "@dhis2-ui/tooltip" "9.4.3"
-    "@dhis2-ui/user-avatar" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    "@react-hook/size" "^2.1.2"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/sharing-dialog@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-9.4.4.tgz#dcb9aa7436cd037e59f02231eeece7fbf6d82414"
@@ -2369,18 +1896,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/status-icon@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-9.4.3.tgz#4b90cf35ec0569c629f4186dc9041d373432d111"
-  integrity sha512-4XeN0qkzZRCLqhU0uuuaWN8hIofImn+y2ihO4zMVfTrtwDvjYrO0ByFk+BBxf3SeTQ7Px4w0J0KFtCawME2EvA==
-  dependencies:
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/status-icon@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-9.4.4.tgz#ab44a615aee73a6f4edae6c2eeee017e9970b6c9"
@@ -2393,18 +1908,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/switch@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-9.4.3.tgz#54c7f45e11942657ebbbd1de4f35f3f55ff4576d"
-  integrity sha512-yYCWz63/A5R7hrLyUTAM3HsLxNYL/mvDtANV/JGwX0QvbwBXoPt+lIvzdHZfEbdjAt+eDBtApcN6KAwaVOEnfg==
-  dependencies:
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/switch@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-9.4.4.tgz#181df81c21f369752bacabd62088b9531248ae13"
@@ -2417,17 +1920,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/tab@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-9.4.3.tgz#62417dda2594cf307cdb320cae092fd1cac3c12c"
-  integrity sha512-fQ/Ri19kARDlPlu1RN7j7jt19y1w331i3pDJZfFZxcyirtT4FaF4DawS8tzpXmsCfgYs6sROy6MqI+yS3Pjx6w==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/tab@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-9.4.4.tgz#66ef74adf7e01c8a2f68327e0616795da1b7b064"
@@ -2439,17 +1931,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/table@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-9.4.3.tgz#4e593ff5d15a4b0d0599e98818c054cd34c303fa"
-  integrity sha512-r9nJkq0W3bO4Z8T3C88DbU+SAEE6Yx5LqFUuZv861qKJmMUTh8qCqRnSrb7gVujrBS3YFbmjngygOxF+W9tGlw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/table@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-9.4.4.tgz#b93c9ea878914df7dd3147f067c00ea946602fc4"
@@ -2461,16 +1942,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/tag@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-9.4.3.tgz#c8bcc942dddf02b8b8659aea497cc5fe0c50cb7d"
-  integrity sha512-3Z7qUxziESkW8Q2y/erWDcT2YII3T9MRz7IcgZ4dU/ljbWCwYBgqo+AmGIC1HSJ/Nij9WEM8+CIy6KxPNc2NaA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/tag@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-9.4.4.tgz#493a2369f384cb12f1104b18e34b54d516bce740"
@@ -2481,21 +1952,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/text-area@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-9.4.3.tgz#72953f5dcf75623769740b1ea8ff356610de7068"
-  integrity sha512-OeCR6GiDH8vyuoxFK7CySeeBMTMULAcd7owpQo9nmelpcx7jn5P8/fmYkjhvllJrkKHiHl+mMFqa00l4qn6aTw==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/status-icon" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/text-area@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-9.4.4.tgz#f5d6ee3fab9c2f71b129ea6ce4b3f7d7b36e3bf5"
@@ -2511,18 +1967,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/tooltip@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-9.4.3.tgz#29820574c938341fc9cbe154806c6e6fbfe03b93"
-  integrity sha512-2JaXlVRcfRrfaEvdKnn41qRydkflWAecDw3Gh+2huu8VyUKNu7TctfN9dXfMrvmeqfLCwtAT0NBffzw3UgoXCg==
-  dependencies:
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/tooltip@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-9.4.4.tgz#268c4d0a395669522d45dd0a5720c18589887929"
@@ -2535,21 +1979,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/transfer@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-9.4.3.tgz#989b262b464b089653f02a746e97dc5958ed8489"
-  integrity sha512-Gvut7g8/GqWZ0QXiPdXaoSC5r/vxfOrIXOJH+JvJW1ZoUsWPO7wjEvib1DSmbjGxRqrtf8MFZ3uTdkwDnWAYSg==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/intersection-detector" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/transfer@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-9.4.4.tgz#d3f45a4a41eb35363c3f6ac57f8d499dd0ac198b"
@@ -2565,16 +1994,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/user-avatar@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-9.4.3.tgz#1874867bd92a44a21969927be8f3d162287466de"
-  integrity sha512-M+c+zV4HpkL7RJgicFc3MGM+gf95TpfnvKX8yT89SvQZgSKtcQnWSzp+3/Ss1JABH92Aitfba6MOQdvme3x/Tw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/user-avatar@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-9.4.4.tgz#cb97b581e288c9d6a99d5f98a66fa3c63a6b27be"
@@ -2759,14 +2178,6 @@
     i18next "^10.3"
     moment "^2.24.0"
 
-"@dhis2/multi-calendar-dates@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.0.2.tgz#e54dc85e512aba93fceef3004e67e199077f3ba8"
-  integrity sha512-oQZ7PFMwHFpt4ygDN9DmAeYO3g07L7AHJW6diZ37mzpkEF/DyMafhsZHnJWNlTH5HDp8nYuO3EjBiM7fZN6C0g==
-  dependencies:
-    "@js-temporal/polyfill" "^0.4.2"
-    classnames "^2.3.2"
-
 "@dhis2/multi-calendar-dates@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.1.1.tgz#fb76a77114ce0b757db7dd9f588d1a47809732da"
@@ -2791,13 +2202,6 @@
     workbox-routing "^6.1.5"
     workbox-strategies "^6.1.5"
 
-"@dhis2/ui-constants@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-9.4.3.tgz#aae69e2a00eddc1cb46ba0693be15cbbf7a64d7f"
-  integrity sha512-iSQi70BnvXWvqFWblO4M4AVMHRXLOD9Gay9LNx/6NPcwwL8UU633nFf1M8TV71bm4CrZci/m3zew/hXjCMtF9w==
-  dependencies:
-    prop-types "^15.7.2"
-
 "@dhis2/ui-constants@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-9.4.4.tgz#4fe728f96fe92752b4a033b03f2fdb1313eafeb3"
@@ -2805,26 +2209,6 @@
   dependencies:
     prop-types "^15.7.2"
 
-"@dhis2/ui-forms@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-9.4.3.tgz#0d4ff0ae7dd89d99d1b9fc4d29e382853b621731"
-  integrity sha512-PGMpWfTZEgEjeEPus804XAQCtcyx7RQElAg1/s7zmJCWm4Uj4Okn4ZjZtNfH7/qQF2unFzbdRL3ryeMMh/GscA==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/checkbox" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/file-input" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/radio" "9.4.3"
-    "@dhis2-ui/select" "9.4.3"
-    "@dhis2-ui/switch" "9.4.3"
-    "@dhis2-ui/text-area" "9.4.3"
-    "@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-forms@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-9.4.4.tgz#9104665d2a57429df89caac720c59ad509328515"
@@ -2845,72 +2229,12 @@
     prop-types "^15.7.2"
     react-final-form "^6.5.3"
 
-"@dhis2/ui-icons@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.4.3.tgz#b7eac309031351003d0afdde31e5bbe15de928d0"
-  integrity sha512-6o6L9gfWGLPlB35aBzyU13v6qGE+f2Xk1Xmt68fhqzcAqBj7e1UZ+XIQPb7b3bQlv2AWftWBhUGaMJJIlddtZg==
-
 "@dhis2/ui-icons@9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.4.4.tgz#c4f488496389687ebd47266e93e0aacf27054ef3"
   integrity sha512-AGt+aYqpqb7f/2IH5quZ1bJoSz/WB3p7I1CdZHUPk/XP6rQpO2W7mqoLxiZYOHCiNlTU+sjfXcYauHaWZSTdjw==
 
-"@dhis2/ui@^9.2.0":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.4.3.tgz#2b8606a1cf806750c075873086cb3bae3efa5c28"
-  integrity sha512-0U47fkp+5Ree3k8MdhhFvuBiYmWWiRGv46BWGg27yGBQOGeCoBMNsDTE+nZfRW0op2aW/okOloNneeter0K52w==
-  dependencies:
-    "@dhis2-ui/alert" "9.4.3"
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/calendar" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/center" "9.4.3"
-    "@dhis2-ui/checkbox" "9.4.3"
-    "@dhis2-ui/chip" "9.4.3"
-    "@dhis2-ui/cover" "9.4.3"
-    "@dhis2-ui/css" "9.4.3"
-    "@dhis2-ui/divider" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/file-input" "9.4.3"
-    "@dhis2-ui/header-bar" "9.4.3"
-    "@dhis2-ui/help" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/intersection-detector" "9.4.3"
-    "@dhis2-ui/label" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/legend" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/logo" "9.4.3"
-    "@dhis2-ui/menu" "9.4.3"
-    "@dhis2-ui/modal" "9.4.3"
-    "@dhis2-ui/node" "9.4.3"
-    "@dhis2-ui/notice-box" "9.4.3"
-    "@dhis2-ui/organisation-unit-tree" "9.4.3"
-    "@dhis2-ui/pagination" "9.4.3"
-    "@dhis2-ui/popover" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2-ui/radio" "9.4.3"
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2-ui/segmented-control" "9.4.3"
-    "@dhis2-ui/select" "9.4.3"
-    "@dhis2-ui/selector-bar" "9.4.3"
-    "@dhis2-ui/sharing-dialog" "9.4.3"
-    "@dhis2-ui/switch" "9.4.3"
-    "@dhis2-ui/tab" "9.4.3"
-    "@dhis2-ui/table" "9.4.3"
-    "@dhis2-ui/tag" "9.4.3"
-    "@dhis2-ui/text-area" "9.4.3"
-    "@dhis2-ui/tooltip" "9.4.3"
-    "@dhis2-ui/transfer" "9.4.3"
-    "@dhis2-ui/user-avatar" "9.4.3"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-forms" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    prop-types "^15.7.2"
-
-"@dhis2/ui@^9.4.4":
+"@dhis2/ui@^9.2.0", "@dhis2/ui@^9.4.4":
   version "9.4.4"
   resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.4.4.tgz#ae7961d42753d72e209f7d11b160b3179e6a6452"
   integrity sha512-w1NMZy/S5tNbXGt7F5J5OM1P8qgq1Bo1ifV34YV3Cs+8rJYkHHsFOokUN+wSTdXUWqIKxOGrRoQkmgmjQ19WlA==

From c0bf742096488746c7bd6cc1949e3f8d5a28d8db Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Wed, 17 Apr 2024 11:27:43 +0000
Subject: [PATCH 09/12] Chore: The second task for day 3 is completed

---
 src/views/Form.js | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/views/Form.js b/src/views/Form.js
index a7ad418..ceec733 100644
--- a/src/views/Form.js
+++ b/src/views/Form.js
@@ -1,20 +1,35 @@
-import {Button,InputFieldFF,SingleSelectFieldFF,SwitchFieldFF,composeValidators,createEqualTo,email,hasValue,dhis2Password,dhis2Username,ReactFinalForm} from '@dhis2/ui'
+import {Button,InputFieldFF,SingleSelectFieldFF,SwitchFieldFF,composeValidators,createEqualTo,email,hasValue,dhis2Password,dhis2Username,ReactFinalForm,AlertBar} from '@dhis2/ui'
 import React from 'react'
 import styles from './Form.module.css'
+import { useAlert } from '@dhis2/app-runtime'
+
 
 
-const alertValues = (values) => {
-    const formattedValuesString = JSON.stringify(values, null, 2)
-    alert(formattedValuesString)
-}
 
 const { Field, Form: RFForm } = ReactFinalForm
 
-export const Form = () => (
+export const Form = () => {
+    const {show}= useAlert(
+        ({values,error})=>{
+            if (error){
+                return `something went wrong: ${error}`
+            }
+            return `form successfully submitted: ${values}`
+        },
+        ({error})=>{
+            return error? {duration:3000,critical:true}: {duration:3000,success:true}
+        }
+
+    )
+    const onSubmit= (values) => {
+        show({
+            values: JSON.stringify(values, null, 2)})
+                }
+return(
     <div>
         <h1>Form</h1>
 
-        <RFForm onSubmit={alertValues}>
+        <RFForm onSubmit={onSubmit}>
             {({ handleSubmit }) => (
                 <form onSubmit={handleSubmit}>
                     <div className={styles.row}>
@@ -122,8 +137,9 @@ export const Form = () => (
                             Submit form
                         </Button>
                     </div>
-                </form>
+                                    </form>
             )}
         </RFForm>
     </div>
-)
\ No newline at end of file
+    )
+                            }

From 8f7ecf1047bf92b28c45d139bf8f3a1df32a1437 Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Wed, 17 Apr 2024 14:37:41 +0000
Subject: [PATCH 10/12] chore: task 2 of day3 completed

---
 src/views/Attributes.js | 72 +++++++++++++++++++++++++----------------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/views/Attributes.js b/src/views/Attributes.js
index 652cf54..6bceb8c 100644
--- a/src/views/Attributes.js
+++ b/src/views/Attributes.js
@@ -1,10 +1,23 @@
 import React from 'react'
 import { useGetAttributes } from '../hooks/index.js'
-import {CircularLoader,CenteredContent, Table ,DataTable, TableHead, TableCellHead, TableBody, TableRow, TableCell,} from '@dhis2/ui'
+import { CircularLoader, CenteredContent, Table, DataTable, TableHead, TableCellHead, TableBody, TableRow, TableCell, } from '@dhis2/ui'
+import { useDataQuery } from '@dhis2/app-runtime'
+
+
+const query = {
+
+    attributes: {
+        resource: "attributes",
+        params: {
+            fields: ['code', 'displayName', 'unique', 'id'],
+            order: 'displayName:desc',
+            pageSize: 5
+        }
+    },
+
+}
 export const Attributes = () => {
-    // we get the data using a custom hook
-    // we will update this implementation after learning about app-runtime
-    const { loading, error, data } = useGetAttributes()
+    const { loading, error, data } = useDataQuery(query)
     if (loading) {
         return (
             <CenteredContent>
@@ -20,29 +33,34 @@ export const Attributes = () => {
     return (
         <div>
             <h1>Attributes</h1>
-            {/* <p>loading: {JSON.stringify(loading)}</p>
-            <p>error message: {error?.message}</p> */}
-            <Table>
-                <TableHead>
-                    <TableCellHead>Name</TableCellHead>
-                    <TableCellHead>Unique</TableCellHead>
-                </TableHead>
-
-                <TableBody>
-                    {data.attributes.attributes.map(
-                        ({id,displayName,unique})=>(
-                            <TableRow key={id}>
-                                <TableCell>{displayName}</TableCell>
-                                <TableCell>
-                                    {unique? 'Yes':'No'}
-                                </TableCell>
-                            </TableRow>
-                        )
-                    )}
-                </TableBody>
-            </Table>
-                 
-            
+
+            {data?.attributes?.attributes && (
+                <Table>
+                    <TableHead>
+                        <TableCellHead>Name</TableCellHead>
+                        <TableCellHead>Unique</TableCellHead>
+                    </TableHead>
+
+                    <TableBody>
+                        {data.attributes.attributes.map(
+                            (atribute) => {
+                                const { id, displayName, unique } = atribute
+                                return (
+                                    <TableRow key={id}>
+                                        <TableCell>{displayName}</TableCell>
+                                        <TableCell>
+                                            {unique ? 'Yes' : 'No'}
+                                        </TableCell>
+                                    </TableRow>
+                                )
+                            }
+                        )}
+                    </TableBody>
+                </Table>
+            )}
+
+
+
         </div>
     )
 }

From 84887e092dc430fff615f319a5bd6cd75decb86c Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Wed, 17 Apr 2024 15:54:00 +0000
Subject: [PATCH 11/12] chore:task 3 of day3 is completed

---
 i18n/en.pot                      | 22 ++++++++-
 src/views/AttributeCreateForm.js | 78 ++++++++++++++++++++++++++++++++
 src/views/Attributes.js          | 17 +++++--
 3 files changed, 111 insertions(+), 6 deletions(-)
 create mode 100644 src/views/AttributeCreateForm.js

diff --git a/i18n/en.pot b/i18n/en.pot
index f8dd9f3..9faec52 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,26 @@ 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: 2024-04-17T09:54:15.648Z\n"
-"PO-Revision-Date: 2024-04-17T09:54:15.648Z\n"
+"POT-Creation-Date: 2024-04-17T14:57:07.004Z\n"
+"PO-Revision-Date: 2024-04-17T14:57:07.004Z\n"
+
+msgid "Add an attribute"
+msgstr "Add an attribute"
+
+msgid "Attribute name"
+msgstr "Attribute name"
+
+msgid "Value Type"
+msgstr "Value Type"
+
+msgid "Text"
+msgstr "Text"
+
+msgid "Number"
+msgstr "Number"
+
+msgid "Save"
+msgstr "Save"
 
 msgid "Home"
 msgstr "Home"
diff --git a/src/views/AttributeCreateForm.js b/src/views/AttributeCreateForm.js
new file mode 100644
index 0000000..229892b
--- /dev/null
+++ b/src/views/AttributeCreateForm.js
@@ -0,0 +1,78 @@
+import i18n from '@dhis2/d2-i18n'
+
+import {
+    Button,
+    InputFieldFF,
+    hasValue,
+    ReactFinalForm,
+    SingleSelectFieldFF,
+} from '@dhis2/ui'
+import React from 'react'
+import styles from './Form.module.css'
+import { useDataMutation } from '@dhis2/app-runtime'
+
+const { Field, Form: RFForm } = ReactFinalForm
+
+const mutation={
+    resource: 'attributes',
+    type:'create',
+    data: (values)=>values,
+}
+
+const AttributeCreateForm = () => {
+    const [mutate]= useDataMutation(mutation)
+    const onSubmit = async (values) => {
+        console.log(values)
+        mutate(values)
+        
+    }
+
+    return (
+        <div>
+            <h1>{i18n.t('Add an attribute')}</h1>
+
+            <RFForm onSubmit={onSubmit}>
+                {({ handleSubmit }) => (
+                    <form onSubmit={handleSubmit}>
+                        <div className={styles.row}>
+                            <Field
+                                required
+                                name="name"
+                                label={i18n.t('Attribute name')}
+                                component={InputFieldFF}
+                                validate={hasValue}
+                            />
+                        </div>
+                        <div className={styles.row}>
+                            <Field
+                                name="valueType"
+                                label={i18n.t('Value Type')}
+                                component={SingleSelectFieldFF}
+                                className={styles.title}
+                                initialValue="TEXT"
+                                options={[
+                                    {
+                                        label: i18n.t('Text'),
+                                        value: 'TEXT',
+                                    },
+                                    {
+                                        label: i18n.t('Number'),
+                                        value: 'NUMBER',
+                                    },
+                                ]}
+                            />
+                        </div>
+
+                        <div className={styles.row}>
+                            <Button type="submit" primary>
+                                {i18n.t('Save')}
+                            </Button>
+                        </div>
+                    </form>
+                )}
+            </RFForm>
+        </div>
+    )
+}
+
+export default AttributeCreateForm
diff --git a/src/views/Attributes.js b/src/views/Attributes.js
index 6bceb8c..39cf99c 100644
--- a/src/views/Attributes.js
+++ b/src/views/Attributes.js
@@ -2,7 +2,8 @@ import React from 'react'
 import { useGetAttributes } from '../hooks/index.js'
 import { CircularLoader, CenteredContent, Table, DataTable, TableHead, TableCellHead, TableBody, TableRow, TableCell, } from '@dhis2/ui'
 import { useDataQuery } from '@dhis2/app-runtime'
-
+import AttributeCreateForm from './AttributeCreateForm.js'
+import { NoticeBox } from '@dhis2/ui'
 
 const query = {
 
@@ -11,9 +12,16 @@ const query = {
         params: {
             fields: ['code', 'displayName', 'unique', 'id'],
             order: 'displayName:desc',
-            pageSize: 5
+            // pageSize: 5
         }
     },
+    me: {
+        resource: "me",
+        params: {
+            fields: ["displayName"]
+            
+        }
+    }
 
 }
 export const Attributes = () => {
@@ -29,11 +37,11 @@ export const Attributes = () => {
     if (error) {
         return <NoticeBox error>{error?.message}</NoticeBox>
     }
-
+    
     return (
         <div>
             <h1>Attributes</h1>
-
+            
             {data?.attributes?.attributes && (
                 <Table>
                     <TableHead>
@@ -58,6 +66,7 @@ export const Attributes = () => {
                     </TableBody>
                 </Table>
             )}
+            <AttributeCreateForm/>
 
 
 

From a57fef1ac9066ba3a80cde46e71d1e6796d3a2c9 Mon Sep 17 00:00:00 2001
From: Mikee131 <michaeleshete9@gmail.com>
Date: Wed, 17 Apr 2024 16:02:35 +0000
Subject: [PATCH 12/12] chore:task 3 of day3 translation completed

---
 i18n/fr.po | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/i18n/fr.po b/i18n/fr.po
index 7443660..0956066 100644
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -15,4 +15,22 @@ msgid "This is Dhis2 web Acadamy"
 msgstr "C'est Dhis2 web Acadamy" 
 
 msgid "Running on API version: {{apiVersion}}"
-msgstr "fonctionnant sur la version API: {{apiVersion}}"
\ No newline at end of file
+msgstr "fonctionnant sur la version API: {{apiVersion}}"
+
+msgid "Add an attribute"
+msgstr "Ajouter un attribut"
+
+msgid "Attribute name"
+msgstr "Nom d'attribut"
+
+msgid "Value Type"
+msgstr "Type de valeur"
+
+msgid "Text"
+msgstr "Texte"
+
+msgid "Number"
+msgstr "Nombre"
+
+msgid "Save"
+msgstr "Sauvegarder"