From 3c03995a796b6c76f0197a5c712d7589d7f607c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Sep 2024 23:41:31 +0000
Subject: [PATCH 01/16] Bump dset from 3.1.3 to 3.1.4 in /frontend

Bumps [dset](https://github.com/lukeed/dset) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/lukeed/dset/releases)
- [Commits](https://github.com/lukeed/dset/compare/v3.1.3...v3.1.4)

---
updated-dependencies:
- dependency-name: dset
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 frontend/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 118293b739..1a1c91b48a 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -4952,9 +4952,9 @@ dotenv@^16.0.0:
   integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
 
 dset@^3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.3.tgz#c194147f159841148e8e34ca41f638556d9542d2"
-  integrity sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.4.tgz#f8eaf5f023f068a036d08cd07dc9ffb7d0065248"
+  integrity sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"

From 4efa5f27d3ce0d95cac3a14534428cbf915a9917 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 22:14:04 +0000
Subject: [PATCH 02/16] Bump vite from 5.2.10 to 5.2.14 in /frontend

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.2.10 to 5.2.14.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.2.14/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.2.14/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 frontend/package.json | 2 +-
 frontend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index e76f5b9665..77ef7dba48 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -77,7 +77,7 @@
     "styled-components": "^6.1.8",
     "ts-node": "^10.9.2",
     "use-deep-compare-effect": "^1.8.1",
-    "vite": "^5.0.8",
+    "vite": "^5.2.14",
     "vite-tsconfig-paths": "^4.3.1",
     "waait": "^1.0.5",
     "yup": "^1.3.3"
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 118293b739..e43fe81754 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -10460,10 +10460,10 @@ vite-tsconfig-paths@^4.3.1:
     globrex "^0.1.2"
     tsconfck "^3.0.3"
 
-vite@^5.0.8:
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.10.tgz#2ac927c91e99d51b376a5c73c0e4b059705f5bd7"
-  integrity sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==
+vite@^5.2.14:
+  version "5.2.14"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.14.tgz#fd5f60facf6b5f90ec7da6323c467a365d380c3d"
+  integrity sha512-TFQLuwWLPms+NBNlh0D9LZQ+HXW471COABxw/9TEUBrjuHMo9BrYBPrN/SYAwIuVL+rLerycxiLT41t4f5MZpA==
   dependencies:
     esbuild "^0.20.1"
     postcss "^8.4.38"

From 990417350af4e1af34f7ffd1174c58fd71ae1cf3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 00:39:17 +0000
Subject: [PATCH 03/16] Bump rollup from 4.16.4 to 4.22.4 in /src/frontend

Bumps [rollup](https://github.com/rollup/rollup) from 4.16.4 to 4.22.4.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.16.4...v4.22.4)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/frontend/yarn.lock | 196 ++++++++++++++++++++---------------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/src/frontend/yarn.lock b/src/frontend/yarn.lock
index 118293b739..3ceaf4bf0f 100644
--- a/src/frontend/yarn.lock
+++ b/src/frontend/yarn.lock
@@ -2601,85 +2601,85 @@
   resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.5.tgz#b77571685410217a548a9c753aa3cdfc215bfc78"
   integrity sha512-l3YHBLAol6d/IKnB9LhpD0cEZWAoe3eFKUyTYWmFmCO2Q/WOckxLQAUyMZWwZV2M/m3+4vgRoaolFqaII82/TA==
 
-"@rollup/rollup-android-arm-eabi@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.4.tgz#5e8930291f1e5ead7fb1171d53ba5c87718de062"
-  integrity sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==
-
-"@rollup/rollup-android-arm64@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.4.tgz#ffb84f1359c04ec8a022a97110e18a5600f5f638"
-  integrity sha512-Bvm6D+NPbGMQOcxvS1zUl8H7DWlywSXsphAeOnVeiZLQ+0J6Is8T7SrjGTH29KtYkiY9vld8ZnpV3G2EPbom+w==
-
-"@rollup/rollup-darwin-arm64@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.4.tgz#b2fcee8d4806a0b1b9185ac038cc428ddedce9f4"
-  integrity sha512-i5d64MlnYBO9EkCOGe5vPR/EeDwjnKOGGdd7zKFhU5y8haKhQZTN2DgVtpODDMxUr4t2K90wTUJg7ilgND6bXw==
-
-"@rollup/rollup-darwin-x64@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.4.tgz#fcb25ccbaa3dd33a6490e9d1c64bab2e0e16b932"
-  integrity sha512-WZupV1+CdUYehaZqjaFTClJI72fjJEgTXdf4NbW69I9XyvdmztUExBtcI2yIIU6hJtYvtwS6pkTkHJz+k08mAQ==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.4.tgz#40d46bdfe667e5eca31bf40047460e326d2e26bb"
-  integrity sha512-ADm/xt86JUnmAfA9mBqFcRp//RVRt1ohGOYF6yL+IFCYqOBNwy5lbEK05xTsEoJq+/tJzg8ICUtS82WinJRuIw==
-
-"@rollup/rollup-linux-arm-musleabihf@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.4.tgz#7741df2448c11c56588b50835dbfe91b1a10b375"
-  integrity sha512-tJfJaXPiFAG+Jn3cutp7mCs1ePltuAgRqdDZrzb1aeE3TktWWJ+g7xK9SNlaSUFw6IU4QgOxAY4rA+wZUT5Wfg==
-
-"@rollup/rollup-linux-arm64-gnu@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.4.tgz#0a23b02d2933e4c4872ad18d879890b6a4a295df"
-  integrity sha512-7dy1BzQkgYlUTapDTvK997cgi0Orh5Iu7JlZVBy1MBURk7/HSbHkzRnXZa19ozy+wwD8/SlpJnOOckuNZtJR9w==
-
-"@rollup/rollup-linux-arm64-musl@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.4.tgz#e37ef259358aa886cc07d782220a4fb83c1e6970"
-  integrity sha512-zsFwdUw5XLD1gQe0aoU2HVceI6NEW7q7m05wA46eUAyrkeNYExObfRFQcvA6zw8lfRc5BHtan3tBpo+kqEOxmg==
-
-"@rollup/rollup-linux-powerpc64le-gnu@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.4.tgz#8c69218b6de05ee2ba211664a2d2ac1e54e43f94"
-  integrity sha512-p8C3NnxXooRdNrdv6dBmRTddEapfESEUflpICDNKXpHvTjRRq1J82CbU5G3XfebIZyI3B0s074JHMWD36qOW6w==
-
-"@rollup/rollup-linux-riscv64-gnu@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.4.tgz#d32727dab8f538d9a4a7c03bcf58c436aecd0139"
-  integrity sha512-Lh/8ckoar4s4Id2foY7jNgitTOUQczwMWNYi+Mjt0eQ9LKhr6sK477REqQkmy8YHY3Ca3A2JJVdXnfb3Rrwkng==
-
-"@rollup/rollup-linux-s390x-gnu@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.4.tgz#d46097246a187d99fc9451fe8393b7155b47c5ec"
-  integrity sha512-1xwwn9ZCQYuqGmulGsTZoKrrn0z2fAur2ujE60QgyDpHmBbXbxLaQiEvzJWDrscRq43c8DnuHx3QorhMTZgisQ==
-
-"@rollup/rollup-linux-x64-gnu@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.4.tgz#6356c5a03a4afb1c3057490fc51b4764e109dbc7"
-  integrity sha512-LuOGGKAJ7dfRtxVnO1i3qWc6N9sh0Em/8aZ3CezixSTM+E9Oq3OvTsvC4sm6wWjzpsIlOCnZjdluINKESflJLA==
-
-"@rollup/rollup-linux-x64-musl@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.4.tgz#03a5831a9c0d05877b94653b5ddd3020d3c6fb06"
-  integrity sha512-ch86i7KkJKkLybDP2AtySFTRi5fM3KXp0PnHocHuJMdZwu7BuyIKi35BE9guMlmTpwwBTB3ljHj9IQXnTCD0vA==
-
-"@rollup/rollup-win32-arm64-msvc@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.4.tgz#6cc0db57750376b9303bdb6f5482af8974fcae35"
-  integrity sha512-Ma4PwyLfOWZWayfEsNQzTDBVW8PZ6TUUN1uFTBQbF2Chv/+sjenE86lpiEwj2FiviSmSZ4Ap4MaAfl1ciF4aSA==
-
-"@rollup/rollup-win32-ia32-msvc@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.4.tgz#aea0b7e492bd9ed46971cb80bc34f1eb14e07789"
-  integrity sha512-9m/ZDrQsdo/c06uOlP3W9G2ENRVzgzbSXmXHT4hwVaDQhYcRpi9bgBT0FTG9OhESxwK0WjQxYOSfv40cU+T69w==
-
-"@rollup/rollup-win32-x64-msvc@4.16.4":
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.4.tgz#c09ad9a132ccb5a67c4f211d909323ab1294f95f"
-  integrity sha512-YunpoOAyGLDseanENHmbFvQSfVL5BxW3k7hhy0eN4rb3gS/ct75dVD0EXOWIqFT/nE8XYW6LP6vz6ctKRi0k9A==
+"@rollup/rollup-android-arm-eabi@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz#8b613b9725e8f9479d142970b106b6ae878610d5"
+  integrity sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==
+
+"@rollup/rollup-android-arm64@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz#654ca1049189132ff602bfcf8df14c18da1f15fb"
+  integrity sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==
+
+"@rollup/rollup-darwin-arm64@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz#6d241d099d1518ef0c2205d96b3fa52e0fe1954b"
+  integrity sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==
+
+"@rollup/rollup-darwin-x64@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz#42bd19d292a57ee11734c980c4650de26b457791"
+  integrity sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz#f23555ee3d8fe941c5c5fd458cd22b65eb1c2232"
+  integrity sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==
+
+"@rollup/rollup-linux-arm-musleabihf@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz#f3bbd1ae2420f5539d40ac1fde2b38da67779baa"
+  integrity sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==
+
+"@rollup/rollup-linux-arm64-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz#7abe900120113e08a1f90afb84c7c28774054d15"
+  integrity sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==
+
+"@rollup/rollup-linux-arm64-musl@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz#9e655285c8175cd44f57d6a1e8e5dedfbba1d820"
+  integrity sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz#9a79ae6c9e9d8fe83d49e2712ecf4302db5bef5e"
+  integrity sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==
+
+"@rollup/rollup-linux-riscv64-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz#67ac70eca4ace8e2942fabca95164e8874ab8128"
+  integrity sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==
+
+"@rollup/rollup-linux-s390x-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz#9f883a7440f51a22ed7f99e1d070bd84ea5005fc"
+  integrity sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==
+
+"@rollup/rollup-linux-x64-gnu@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz#70116ae6c577fe367f58559e2cffb5641a1dd9d0"
+  integrity sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==
+
+"@rollup/rollup-linux-x64-musl@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz#f473f88219feb07b0b98b53a7923be716d1d182f"
+  integrity sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==
+
+"@rollup/rollup-win32-arm64-msvc@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz#4349482d17f5d1c58604d1c8900540d676f420e0"
+  integrity sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==
+
+"@rollup/rollup-win32-ia32-msvc@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz#a6fc39a15db618040ec3c2a24c1e26cb5f4d7422"
+  integrity sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==
+
+"@rollup/rollup-win32-x64-msvc@4.22.4":
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz#3dd5d53e900df2a40841882c02e56f866c04d202"
+  integrity sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==
 
 "@sentry-internal/feedback@7.112.1":
   version "7.112.1"
@@ -9141,28 +9141,28 @@ rimraf@^3.0.2:
     glob "^7.1.3"
 
 rollup@^4.13.0:
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.16.4.tgz#fe328eb41293f20c9593a095ec23bdc4b5d93317"
-  integrity sha512-kuaTJSUbz+Wsb2ATGvEknkI12XV40vIiHmLuFlejoo7HtDok/O5eDDD0UpCVY5bBX5U5RYo8wWP83H7ZsqVEnA==
+  version "4.22.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.22.4.tgz#4135a6446671cd2a2453e1ad42a45d5973ec3a0f"
+  integrity sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==
   dependencies:
     "@types/estree" "1.0.5"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.16.4"
-    "@rollup/rollup-android-arm64" "4.16.4"
-    "@rollup/rollup-darwin-arm64" "4.16.4"
-    "@rollup/rollup-darwin-x64" "4.16.4"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.16.4"
-    "@rollup/rollup-linux-arm-musleabihf" "4.16.4"
-    "@rollup/rollup-linux-arm64-gnu" "4.16.4"
-    "@rollup/rollup-linux-arm64-musl" "4.16.4"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.16.4"
-    "@rollup/rollup-linux-riscv64-gnu" "4.16.4"
-    "@rollup/rollup-linux-s390x-gnu" "4.16.4"
-    "@rollup/rollup-linux-x64-gnu" "4.16.4"
-    "@rollup/rollup-linux-x64-musl" "4.16.4"
-    "@rollup/rollup-win32-arm64-msvc" "4.16.4"
-    "@rollup/rollup-win32-ia32-msvc" "4.16.4"
-    "@rollup/rollup-win32-x64-msvc" "4.16.4"
+    "@rollup/rollup-android-arm-eabi" "4.22.4"
+    "@rollup/rollup-android-arm64" "4.22.4"
+    "@rollup/rollup-darwin-arm64" "4.22.4"
+    "@rollup/rollup-darwin-x64" "4.22.4"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.22.4"
+    "@rollup/rollup-linux-arm-musleabihf" "4.22.4"
+    "@rollup/rollup-linux-arm64-gnu" "4.22.4"
+    "@rollup/rollup-linux-arm64-musl" "4.22.4"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.22.4"
+    "@rollup/rollup-linux-riscv64-gnu" "4.22.4"
+    "@rollup/rollup-linux-s390x-gnu" "4.22.4"
+    "@rollup/rollup-linux-x64-gnu" "4.22.4"
+    "@rollup/rollup-linux-x64-musl" "4.22.4"
+    "@rollup/rollup-win32-arm64-msvc" "4.22.4"
+    "@rollup/rollup-win32-ia32-msvc" "4.22.4"
+    "@rollup/rollup-win32-x64-msvc" "4.22.4"
     fsevents "~2.3.2"
 
 rsvp@^4.8.4:

From a80d5b1127bc5f5ca2d7ba5a440ce1af95ac416c Mon Sep 17 00:00:00 2001
From: Maciej Szewczyk <maciej.szewczyk@tivix.com>
Date: Wed, 2 Oct 2024 11:40:21 +0200
Subject: [PATCH 04/16] add new column in payments table

---
 .../ProgramDetails/ProgramDetails.tsx         | 22 +++++++----------
 .../PaymentsTable/PaymentsTableHeadCells.tsx  |  7 ++++++
 .../PaymentsTable/PaymentsTableRow.tsx        | 24 ++++++++++++-------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/frontend/src/components/programs/ProgramDetails/ProgramDetails.tsx b/src/frontend/src/components/programs/ProgramDetails/ProgramDetails.tsx
index 257ffae326..9838ed3699 100644
--- a/src/frontend/src/components/programs/ProgramDetails/ProgramDetails.tsx
+++ b/src/frontend/src/components/programs/ProgramDetails/ProgramDetails.tsx
@@ -1,22 +1,18 @@
-import { Box, Grid, Typography } from '@mui/material';
-import * as React from 'react';
-import { useTranslation } from 'react-i18next';
-import styled from 'styled-components';
-import {
-  ProgrammeChoiceDataQuery,
-  ProgramPartnerAccess,
-  ProgramQuery,
-} from '@generated/graphql';
-import { MiśTheme } from '../../../theme';
-import { choicesToDict, programStatusToColor } from '@utils/utils';
+import { PartnerAccess } from '@components/programs/constants';
 import { ContainerColumnWithBorder } from '@core/ContainerColumnWithBorder';
+import { DividerLine } from '@core/DividerLine';
 import { LabelizedField } from '@core/LabelizedField';
 import { OverviewContainer } from '@core/OverviewContainer';
 import { StatusBox } from '@core/StatusBox';
 import { Title } from '@core/Title';
 import { UniversalMoment } from '@core/UniversalMoment';
-import { PartnerAccess } from '@components/programs/constants';
-import { DividerLine } from '@core/DividerLine';
+import { ProgrammeChoiceDataQuery, ProgramQuery } from '@generated/graphql';
+import { Box, Grid, Typography } from '@mui/material';
+import { choicesToDict, programStatusToColor } from '@utils/utils';
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+import { MiśTheme } from '../../../theme';
 
 const NumberOfHouseHolds = styled.div`
   padding: ${({ theme }) => theme.spacing(8)};
diff --git a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableHeadCells.tsx b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableHeadCells.tsx
index a17c8109f3..4392c0f583 100644
--- a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableHeadCells.tsx
+++ b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableHeadCells.tsx
@@ -59,6 +59,13 @@ export const headCells: HeadCell<
     id: 'delivered_quantity',
     numeric: false,
   },
+  {
+    disablePadding: false,
+    label: 'Status',
+    id: 'status',
+    numeric: false,
+    disableSort: true,
+  },
   {
     disablePadding: false,
     label: 'FSP Auth Code',
diff --git a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableRow.tsx b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableRow.tsx
index c22b0dc410..b4b93311fa 100644
--- a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableRow.tsx
+++ b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableRow.tsx
@@ -80,16 +80,10 @@ export function PaymentsTableRow({
   };
 
   const renderDeliveredQuantity = (): React.ReactElement => {
-    const { deliveredQuantity, currency, deliveredQuantityUsd, status } =
-      payment;
-    if (status === PaymentStatus.TransactionErroneous) {
-      return <RoutedBox>UNSUCCESSFUL</RoutedBox>;
-    }
-    if (status === PaymentStatus.ManuallyCancelled) {
-      return <RoutedBox>CANCELLED</RoutedBox>;
-    }
+    const { deliveredQuantity, currency, deliveredQuantityUsd } = payment;
+
     if (deliveredQuantity === null) {
-      return <></>;
+      return <>-</>;
     }
     return (
       <>
@@ -99,6 +93,17 @@ export function PaymentsTableRow({
     );
   };
 
+  const renderPaymentStatusBox = (): React.ReactElement => {
+    const { status } = payment;
+    if (status === PaymentStatus.TransactionErroneous) {
+      return <RoutedBox>UNSUCCESSFUL</RoutedBox>;
+    }
+    if (status === PaymentStatus.ManuallyCancelled) {
+      return <RoutedBox>CANCELLED</RoutedBox>;
+    }
+    return <></>;
+  };
+
   const renderMark = (): React.ReactElement => {
     const { deliveredQuantity, entitlementQuantity } = payment;
 
@@ -176,6 +181,7 @@ export function PaymentsTableRow({
       <TableCell data-cy="delivered-quantity-cell" align="left">
         {renderDeliveredQuantity()}
       </TableCell>
+      <TableCell>{renderPaymentStatusBox()}</TableCell>
       {hasPermissions(PERMISSIONS.PM_VIEW_FSP_AUTH_CODE, permissions) && (
         <TableCell data-cy="fsp-auth-code-cell" align="left">
           {payment.fspAuthCode || '-'}

From 49816709e92fc27ef6082ea535754d5348d0c55f Mon Sep 17 00:00:00 2001
From: Maciej Szewczyk <maciej.szewczyk@tivix.com>
Date: Wed, 2 Oct 2024 12:44:29 +0200
Subject: [PATCH 05/16] update snap

---
 .../ProgramDetails.test.tsx.snap              |  64 ++++-----
 .../__snapshots__/PaymentsTable.test.tsx.snap | 122 ++++++++++++------
 2 files changed, 114 insertions(+), 72 deletions(-)

diff --git a/src/frontend/src/components/programs/ProgramDetails/__snapshots__/ProgramDetails.test.tsx.snap b/src/frontend/src/components/programs/ProgramDetails/__snapshots__/ProgramDetails.test.tsx.snap
index ac82cf4a5d..b9a8318d22 100644
--- a/src/frontend/src/components/programs/ProgramDetails/__snapshots__/ProgramDetails.test.tsx.snap
+++ b/src/frontend/src/components/programs/ProgramDetails/__snapshots__/ProgramDetails.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`components/ProgramDetails should render 1`] = `
     class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 sc-beySPh fvkwGO css-1ps6pg7-MuiPaper-root"
   >
     <div
-      class="sc-gLLuof bNTvKV"
+      class="sc-fsYfdN hnQuqu"
     >
       <h6
         class="MuiTypography-root MuiTypography-h6 css-1j53xw6-MuiTypography-root"
@@ -15,7 +15,7 @@ exports[`components/ProgramDetails should render 1`] = `
       </h6>
     </div>
     <div
-      class="sc-hLQSwg ehkTgD"
+      class="sc-jTQCzO GcLEc"
     >
       <div
         class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-6 css-zow5z4-MuiGrid-root"
@@ -25,7 +25,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               status
@@ -34,14 +34,14 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="label-status"
             >
               <span
-                class="sc-dmyCSP bGPBYf"
+                class="sc-eDLKkx gpSOvu"
                 color="textSecondary"
               >
                 <div
-                  class="sc-eDLKkx deAQag"
+                  class="sc-gLLuof PuEQG"
                 >
                   <div
-                    class="sc-jTQCzO cQZnmW status-box-container"
+                    class="sc-iBdnpw jiYZmp status-box-container"
                     data-cy="status-container"
                   >
                     FINISHED
@@ -56,7 +56,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               START DATE
@@ -65,7 +65,7 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="label-START DATE"
             >
               <span
-                class="sc-dmyCSP bGPBYf"
+                class="sc-eDLKkx gpSOvu"
                 color="textSecondary"
               >
                 <time
@@ -82,7 +82,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               END DATE
@@ -91,7 +91,7 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="label-END DATE"
             >
               <span
-                class="sc-dmyCSP bGPBYf"
+                class="sc-eDLKkx gpSOvu"
                 color="textSecondary"
               >
                 <time
@@ -108,7 +108,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               Programme Code
@@ -125,7 +125,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               Sector
@@ -134,7 +134,7 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="label-Sector"
             >
               <span
-                class="sc-dmyCSP bGPBYf"
+                class="sc-eDLKkx gpSOvu"
                 color="textSecondary"
               >
                 Child Protection
@@ -147,7 +147,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               Data Collecting Type
@@ -164,7 +164,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               Frequency of Payment
@@ -173,7 +173,7 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="label-Frequency of Payment"
             >
               <span
-                class="sc-dmyCSP bGPBYf"
+                class="sc-eDLKkx gpSOvu"
                 color="textSecondary"
               >
                 Regular
@@ -186,7 +186,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               Administrative Areas of implementation
@@ -195,7 +195,7 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="label-Administrative Areas of implementation"
             >
               <span
-                class="sc-dmyCSP bGPBYf"
+                class="sc-eDLKkx gpSOvu"
                 color="textSecondary"
               >
                 Crime book.
@@ -208,7 +208,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               Description
@@ -217,7 +217,7 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="label-Description"
             >
               <span
-                class="sc-dmyCSP bGPBYf"
+                class="sc-eDLKkx gpSOvu"
                 color="textSecondary"
               >
                 Yeah worry might newspaper drive her many.
@@ -230,7 +230,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               CASH+
@@ -239,7 +239,7 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="label-CASH+"
             >
               <span
-                class="sc-dmyCSP bGPBYf"
+                class="sc-eDLKkx gpSOvu"
                 color="textSecondary"
               >
                 No
@@ -252,7 +252,7 @@ exports[`components/ProgramDetails should render 1`] = `
         >
           <div>
             <span
-              class="sc-guDLey RwNuC"
+              class="sc-hLQSwg hqLXmS"
               color="textSecondary"
             >
               Partner Access
@@ -261,7 +261,7 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="label-Partner Access"
             >
               <span
-                class="sc-dmyCSP bGPBYf"
+                class="sc-eDLKkx gpSOvu"
                 color="textSecondary"
               >
                 Only Selected Partners within the business area
@@ -275,7 +275,7 @@ exports[`components/ProgramDetails should render 1`] = `
       >
         <div>
           <span
-            class="sc-guDLey RwNuC"
+            class="sc-hLQSwg hqLXmS"
             color="textSecondary"
           >
             Programme size
@@ -284,7 +284,7 @@ exports[`components/ProgramDetails should render 1`] = `
             data-cy="label-Programme size"
           >
             <span
-              class="sc-dmyCSP bGPBYf"
+              class="sc-eDLKkx gpSOvu"
               color="textSecondary"
             >
               <div
@@ -298,14 +298,14 @@ exports[`components/ProgramDetails should render 1`] = `
       </div>
     </div>
     <div
-      class="sc-iBdnpw fHCMfN"
+      class="sc-guDLey cGgsPx"
     >
       <div
-        class="sc-fsYfdN fnzeIa"
+        class="sc-dmyCSP hqweMa"
       />
     </div>
     <div
-      class="sc-gLLuof bNTvKV"
+      class="sc-fsYfdN hnQuqu"
     >
       <h6
         class="MuiTypography-root MuiTypography-h6 css-1j53xw6-MuiTypography-root"
@@ -314,7 +314,7 @@ exports[`components/ProgramDetails should render 1`] = `
       </h6>
     </div>
     <div
-      class="sc-hLQSwg ehkTgD"
+      class="sc-jTQCzO GcLEc"
     >
       <div
         class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-6 css-zow5z4-MuiGrid-root"
@@ -333,7 +333,7 @@ exports[`components/ProgramDetails should render 1`] = `
               data-cy="labelized-field-container-area-access-field"
             >
               <span
-                class="sc-guDLey RwNuC"
+                class="sc-hLQSwg hqLXmS"
                 color="textSecondary"
               >
                 Area Access
@@ -342,7 +342,7 @@ exports[`components/ProgramDetails should render 1`] = `
                 data-cy="label-Area Access"
               >
                 <span
-                  class="sc-dmyCSP bGPBYf"
+                  class="sc-eDLKkx gpSOvu"
                   color="textSecondary"
                 >
                   Business Area
diff --git a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/__snapshots__/PaymentsTable.test.tsx.snap b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/__snapshots__/PaymentsTable.test.tsx.snap
index fff4879a39..28d3b823c4 100644
--- a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/__snapshots__/PaymentsTable.test.tsx.snap
+++ b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/__snapshots__/PaymentsTable.test.tsx.snap
@@ -255,6 +255,17 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                     </svg>
                   </span>
                 </th>
+                <th
+                  class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ygcj2i-MuiTableCell-root"
+                  scope="col"
+                >
+                  <span
+                    class="sc-brSamD gfntwv"
+                    data-cy="table-label"
+                  >
+                    Status
+                  </span>
+                </th>
                 <th
                   class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ygcj2i-MuiTableCell-root"
                   scope="col"
@@ -289,8 +300,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -303,8 +314,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -317,8 +328,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -331,8 +342,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -345,8 +356,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -359,8 +370,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -373,8 +384,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -387,8 +398,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -401,8 +412,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -455,6 +466,11 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                   data-cy="delivered-quantity-cell"
+                >
+                  -
+                </td>
+                <td
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                 />
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
@@ -511,6 +527,11 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                   data-cy="delivered-quantity-cell"
+                >
+                  -
+                </td>
+                <td
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                 />
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
@@ -527,8 +548,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 style="height: 70px;"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 />
               </tr>
             </tbody>
@@ -894,6 +915,17 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                     </svg>
                   </span>
                 </th>
+                <th
+                  class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ygcj2i-MuiTableCell-root"
+                  scope="col"
+                >
+                  <span
+                    class="sc-brSamD gfntwv"
+                    data-cy="table-label"
+                  >
+                    Status
+                  </span>
+                </th>
                 <th
                   class="MuiTableCell-root MuiTableCell-head MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ygcj2i-MuiTableCell-root"
                   scope="col"
@@ -928,8 +960,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -942,8 +974,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -956,8 +988,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -970,8 +1002,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -984,8 +1016,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -998,8 +1030,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -1012,8 +1044,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -1026,8 +1058,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -1040,8 +1072,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 data-cy="table-row"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 >
                   <span
                     class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse css-153n0d3-MuiSkeleton-root"
@@ -1094,6 +1126,11 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                   data-cy="delivered-quantity-cell"
+                >
+                  -
+                </td>
+                <td
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                 />
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
@@ -1150,6 +1187,11 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                   data-cy="delivered-quantity-cell"
+                >
+                  -
+                </td>
+                <td
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                 />
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
@@ -1166,8 +1208,8 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 style="height: 70px;"
               >
                 <td
-                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr eIzMdV css-1ex1afd-MuiTableCell-root"
-                  colspan="11"
+                  class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium sc-blmEgr iYOZVm css-1ex1afd-MuiTableCell-root"
+                  colspan="12"
                 />
               </tr>
             </tbody>

From 80058fa8ecbf00d366d6fcee19812ad4c9c214c5 Mon Sep 17 00:00:00 2001
From: Maciej Szewczyk <maciej.szewczyk@tivix.com>
Date: Wed, 2 Oct 2024 13:51:19 +0200
Subject: [PATCH 06/16] display status box

---
 .../PaymentsTable/PaymentsTableRow.tsx        | 48 ++++------------
 .../__snapshots__/PaymentsTable.test.tsx.snap | 56 +++++++++++++++++--
 2 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableRow.tsx b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableRow.tsx
index b4b93311fa..394547cca6 100644
--- a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableRow.tsx
+++ b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/PaymentsTableRow.tsx
@@ -9,35 +9,14 @@ import { ClickableTableRow } from '@components/core/Table/ClickableTableRow';
 import { WarningTooltip } from '@components/core/WarningTooltip';
 import {
   formatCurrencyWithSymbol,
-  opacityToHex,
+  paymentStatusDisplayMap,
+  paymentStatusToColor,
   renderSomethingOrDash,
 } from '@utils/utils';
-import { AllPaymentsForTableQuery, PaymentStatus } from '@generated/graphql';
+import { AllPaymentsForTableQuery } from '@generated/graphql';
 import { useBaseUrl } from '@hooks/useBaseUrl';
 import { hasPermissions, PERMISSIONS } from '../../../../config/permissions';
-
-export const StyledLink = styled.div`
-  color: #000;
-  text-decoration: underline;
-  cursor: pointer;
-  display: flex;
-  align-content: center;
-`;
-
-const RoutedBox = styled.div`
-  color: ${({ theme }) => theme.hctPalette.red};
-  background-color: ${({ theme }) =>
-    `${theme.hctPalette.red}${opacityToHex(0.15)}`};
-  border-radius: 16px;
-  font-family: Roboto;
-  font-size: 10px;
-  font-weight: 500;
-  letter-spacing: 1.2px;
-  line-height: 16px;
-  padding: ${({ theme }) => theme.spacing(1)};
-  text-align: center;
-  margin-right: 20px;
-`;
+import { StatusBox } from '@components/core/StatusBox';
 
 const OrangeError = styled(ErrorOutlineRoundedIcon)`
   color: ${({ theme }) => theme.hctPalette.orange};
@@ -93,17 +72,6 @@ export function PaymentsTableRow({
     );
   };
 
-  const renderPaymentStatusBox = (): React.ReactElement => {
-    const { status } = payment;
-    if (status === PaymentStatus.TransactionErroneous) {
-      return <RoutedBox>UNSUCCESSFUL</RoutedBox>;
-    }
-    if (status === PaymentStatus.ManuallyCancelled) {
-      return <RoutedBox>CANCELLED</RoutedBox>;
-    }
-    return <></>;
-  };
-
   const renderMark = (): React.ReactElement => {
     const { deliveredQuantity, entitlementQuantity } = payment;
 
@@ -181,7 +149,13 @@ export function PaymentsTableRow({
       <TableCell data-cy="delivered-quantity-cell" align="left">
         {renderDeliveredQuantity()}
       </TableCell>
-      <TableCell>{renderPaymentStatusBox()}</TableCell>
+      <TableCell>
+        <StatusBox
+          status={payment.status}
+          statusToColor={paymentStatusToColor}
+          statusNameMapping={paymentStatusDisplayMap}
+        />
+      </TableCell>
       {hasPermissions(PERMISSIONS.PM_VIEW_FSP_AUTH_CODE, permissions) && (
         <TableCell data-cy="fsp-auth-code-cell" align="left">
           {payment.fspAuthCode || '-'}
diff --git a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/__snapshots__/PaymentsTable.test.tsx.snap b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/__snapshots__/PaymentsTable.test.tsx.snap
index 28d3b823c4..17be88292b 100644
--- a/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/__snapshots__/PaymentsTable.test.tsx.snap
+++ b/src/frontend/src/containers/tables/paymentmodule/PaymentsTable/__snapshots__/PaymentsTable.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
       class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 css-1ps6pg7-MuiPaper-root"
     >
       <div
-        class="sc-iCKXBC iyaLVj MuiBox-root css-u331zs"
+        class="sc-cbDaos fmVUtP MuiBox-root css-u331zs"
       >
         <h6
           class="MuiTypography-root MuiTypography-h6 css-1j53xw6-MuiTypography-root"
@@ -471,7 +471,18 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 </td>
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
-                />
+                >
+                  <div
+                    class="sc-gjLLEI cQdyAk"
+                  >
+                    <div
+                      class="sc-eAKtBH lfKnlm status-box-container"
+                      data-cy="status-container"
+                    >
+                      PENDING
+                    </div>
+                  </div>
+                </td>
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                   data-cy="fsp-auth-code-cell"
@@ -532,7 +543,18 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render loading 1`]
                 </td>
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
-                />
+                >
+                  <div
+                    class="sc-gjLLEI cQdyAk"
+                  >
+                    <div
+                      class="sc-eAKtBH lfKnlm status-box-container"
+                      data-cy="status-container"
+                    >
+                      PENDING
+                    </div>
+                  </div>
+                </td>
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                   data-cy="fsp-auth-code-cell"
@@ -669,7 +691,7 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
       class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 css-1ps6pg7-MuiPaper-root"
     >
       <div
-        class="sc-iCKXBC iyaLVj MuiBox-root css-u331zs"
+        class="sc-cbDaos fmVUtP MuiBox-root css-u331zs"
       >
         <h6
           class="MuiTypography-root MuiTypography-h6 css-1j53xw6-MuiTypography-root"
@@ -1131,7 +1153,18 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 </td>
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
-                />
+                >
+                  <div
+                    class="sc-gjLLEI cQdyAk"
+                  >
+                    <div
+                      class="sc-eAKtBH lfKnlm status-box-container"
+                      data-cy="status-container"
+                    >
+                      PENDING
+                    </div>
+                  </div>
+                </td>
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                   data-cy="fsp-auth-code-cell"
@@ -1192,7 +1225,18 @@ exports[`containers/tables/paymentmodule/PaymentsTable should render with data 1
                 </td>
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
-                />
+                >
+                  <div
+                    class="sc-gjLLEI cQdyAk"
+                  >
+                    <div
+                      class="sc-eAKtBH lfKnlm status-box-container"
+                      data-cy="status-container"
+                    >
+                      PENDING
+                    </div>
+                  </div>
+                </td>
                 <td
                   class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignLeft MuiTableCell-sizeMedium css-1ex1afd-MuiTableCell-root"
                   data-cy="fsp-auth-code-cell"

From dcf5c9e29cac69908a9a884fd952e7e05eb8ee14 Mon Sep 17 00:00:00 2001
From: Maciej Szewczyk <maciej.szewczyk@tivix.com>
Date: Fri, 4 Oct 2024 17:19:28 +0200
Subject: [PATCH 07/16] adjust selenium payment plan test

---
 tests/selenium/payment_module/test_payment_plans.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/selenium/payment_module/test_payment_plans.py b/tests/selenium/payment_module/test_payment_plans.py
index 9e3a97e2be..6bdf285915 100644
--- a/tests/selenium/payment_module/test_payment_plans.py
+++ b/tests/selenium/payment_module/test_payment_plans.py
@@ -255,8 +255,9 @@ def test_smoke_details_payment_plan(
         assert "FSP" in pagePaymentModuleDetails.getTableLabel()[6].text
         assert "Entitlement" in pagePaymentModuleDetails.getTableLabel()[7].text
         assert "Delivered Quantity" in pagePaymentModuleDetails.getTableLabel()[8].text
-        assert "FSP Auth Code" in pagePaymentModuleDetails.getTableLabel()[9].text
-        assert "Reconciliation" in pagePaymentModuleDetails.getTableLabel()[10].text
+        assert "Status" in pagePaymentModuleDetails.getTableLabel()[9].text
+        assert "FSP Auth Code" in pagePaymentModuleDetails.getTableLabel()[10].text
+        assert "Reconciliation" in pagePaymentModuleDetails.getTableLabel()[11].text
 
     @pytest.mark.skip(reason="Test fails in CI")
     def test_payment_plan_happy_path(

From d53bfef7c939d5d6fc386916f0886959e76e0e14 Mon Sep 17 00:00:00 2001
From: Paulina Kujawa <p.kujawa2f@gmail.com>
Date: Sun, 6 Oct 2024 22:44:47 +0200
Subject: [PATCH 08/16] change text of xlsx individual update for invalid phone
 no

---
 .../services/individual_xlsx_update.py        |  2 ++
 .../household/test_individual_xlsx_update.py  | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/hct_mis_api/apps/household/services/individual_xlsx_update.py b/src/hct_mis_api/apps/household/services/individual_xlsx_update.py
index 89fdf4c388..e2d6d1d622 100644
--- a/src/hct_mis_api/apps/household/services/individual_xlsx_update.py
+++ b/src/hct_mis_api/apps/household/services/individual_xlsx_update.py
@@ -144,6 +144,8 @@ def _update_single_individual(self, row: Row, individual: Individual) -> Individ
             field.required = False
 
         if not form.is_valid():
+            if "phone_no" in form.errors:
+                form.errors["phone_no"] = [f"Invalid phone number for individual {individual.unicef_id}."]
             raise ValidationError(form.errors)
         # TODO: add 'program_id' arg or None? individual.program_id
         log_create(Individual.ACTIVITY_LOG_MAPPING, "business_area", None, None, old_individual, individual)
diff --git a/tests/unit/apps/household/test_individual_xlsx_update.py b/tests/unit/apps/household/test_individual_xlsx_update.py
index 452cc7faee..cdc9f2561c 100644
--- a/tests/unit/apps/household/test_individual_xlsx_update.py
+++ b/tests/unit/apps/household/test_individual_xlsx_update.py
@@ -3,6 +3,7 @@
 from pathlib import Path
 
 from django.conf import settings
+from django.core.exceptions import ValidationError
 from django.core.files import File
 
 from hct_mis_api.apps.core.base_test_case import APITestCase
@@ -39,6 +40,13 @@ def invalid_file() -> File:
     return File(BytesIO(content), name="invalid_updated_test_file.xlsx")
 
 
+def invalid_phone_no_file() -> File:
+    content = Path(
+        f"{settings.TESTS_ROOT}/apps/household/test_file/invalid_updated_test_file_wrong_phone_no.xlsx"
+    ).read_bytes()
+    return File(BytesIO(content), name="invalid_updated_phone_no_test_file.xlsx")
+
+
 class TestIndividualXlsxUpdate(APITestCase):
     databases = "__all__"
 
@@ -67,6 +75,12 @@ def setUpTestData(cls) -> None:
             xlsx_match_columns=["individual__full_name"],
         )
 
+        cls.xlsx_update_invalid_phone_no_file = XlsxUpdateFile.objects.create(
+            file=invalid_phone_no_file(),
+            business_area=cls.business_area,
+            xlsx_match_columns=["individual__given_name"],
+        )
+
         household_data = {
             "registration_data_import": registration_data_import,
             "business_area": cls.business_area,
@@ -192,3 +206,12 @@ def test_complex_update_individual(self) -> None:
         self.assertEqual(self.individuals[1].birth_date, datetime.date(1965, 8, 6))
         self.assertEqual(self.individuals[2].birth_date, datetime.date(1965, 8, 7))
         self.assertEqual(self.individuals[3].birth_date, datetime.date(1985, 8, 12))
+
+    def test_raise_error_when_invalid_phone_number(self) -> None:
+        with self.assertRaises(ValidationError) as context:
+            IndividualXlsxUpdate(self.xlsx_update_invalid_phone_no_file).update_individuals()
+
+        self.assertEqual(
+            str({"phone_no": [f"Invalid phone number for individual {self.individuals[0]}."]}),
+            str(context.exception)
+        )

From 629a4914da0fe18eff1aaa889895fe9587ca39c9 Mon Sep 17 00:00:00 2001
From: Paulina Kujawa <p.kujawa2f@gmail.com>
Date: Sun, 6 Oct 2024 22:47:10 +0200
Subject: [PATCH 09/16] include file

---
 ...invalid_updated_test_file_wrong_phone_no.xlsx | Bin 0 -> 5706 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/unit/apps/household/test_file/invalid_updated_test_file_wrong_phone_no.xlsx

diff --git a/tests/unit/apps/household/test_file/invalid_updated_test_file_wrong_phone_no.xlsx b/tests/unit/apps/household/test_file/invalid_updated_test_file_wrong_phone_no.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c4658974b9cd525740400157482ee822e2cf1138
GIT binary patch
literal 5706
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
K)l>fG?*9OB!<U5s

literal 0
HcmV?d00001


From 8840882e6016d1e9967e14f28e68102c47cf139f Mon Sep 17 00:00:00 2001
From: Paulina Kujawa <p.kujawa2f@gmail.com>
Date: Mon, 7 Oct 2024 00:18:28 +0200
Subject: [PATCH 10/16] linter

---
 tests/unit/apps/household/test_individual_xlsx_update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/apps/household/test_individual_xlsx_update.py b/tests/unit/apps/household/test_individual_xlsx_update.py
index cdc9f2561c..be12933fab 100644
--- a/tests/unit/apps/household/test_individual_xlsx_update.py
+++ b/tests/unit/apps/household/test_individual_xlsx_update.py
@@ -213,5 +213,5 @@ def test_raise_error_when_invalid_phone_number(self) -> None:
 
         self.assertEqual(
             str({"phone_no": [f"Invalid phone number for individual {self.individuals[0]}."]}),
-            str(context.exception)
+            str(context.exception),
         )

From fc7943c261a43447f6baac0ae52017e9141908a5 Mon Sep 17 00:00:00 2001
From: Paulina Kujawa <p.kujawa2f@gmail.com>
Date: Mon, 7 Oct 2024 16:22:33 +0200
Subject: [PATCH 11/16] add index on document number

---
 .../household/migrations/0186_migration.py    | 31 +++++++++++++++++++
 src/hct_mis_api/apps/household/models.py      |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 src/hct_mis_api/apps/household/migrations/0186_migration.py

diff --git a/src/hct_mis_api/apps/household/migrations/0186_migration.py b/src/hct_mis_api/apps/household/migrations/0186_migration.py
new file mode 100644
index 0000000000..9bacf5a816
--- /dev/null
+++ b/src/hct_mis_api/apps/household/migrations/0186_migration.py
@@ -0,0 +1,31 @@
+# Generated by Django 3.2.25 on 2024-10-07 14:09
+from django.contrib.postgres.operations import AddIndexConcurrently
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    atomic = False
+
+    dependencies = [
+        ('household', '0185_migration'),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.AlterField(
+                    model_name='document',
+                    name='document_number',
+                    field=models.CharField(db_index=True),
+                ),
+            ],
+            database_operations=[
+                AddIndexConcurrently(
+                    model_name="document",
+                    index=models.Index(
+                        fields=["document_number"], name="household_document_number_idx"
+                    )
+                ),
+            ]
+        )
+    ]
diff --git a/src/hct_mis_api/apps/household/models.py b/src/hct_mis_api/apps/household/models.py
index 052e5499ef..7ab8ae8220 100644
--- a/src/hct_mis_api/apps/household/models.py
+++ b/src/hct_mis_api/apps/household/models.py
@@ -716,7 +716,7 @@ class Document(AbstractSyncable, SoftDeletableRepresentationMergeStatusModel, Ti
         (STATUS_INVALID, _("Invalid")),
     )
 
-    document_number = models.CharField(max_length=255, blank=True)
+    document_number = models.CharField(max_length=255, blank=True, db_index=True)
     photo = models.ImageField(blank=True)
     individual = models.ForeignKey("Individual", related_name="documents", on_delete=models.CASCADE)
     type = models.ForeignKey("DocumentType", related_name="documents", on_delete=models.CASCADE)

From 4ad63795f47ab91bcb1f4455d75ea5439cab7566 Mon Sep 17 00:00:00 2001
From: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com>
Date: Mon, 7 Oct 2024 20:11:14 +0200
Subject: [PATCH 12/16] 216761 adapt dedup integration (#4298)

---
 .../apps/registration_datahub/celery_tasks.py |  6 +++-
 .../services/biometric_deduplication.py       | 32 +++++++++++--------
 .../test_biometric_deduplication_service.py   | 16 +++++-----
 .../registration_datahub/test_celery_tasks.py |  3 ++
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/hct_mis_api/apps/registration_datahub/celery_tasks.py b/src/hct_mis_api/apps/registration_datahub/celery_tasks.py
index b79d90a9f7..0860bc02cb 100644
--- a/src/hct_mis_api/apps/registration_datahub/celery_tasks.py
+++ b/src/hct_mis_api/apps/registration_datahub/celery_tasks.py
@@ -505,11 +505,15 @@ def create_grievance_tickets_for_dedup_engine_results(self: Any, rdi_id: str) ->
 @app.task(bind=True, default_retry_delay=60, max_retries=3)
 @log_start_and_end
 @sentry_tags
-def fetch_biometric_deduplication_results_and_process(self: Any, deduplication_set_id: str) -> None:
+def fetch_biometric_deduplication_results_and_process(self: Any, deduplication_set_id: Optional[str]) -> None:
     from hct_mis_api.apps.registration_datahub.services.biometric_deduplication import (
         BiometricDeduplicationService,
     )
 
+    if not deduplication_set_id:
+        logger.error("Program.deduplication_set_id is None")
+        return
+
     program = Program.objects.get(deduplication_set_id=deduplication_set_id)
     set_sentry_business_area_tag(program.business_area.name)
 
diff --git a/src/hct_mis_api/apps/registration_datahub/services/biometric_deduplication.py b/src/hct_mis_api/apps/registration_datahub/services/biometric_deduplication.py
index 19de1dc88f..a21d4ab146 100644
--- a/src/hct_mis_api/apps/registration_datahub/services/biometric_deduplication.py
+++ b/src/hct_mis_api/apps/registration_datahub/services/biometric_deduplication.py
@@ -38,7 +38,7 @@ def create_deduplication_set(self, program: Program) -> None:
             notification_url=f"https://{settings.DOMAIN_NAME}/api/rest/{program.business_area.slug}/programs/{str(program.id)}/registration-data/webhookdeduplication/",
             # notification_url=reverse("registration-data:webhook_deduplication", kwargs={"program_id": str(program.id), "business_area": program.business_area.slug}), # TODO MB why reverse is not working
             config=DeduplicationSetConfig(
-                face_distance_threshold=program.business_area.biometric_deduplication_threshold / 100
+                face_distance_threshold=1 - (program.business_area.biometric_deduplication_threshold / 100)
             ),
         )
         response_data = self.api.create_deduplication_set(deduplication_set)
@@ -186,7 +186,7 @@ def store_rdis_deduplication_statistics(self, deduplication_set_id: str) -> None
         rdis = RegistrationDataImport.objects.filter(
             status=RegistrationDataImport.IN_REVIEW,
             program=program,
-            deduplication_engine_status=RegistrationDataImport.DEDUP_ENGINE_IN_PROGRESS,
+            deduplication_engine_status=RegistrationDataImport.DEDUP_ENGINE_PROCESSING,
         )
         for rdi in rdis:
             rdi.dedup_engine_batch_duplicates = self.get_duplicate_individuals_for_rdi_against_batch_count(rdi)
@@ -234,18 +234,24 @@ def get_duplicate_individuals_for_rdi_against_batch_count(self, rdi: Registratio
     def get_duplicates_for_merged_rdi_against_population(
         self, rdi: RegistrationDataImport
     ) -> QuerySet[DeduplicationEngineSimilarityPair]:
-        """Used in Grievance tickets creation for merged RDI"""
-        from hct_mis_api.apps.utils.models import MergeStatusModel
+        """Used in Grievance tickets creation for merging RDI"""
+        rdi_pending_individuals = PendingIndividual.objects.filter(is_removed=False, registration_data_import=rdi).only(
+            "id"
+        )
+        other_pending_individuals = PendingIndividual.objects.filter(is_removed=False, program=rdi.program).exclude(
+            id__in=rdi_pending_individuals
+        )
 
-        rdi_individuals = rdi.individuals.filter(is_removed=False).only("id")
-        return DeduplicationEngineSimilarityPair.objects.filter(
-            Q(individual1__in=rdi_individuals) | Q(individual2__in=rdi_individuals),
-            Q(individual1__duplicate=False) & Q(individual2__duplicate=False),
-            Q(individual1__withdrawn=False) & Q(individual2__withdrawn=False),
-            Q(individual1__rdi_merge_status=MergeStatusModel.MERGED)
-            & Q(individual2__rdi_merge_status=MergeStatusModel.MERGED),
-            program=rdi.program,
-        ).distinct()
+        return (
+            DeduplicationEngineSimilarityPair.objects.filter(
+                Q(individual1__in=rdi_pending_individuals) | Q(individual2__in=rdi_pending_individuals),
+                Q(individual1__duplicate=False) & Q(individual2__duplicate=False),
+                Q(individual1__withdrawn=False) & Q(individual2__withdrawn=False),
+                program=rdi.program,
+            )
+            .exclude(Q(individual1__in=other_pending_individuals) | Q(individual2__in=other_pending_individuals))
+            .distinct()
+        )
 
     def get_duplicates_for_rdi_against_population(
         self, rdi: RegistrationDataImport
diff --git a/tests/unit/apps/registration_datahub/test_biometric_deduplication_service.py b/tests/unit/apps/registration_datahub/test_biometric_deduplication_service.py
index 7840c47531..9086a23d74 100644
--- a/tests/unit/apps/registration_datahub/test_biometric_deduplication_service.py
+++ b/tests/unit/apps/registration_datahub/test_biometric_deduplication_service.py
@@ -71,7 +71,7 @@ def test_create_deduplication_set(self, mock_create_deduplication_set: mock.Mock
                 reference_pk=str(self.program.id),
                 notification_url=f"https://{settings.DOMAIN_NAME}/api/rest/{self.program.business_area.slug}/programs/{str(self.program.id)}/registration-data/webhookdeduplication/",
                 config=DeduplicationSetConfig(
-                    face_distance_threshold=self.program.business_area.biometric_deduplication_threshold / 100
+                    face_distance_threshold=1 - (self.program.business_area.biometric_deduplication_threshold / 100)
                 ),
             )
         )
@@ -471,7 +471,7 @@ def test_get_duplicates_for_merged_rdi_against_population(self) -> None:
         ]
         service.store_similarity_pairs(str(self.program.deduplication_set_id), similarity_pairs)
 
-        duplicates = service.get_duplicates_for_merged_rdi_against_population(rdi1)
+        duplicates = service.get_duplicates_for_merged_rdi_against_population(rdi2)
 
         assert len(duplicates) == 3
         assert list(
@@ -479,17 +479,17 @@ def test_get_duplicates_for_merged_rdi_against_population(self) -> None:
         ) == [
             {
                 "individual1": ind1.id,
-                "individual2": ind2.id,
+                "individual2": ind3.id,
                 "similarity_score": Decimal("70.00"),
             },
             {
-                "individual1": ind1.id,
+                "individual1": ind4.id,
                 "individual2": ind5.id,
-                "similarity_score": Decimal("80.00"),
+                "similarity_score": Decimal("70.00"),
             },
             {
-                "individual1": ind2.id,
-                "individual2": ind6.id,
+                "individual1": ind3.id,
+                "individual2": ind4.id,
                 "similarity_score": Decimal("90.00"),
             },
         ]
@@ -637,7 +637,7 @@ def test_store_rdis_deduplication_statistics(self) -> None:
 
         rdi1 = RegistrationDataImportFactory(
             program=self.program,
-            deduplication_engine_status=RegistrationDataImport.DEDUP_ENGINE_IN_PROGRESS,
+            deduplication_engine_status=RegistrationDataImport.DEDUP_ENGINE_PROCESSING,
         )
 
         service.get_duplicate_individuals_for_rdi_against_batch_count = mock.Mock(return_value=8)
diff --git a/tests/unit/apps/registration_datahub/test_celery_tasks.py b/tests/unit/apps/registration_datahub/test_celery_tasks.py
index 53d63bd82f..386b3097bd 100644
--- a/tests/unit/apps/registration_datahub/test_celery_tasks.py
+++ b/tests/unit/apps/registration_datahub/test_celery_tasks.py
@@ -1122,6 +1122,9 @@ def test_fetch_biometric_deduplication_results_and_process(
         self,
         mock_fetch_biometric_deduplication_results_and_process: Mock,
     ) -> None:
+        fetch_biometric_deduplication_results_and_process(None)
+        mock_fetch_biometric_deduplication_results_and_process.assert_not_called()
+
         deduplication_set_id = str(uuid.uuid4())
         self.program.deduplication_set_id = deduplication_set_id
         self.program.save()

From 75144a995823d56696ebd747d116852b4152c816 Mon Sep 17 00:00:00 2001
From: Domenico <dom.dinicola@gmail.com>
Date: Tue, 8 Oct 2024 10:10:36 +0200
Subject: [PATCH 13/16] [Back merge] prod>STG (#4294) (#4296)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [hotfix] 216567 deduplication key error when deduplicating records (#4271)

* 2216567_Deduplication_Key_Error_when_deduplicating_records

* black

* remove distinct

* fix dedup logic, add ut

* lint

---------



* skip trivy failure

* fix document status when copy population (#4291)

---------

Co-authored-by: Pavlo Mokiichuk <pv.pasha.pv@gmail.com>
Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com>
Co-authored-by: marekbiczysko <marek.biczysko@tivix.com>
Co-authored-by: Bartosz Woźniak <17177420+wozniakpl@users.noreply.github.com>
---
 src/hct_mis_api/apps/program/utils.py         |  1 +
 .../registration_datahub/tasks/deduplicate.py | 92 ++++++++++---------
 .../test_handling_documents_duplicates.py     | 75 +++++++++++++--
 ...t_program_population_to_pending_objects.py |  4 +
 4 files changed, 121 insertions(+), 51 deletions(-)

diff --git a/src/hct_mis_api/apps/program/utils.py b/src/hct_mis_api/apps/program/utils.py
index 3db760a013..1dab4ef2a8 100644
--- a/src/hct_mis_api/apps/program/utils.py
+++ b/src/hct_mis_api/apps/program/utils.py
@@ -265,6 +265,7 @@ def copy_document_per_individual(
             document.individual = individual_representation
             document.program_id = individual_representation.program_id
             document.rdi_merge_status = rdi_merge_status
+            document.status = Document.STATUS_PENDING
             documents_list.append(document)
         return documents_list
 
diff --git a/src/hct_mis_api/apps/registration_datahub/tasks/deduplicate.py b/src/hct_mis_api/apps/registration_datahub/tasks/deduplicate.py
index ab66587fb0..9c742bad9d 100644
--- a/src/hct_mis_api/apps/registration_datahub/tasks/deduplicate.py
+++ b/src/hct_mis_api/apps/registration_datahub/tasks/deduplicate.py
@@ -674,20 +674,26 @@ def deduplicate(
                 new_documents.filter(Q(status=Document.STATUS_PENDING) & Q(type__is_identity_document=True) & program_q)
                 .select_related("individual", "type")
                 .select_for_update(of=("self",))  # no need to lock individuals
-                .order_by("pk")
+                .order_by("document_number", "created_at")
             )
-            documents_numbers = [x.document_number for x in documents_to_dedup]
-            new_document_signatures = [self._generate_signature(d) for d in documents_to_dedup]
-            new_document_signatures_duplicated_in_batch = [
-                d for d in new_document_signatures if new_document_signatures.count(d) > 1
-            ]
+
+            documents_numbers = []
+            new_document_signatures = []
+
             # use this dict for skip ticket creation for the same Individual with the same doc number
-            ind_and_new_document_signatures_duplicated_in_batch_dict = defaultdict(list)
+            new_document_signatures_in_batch_per_individual_dict = defaultdict(list)
             for d in documents_to_dedup:
-                ind_and_new_document_signatures_duplicated_in_batch_dict[str(d.individual_id)].append(
-                    self._generate_signature(d)
+                new_document_signature = self._generate_signature(d)
+                documents_numbers.append(d.document_number)
+                new_document_signatures.append(new_document_signature)
+                new_document_signatures_in_batch_per_individual_dict[str(d.individual_id)].append(
+                    new_document_signature
                 )
 
+            new_document_signatures_duplicated_in_batch = [
+                d for d in new_document_signatures if new_document_signatures.count(d) > 1
+            ]
+
             # added order_by because test was failed randomly
             all_matching_number_documents = (
                 Document.objects.select_related("individual", "individual__household", "individual__business_area")
@@ -708,22 +714,23 @@ def deduplicate(
                     )
                 )
                 .order_by("individual_id")
+                .distinct()
             )
             all_matching_number_documents_dict = {d.signature: d for d in all_matching_number_documents}
             all_matching_number_documents_signatures = all_matching_number_documents_dict.keys()
-            already_processed_signatures = []
+
+            already_processed_signatures = set()
             ticket_data_dict = {}
             possible_duplicates_individuals_id_set = set()
 
             for new_document in documents_to_dedup:
                 new_document_signature = self._generate_signature(new_document)
-                # use this dict for skip ticket creation for the same Individual with the same doc number
-                is_duplicated_document_number_for_individual: bool = (
-                    ind_and_new_document_signatures_duplicated_in_batch_dict.get(
-                        str(new_document.individual_id), []
-                    ).count(new_document_signature)
-                    > 1
-                )
+
+                individual_document_duplicates_count = new_document_signatures_in_batch_per_individual_dict.get(
+                    str(new_document.individual_id), []
+                ).count(new_document_signature)
+
+                is_duplicated_document_number_for_individual: bool = individual_document_duplicates_count > 1
 
                 if new_document_signature in all_matching_number_documents_signatures:
                     new_document.status = Document.STATUS_NEED_INVESTIGATION
@@ -731,35 +738,38 @@ def deduplicate(
                         new_document_signature,
                         {
                             "original": all_matching_number_documents_dict[new_document_signature],
-                            "possible_duplicates": [],
+                            "possible_duplicates": set(),
                         },
                     )
-                    ticket_data["possible_duplicates"].append(new_document)
+                    ticket_data["possible_duplicates"].add(new_document)
                     ticket_data_dict[new_document_signature] = ticket_data
                     possible_duplicates_individuals_id_set.add(str(new_document.individual_id))
-                    continue
-
-                if (
-                    new_document_signature in new_document_signatures_duplicated_in_batch
-                    and new_document_signature in already_processed_signatures
-                    and not is_duplicated_document_number_for_individual
-                ):
-                    new_document.status = Document.STATUS_NEED_INVESTIGATION
-                    ticket_data_dict[new_document_signature]["possible_duplicates"].append(new_document)
-                    possible_duplicates_individuals_id_set.add(str(new_document.individual_id))
-                    continue
 
-                new_document.status = Document.STATUS_VALID
-                already_processed_signatures.append(new_document_signature)
+                elif new_document_signatures_duplicated_in_batch.count(new_document_signature) > 1:
+                    if is_duplicated_document_number_for_individual:
+                        # do not create ticket for the same Individual with the same doc number
+                        new_document.status = Document.STATUS_VALID
+                        new_document_signatures_in_batch_per_individual_dict[str(new_document.individual_id)].remove(
+                            new_document_signature
+                        )
+                        new_document_signatures_duplicated_in_batch.remove(new_document_signature)
+                    elif new_document_signature not in already_processed_signatures:
+                        # first occurrence of new document is considered valid, duplicated are added in next iterations
+                        new_document.status = Document.STATUS_VALID
+                        ticket_data_dict[new_document_signature] = {
+                            "original": new_document,
+                            "possible_duplicates": set(),
+                        }
+                        already_processed_signatures.add(new_document_signature)
+                    else:
+                        new_document.status = Document.STATUS_NEED_INVESTIGATION
+                        ticket_data_dict[new_document_signature]["possible_duplicates"].add(new_document)
+                        possible_duplicates_individuals_id_set.add(str(new_document.individual_id))
 
-                if (
-                    new_document_signature in new_document_signatures_duplicated_in_batch
-                    and not is_duplicated_document_number_for_individual
-                ):
-                    ticket_data_dict[new_document_signature] = {
-                        "original": new_document,
-                        "possible_duplicates": [],
-                    }
+                else:
+                    # not a duplicate
+                    new_document.status = Document.STATUS_VALID
+                    already_processed_signatures.add(new_document_signature)
 
             try:
                 Document.objects.bulk_update(documents_to_dedup, ("status", "updated_at"))
@@ -768,7 +778,7 @@ def deduplicate(
                     f"Hard Deduplication Documents bulk update error."
                     f"All matching documents in DB: {all_matching_number_documents_signatures}"
                     f"New documents to dedup: {new_document_signatures}"
-                    f"new_document_signatures_duplicated_in_batch: {new_document_signatures_duplicated_in_batch}"
+                    f"new_document_signatures_duplicated_in_batch: {set(new_document_signatures_duplicated_in_batch)}"
                 )
                 raise
 
diff --git a/tests/unit/apps/registration_datahub/test_handling_documents_duplicates.py b/tests/unit/apps/registration_datahub/test_handling_documents_duplicates.py
index ca264c82e1..4fed624c42 100644
--- a/tests/unit/apps/registration_datahub/test_handling_documents_duplicates.py
+++ b/tests/unit/apps/registration_datahub/test_handling_documents_duplicates.py
@@ -10,7 +10,10 @@
 
 from hct_mis_api.apps.core.models import BusinessArea
 from hct_mis_api.apps.geo import models as geo_models
-from hct_mis_api.apps.grievance.models import GrievanceTicket
+from hct_mis_api.apps.grievance.models import (
+    GrievanceTicket,
+    TicketNeedsAdjudicationDetails,
+)
 from hct_mis_api.apps.household.fixtures import (
     DocumentTypeFactory,
     create_household_and_individuals,
@@ -437,7 +440,7 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
         passport = Document.objects.create(
             country=self.country,  # the same country
             type=self.dt,
-            document_number="123444444",  # the same doc number
+            document_number="111",  # the same doc number
             individual=self.individuals[2],  # the same Individual
             program=self.program,
             rdi_merge_status=MergeStatusModel.MERGED,
@@ -445,7 +448,7 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
         tax_id = Document.objects.create(
             country=self.country,  # the same country
             type=self.dt_tax_id,
-            document_number="123444444",  # the same doc number
+            document_number="111",  # the same doc number
             individual=self.individuals[2],  # the same Individual
             program=self.program,
             rdi_merge_status=MergeStatusModel.MERGED,
@@ -453,7 +456,7 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
         d1 = Document.objects.create(
             country=self.country,
             type=self.dt,
-            document_number="123321321",
+            document_number="222",
             individual=self.individuals[2],
             program=self.program,
             rdi_merge_status=MergeStatusModel.MERGED,
@@ -462,7 +465,7 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
         Document.objects.create(
             country=self.country,
             type=self.dt,
-            document_number="123321321",
+            document_number="222",
             individual=self.individuals[1],
             program=self.program,
             status=Document.STATUS_VALID,
@@ -471,7 +474,7 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
         d2 = Document.objects.create(
             country=self.country,
             type=self.dt,
-            document_number="222",
+            document_number="333",
             individual=self.individuals[3],
             program=self.program,
             rdi_merge_status=MergeStatusModel.MERGED,
@@ -479,7 +482,7 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
         d3 = Document.objects.create(
             country=self.country,
             type=self.dt_tax_id,
-            document_number="222",
+            document_number="333",
             individual=self.individuals[4],
             program=self.program,
             rdi_merge_status=MergeStatusModel.MERGED,
@@ -487,7 +490,7 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
         d4 = Document.objects.create(
             country=self.country,
             type=self.dt,
-            document_number="111",
+            document_number="444",
             individual=self.individuals[0],
             program=self.program,
             rdi_merge_status=MergeStatusModel.MERGED,
@@ -495,7 +498,7 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
         d5 = Document.objects.create(
             country=self.country,
             type=self.dt_tax_id,
-            document_number="111",
+            document_number="444",
             individual=self.individuals[1],
             program=self.program,
             rdi_merge_status=MergeStatusModel.MERGED,
@@ -503,7 +506,7 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
         d6 = Document.objects.create(
             country=self.country,
             type=DocumentTypeFactory(label="other_type", key="other_type"),
-            document_number="111",
+            document_number="444",
             individual=self.individuals[2],
             program=self.program,
             rdi_merge_status=MergeStatusModel.MERGED,
@@ -522,3 +525,55 @@ def test_ticket_creation_for_the_same_ind_doc_numbers(self) -> None:
 
         tax_id.refresh_from_db()
         self.assertEqual(tax_id.status, Document.STATUS_VALID)
+
+    def test_ticket_creation_for_the_same_ind_and_across_other_inds_doc_numbers(self) -> None:
+        passport = Document.objects.create(
+            country=self.country,  # the same country
+            type=self.dt,
+            document_number="111",  # the same doc number
+            individual=self.individuals[2],  # the same Individual
+            program=self.program,
+            rdi_merge_status=MergeStatusModel.MERGED,
+        )
+        tax_id = Document.objects.create(
+            country=self.country,  # the same country
+            type=self.dt_tax_id,
+            document_number="111",  # the same doc number
+            individual=self.individuals[2],  # the same Individual
+            program=self.program,
+            rdi_merge_status=MergeStatusModel.MERGED,
+        )
+        d1 = Document.objects.create(
+            country=self.country,
+            type=self.dt,
+            document_number="222",  # different doc number
+            individual=self.individuals[2],  # different Individual
+            program=self.program,
+            rdi_merge_status=MergeStatusModel.MERGED,
+        )
+        d2 = Document.objects.create(
+            country=self.country,
+            type=self.dt,
+            document_number="111",  # the same doc number
+            individual=self.individuals[3],  # different Individual
+            program=self.program,
+            rdi_merge_status=MergeStatusModel.MERGED,
+        )
+        self.assertEqual(GrievanceTicket.objects.all().count(), 0)
+        HardDocumentDeduplication().deduplicate(
+            self.get_documents_query([passport, tax_id, d1, d2]),
+            self.registration_data_import,
+        )
+
+        self.assertEqual(GrievanceTicket.objects.all().count(), 1)
+        ticket_details = TicketNeedsAdjudicationDetails.objects.first()
+        self.assertIsNotNone(ticket_details.golden_records_individual)
+        self.assertEqual(ticket_details.possible_duplicates.all().count(), 1)
+        self.assertNotEqual(ticket_details.golden_records_individual, ticket_details.possible_duplicates.first())
+
+        passport.refresh_from_db()
+        self.assertEqual(passport.status, Document.STATUS_VALID)
+        tax_id.refresh_from_db()
+        self.assertEqual(tax_id.status, Document.STATUS_VALID)
+        d2.refresh_from_db()
+        self.assertEqual(d2.status, Document.STATUS_NEED_INVESTIGATION)
diff --git a/tests/unit/apps/registration_datahub/test_program_population_to_pending_objects.py b/tests/unit/apps/registration_datahub/test_program_population_to_pending_objects.py
index 7bf0a2d2f1..f6202097eb 100644
--- a/tests/unit/apps/registration_datahub/test_program_population_to_pending_objects.py
+++ b/tests/unit/apps/registration_datahub/test_program_population_to_pending_objects.py
@@ -370,6 +370,10 @@ def test_create_pending_objects_from_objects(self) -> None:
             pending_document.individual,
             head_of_household_pending_individual,
         )
+        self.assertEqual(
+            pending_document.status,
+            Document.STATUS_PENDING,
+        )
 
         pending_identity = IndividualIdentity.pending_objects.first()
         self.assertEqual(

From 3bfcd84deef69bc642015fff9b8066aa009950c1 Mon Sep 17 00:00:00 2001
From: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com>
Date: Tue, 8 Oct 2024 10:59:23 +0200
Subject: [PATCH 14/16] [201639]-add delivery mechanisms section (#4270)

* add delivery mechanisms section

* add permission, dont show divider for last item

---------

Co-authored-by: Maciej Szewczyk <maciej.szewczyk@tivix.com>
Co-authored-by: Marek Biczysko <34810846+MarekBiczysko@users.noreply.github.com>
---
 ...idualAdditionalRegistrationInformation.tsx |  32 +++--
 ...ionalRegistrationInformation.test.tsx.snap | 116 +++++++++---------
 .../IndividualDeliveryMechanisms.tsx          |  66 ++++++++++
 .../ProgramDetails/ProgramDetails.tsx         |   6 +-
 src/frontend/src/config/permissions.ts        |   2 +
 .../PopulationIndividualsDetailsPage.tsx      |   4 +
 src/frontend/src/utils/en.json                |   3 +-
 7 files changed, 147 insertions(+), 82 deletions(-)
 create mode 100644 src/frontend/src/components/population/IndividualDeliveryMechanisms.tsx

diff --git a/src/frontend/src/components/population/IndividualAdditionalRegistrationInformation/IndividualAdditionalRegistrationInformation.tsx b/src/frontend/src/components/population/IndividualAdditionalRegistrationInformation/IndividualAdditionalRegistrationInformation.tsx
index b1ca29046f..3ef09b2e00 100644
--- a/src/frontend/src/components/population/IndividualAdditionalRegistrationInformation/IndividualAdditionalRegistrationInformation.tsx
+++ b/src/frontend/src/components/population/IndividualAdditionalRegistrationInformation/IndividualAdditionalRegistrationInformation.tsx
@@ -84,22 +84,20 @@ export const IndividualAdditionalRegistrationInformation = ({
       );
     });
   return (
-    <div>
-      <Overview>
-        <Title>
-          <Typography variant="h6">
-            {t('Additional Registration information')}
-          </Typography>
-        </Title>
-        <Grid container spacing={6}>
-          {fields.map((field, i) => (
-            /* eslint-disable-next-line react/no-array-index-key */
-            <Grid key={i} item xs={4}>
-              {field}
-            </Grid>
-          ))}
-        </Grid>
-      </Overview>
-    </div>
+    <Overview>
+      <Title>
+        <Typography variant="h6">
+          {t('Additional Registration information')}
+        </Typography>
+      </Title>
+      <Grid container spacing={6}>
+        {fields.map((field, i) => (
+          /* eslint-disable-next-line react/no-array-index-key */
+          <Grid key={i} item xs={4}>
+            {field}
+          </Grid>
+        ))}
+      </Grid>
+    </Overview>
   );
 };
diff --git a/src/frontend/src/components/population/IndividualAdditionalRegistrationInformation/__snapshots__/IndividualAdditionalRegistrationInformation.test.tsx.snap b/src/frontend/src/components/population/IndividualAdditionalRegistrationInformation/__snapshots__/IndividualAdditionalRegistrationInformation.test.tsx.snap
index e3daad802a..4581aae885 100644
--- a/src/frontend/src/components/population/IndividualAdditionalRegistrationInformation/__snapshots__/IndividualAdditionalRegistrationInformation.test.tsx.snap
+++ b/src/frontend/src/components/population/IndividualAdditionalRegistrationInformation/__snapshots__/IndividualAdditionalRegistrationInformation.test.tsx.snap
@@ -2,86 +2,84 @@
 
 exports[`components/population/IndividualAdditionalRegistrationInformation should render 1`] = `
 <div>
-  <div>
+  <div
+    class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 sc-fsYfdN ctuPcH css-1ps6pg7-MuiPaper-root"
+  >
     <div
-      class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation1 sc-fsYfdN ctuPcH css-1ps6pg7-MuiPaper-root"
+      class="sc-dmyCSP ljiJAm"
     >
-      <div
-        class="sc-dmyCSP ljiJAm"
+      <h6
+        class="MuiTypography-root MuiTypography-h6 css-1j53xw6-MuiTypography-root"
       >
-        <h6
-          class="MuiTypography-root MuiTypography-h6 css-1j53xw6-MuiTypography-root"
-        >
-          Additional Registration information
-        </h6>
-      </div>
+        Additional Registration information
+      </h6>
+    </div>
+    <div
+      class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-6 css-zow5z4-MuiGrid-root"
+    >
       <div
-        class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-6 css-zow5z4-MuiGrid-root"
+        class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
       >
-        <div
-          class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
-        >
-          <div>
+        <div>
+          <span
+            class="sc-beySPh gbuZtJ"
+            color="textSecondary"
+          >
+            muac
+          </span>
+          <div
+            data-cy="label-muac"
+          >
             <span
-              class="sc-beySPh gbuZtJ"
+              class="sc-guDLey cyWTlF"
               color="textSecondary"
             >
-              muac
+              334
             </span>
-            <div
-              data-cy="label-muac"
-            >
-              <span
-                class="sc-guDLey cyWTlF"
-                color="textSecondary"
-              >
-                334
-              </span>
-            </div>
           </div>
         </div>
-        <div
-          class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
-        >
-          <div>
+      </div>
+      <div
+        class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
+      >
+        <div>
+          <span
+            class="sc-beySPh gbuZtJ"
+            color="textSecondary"
+          >
+            school enrolled
+          </span>
+          <div
+            data-cy="label-school enrolled"
+          >
             <span
-              class="sc-beySPh gbuZtJ"
+              class="sc-guDLey cyWTlF"
               color="textSecondary"
             >
-              school enrolled
+              Yes
             </span>
-            <div
-              data-cy="label-school enrolled"
-            >
-              <span
-                class="sc-guDLey cyWTlF"
-                color="textSecondary"
-              >
-                Yes
-              </span>
-            </div>
           </div>
         </div>
-        <div
-          class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
-        >
-          <div>
+      </div>
+      <div
+        class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-4 css-gj1fbr-MuiGrid-root"
+      >
+        <div>
+          <span
+            class="sc-beySPh gbuZtJ"
+            color="textSecondary"
+          >
+            school enrolled before
+          </span>
+          <div
+            data-cy="label-school enrolled before"
+          >
             <span
-              class="sc-beySPh gbuZtJ"
+              class="sc-guDLey cyWTlF"
               color="textSecondary"
             >
-              school enrolled before
+              No
             </span>
-            <div
-              data-cy="label-school enrolled before"
-            >
-              <span
-                class="sc-guDLey cyWTlF"
-                color="textSecondary"
-              >
-                No
-              </span>
-            </div>
           </div>
         </div>
       </div>
diff --git a/src/frontend/src/components/population/IndividualDeliveryMechanisms.tsx b/src/frontend/src/components/population/IndividualDeliveryMechanisms.tsx
new file mode 100644
index 0000000000..cb0e7c5515
--- /dev/null
+++ b/src/frontend/src/components/population/IndividualDeliveryMechanisms.tsx
@@ -0,0 +1,66 @@
+import { DividerLine } from '@components/core/DividerLine';
+import { IndividualNode } from '@generated/graphql';
+import { Grid, Paper, Typography } from '@mui/material';
+import { Title } from '@core/Title';
+import { t } from 'i18next';
+import React from 'react';
+import styled from 'styled-components';
+import { LabelizedField } from '@components/core/LabelizedField';
+import { renderSomethingOrDash } from '@utils/utils';
+import { usePermissions } from '@hooks/usePermissions';
+import { hasPermissions, PERMISSIONS } from 'src/config/permissions';
+
+interface IndividualDeliveryMechanismsProps {
+  individual: IndividualNode;
+}
+
+const Overview = styled(Paper)`
+  padding: ${({ theme }) => theme.spacing(8)}
+    ${({ theme }) => theme.spacing(11)};
+  margin-top: ${({ theme }) => theme.spacing(6)};
+  margin-bottom: ${({ theme }) => theme.spacing(4)};
+`;
+
+export const IndividualDeliveryMechanisms: React.FC<
+  IndividualDeliveryMechanismsProps
+> = ({ individual }) => {
+  const permissions = usePermissions();
+  const canViewDeliveryMechanisms = hasPermissions(
+    PERMISSIONS.POPULATION_VIEW_INDIVIDUAL_DELIVERY_MECHANISMS_SECTION,
+    permissions,
+  );
+  if (!individual.deliveryMechanismsData.length || !canViewDeliveryMechanisms) {
+    return null;
+  }
+  return (
+    <Overview>
+      <Title>
+        <Typography variant="h6">
+          {t('Individual Delivery Mechanisms')}
+        </Typography>
+      </Title>
+      <Grid container spacing={6}>
+        {individual.deliveryMechanismsData.map((mechanism, index) => {
+          const tabData = JSON.parse(mechanism.individualTabData);
+          return (
+            <Grid item xs={12} key={index}>
+              <Typography variant="h6">{mechanism.name}</Typography>
+              <Grid container spacing={3}>
+                {Object.entries(tabData).map(([key, value], idx) => (
+                  <Grid key={idx} item xs={3}>
+                    <LabelizedField label={key.replace(/_/g, ' ')}>
+                      {renderSomethingOrDash(value)}
+                    </LabelizedField>
+                  </Grid>
+                ))}
+              </Grid>
+              {index < individual.deliveryMechanismsData.length - 1 && (
+                <DividerLine />
+              )}
+            </Grid>
+          );
+        })}
+      </Grid>
+    </Overview>
+  );
+};
diff --git a/src/frontend/src/components/programs/ProgramDetails/ProgramDetails.tsx b/src/frontend/src/components/programs/ProgramDetails/ProgramDetails.tsx
index 257ffae326..f252491c4e 100644
--- a/src/frontend/src/components/programs/ProgramDetails/ProgramDetails.tsx
+++ b/src/frontend/src/components/programs/ProgramDetails/ProgramDetails.tsx
@@ -2,11 +2,7 @@ import { Box, Grid, Typography } from '@mui/material';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
-import {
-  ProgrammeChoiceDataQuery,
-  ProgramPartnerAccess,
-  ProgramQuery,
-} from '@generated/graphql';
+import { ProgrammeChoiceDataQuery, ProgramQuery } from '@generated/graphql';
 import { MiśTheme } from '../../../theme';
 import { choicesToDict, programStatusToColor } from '@utils/utils';
 import { ContainerColumnWithBorder } from '@core/ContainerColumnWithBorder';
diff --git a/src/frontend/src/config/permissions.ts b/src/frontend/src/config/permissions.ts
index cb79a14011..44bf5a29ae 100644
--- a/src/frontend/src/config/permissions.ts
+++ b/src/frontend/src/config/permissions.ts
@@ -14,6 +14,8 @@ export const PERMISSIONS = {
   POPULATION_VIEW_HOUSEHOLDS_DETAILS: 'POPULATION_VIEW_HOUSEHOLDS_DETAILS',
   POPULATION_VIEW_INDIVIDUALS_LIST: 'POPULATION_VIEW_INDIVIDUALS_LIST',
   POPULATION_VIEW_INDIVIDUALS_DETAILS: 'POPULATION_VIEW_INDIVIDUALS_DETAILS',
+  POPULATION_VIEW_INDIVIDUAL_DELIVERY_MECHANISMS_SECTION:
+    'POPULATION_VIEW_INDIVIDUAL_DELIVERY_MECHANISMS_SECTION',
 
   // User Management
   USER_MANAGEMENT_VIEW_LIST: 'USER_MANAGEMENT_VIEW_LIST',
diff --git a/src/frontend/src/containers/pages/population/PopulationIndividualsDetailsPage.tsx b/src/frontend/src/containers/pages/population/PopulationIndividualsDetailsPage.tsx
index 3a6990b4fe..8f3283a23f 100644
--- a/src/frontend/src/containers/pages/population/PopulationIndividualsDetailsPage.tsx
+++ b/src/frontend/src/containers/pages/population/PopulationIndividualsDetailsPage.tsx
@@ -27,6 +27,7 @@ import { AdminButton } from '@core/AdminButton';
 import { ProgrammeTimeSeriesFields } from '@components/population/ProgrammeTimeSeriesFields';
 import { fetchPeriodicFields } from '@api/periodicDataUpdateApi';
 import { useQuery } from '@tanstack/react-query';
+import { IndividualDeliveryMechanisms } from '@components/population/IndividualDeliveryMechanisms';
 
 const Container = styled.div`
   padding: 20px;
@@ -130,6 +131,9 @@ export const PopulationIndividualsDetailsPage = (): React.ReactElement => {
           choicesData={choicesData}
           grievancesChoices={grievancesChoices}
         />
+        <IndividualDeliveryMechanisms
+          individual={individual as IndividualNode}
+        />
         <IndividualAdditionalRegistrationInformation
           flexFieldsData={flexFieldsData}
           individual={individual as IndividualNode}
diff --git a/src/frontend/src/utils/en.json b/src/frontend/src/utils/en.json
index 75d4ee7696..f206df2a63 100644
--- a/src/frontend/src/utils/en.json
+++ b/src/frontend/src/utils/en.json
@@ -907,5 +907,6 @@
   "You cannot upload more than 10 files.": "You cannot upload more than 10 files.",
   "File deleted successfully.": "File deleted successfully.",
   "FX Rate Applied": "FX Rate Applied",
-  "If displayed exchange rate differs from Vision, please contact your designated focal point for resolutionIf displayed exchange rate differs from Vision, please contact your designated focal point for resolution": "If displayed exchange rate differs from Vision, please contact your designated focal point for resolution"
+  "If displayed exchange rate differs from Vision, please contact your designated focal point for resolutionIf displayed exchange rate differs from Vision, please contact your designated focal point for resolution": "If displayed exchange rate differs from Vision, please contact your designated focal point for resolution",
+  "Individual Delivery Mechanisms": "Individual Delivery Mechanisms"
 }

From a6e229d1d1814f5940660ba14a0aeeac47cf9ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartosz=20Wo=C5=BAniak?=
 <17177420+wozniakpl@users.noreply.github.com>
Date: Tue, 8 Oct 2024 14:07:34 +0200
Subject: [PATCH 15/16] add -x to selenium tests pytest invocation (#4300)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f1c2c97f1..4bf0f5c8ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -264,7 +264,7 @@ jobs:
             -f ./.github/helpers/docker-compose.selenium.yml \
             run backend bash -c "
               waitforit -host=db -port=5432 -timeout=30
-              pytest -svvv $extra_options ./tests/selenium --cov-report xml:test-coverage/coverage.xml --html-report=./tests/selenium/output_data/report/report.html --randomly-seed=42
+              pytest -x -svvv $extra_options ./tests/selenium --cov-report xml:test-coverage/coverage.xml --html-report=./tests/selenium/output_data/report/report.html --randomly-seed=42
             "
       - name: Upload Artifact
         uses: actions/upload-artifact@v4

From 3ab966653833dd3f6d4c28a9c28faf86c1f56691 Mon Sep 17 00:00:00 2001
From: Maciej Szewczyk <34482854+mmaciekk@users.noreply.github.com>
Date: Tue, 8 Oct 2024 16:39:45 +0200
Subject: [PATCH 16/16] exclusion fix (#4290)

Co-authored-by: Maciej Szewczyk <maciej.szewczyk@tivix.com>
---
 .../ExcludeSection/ExcludeSection.tsx                | 12 ++++++------
 .../ExcludeSection/ExcludeSection.tsx                |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/frontend/src/components/paymentmodule/PaymentPlanDetails/ExcludeSection/ExcludeSection.tsx b/src/frontend/src/components/paymentmodule/PaymentPlanDetails/ExcludeSection/ExcludeSection.tsx
index 55e8eecd9f..dd1f9a5cc5 100644
--- a/src/frontend/src/components/paymentmodule/PaymentPlanDetails/ExcludeSection/ExcludeSection.tsx
+++ b/src/frontend/src/components/paymentmodule/PaymentPlanDetails/ExcludeSection/ExcludeSection.tsx
@@ -44,7 +44,7 @@ export function ExcludeSection({
     excludeHouseholdError,
   } = paymentPlan;
 
-  const initialExcludedIds = paymentPlan?.excludedIndividuals?.map(
+  const initialExcludedIds = paymentPlan?.excludedHouseholds?.map(
     (el) => el.unicefId,
   );
   const [isExclusionsOpen, setExclusionsOpen] = useState(initialOpen);
@@ -67,7 +67,7 @@ export function ExcludeSection({
   const getTooltipText = (): string => {
     if (!hasOpenOrLockedStatus) {
       return t(
-        'Beneficiaries can only be excluded from a Payment Plan in status open or locked',
+        'Households can only be excluded from a Payment Plan in status open or locked',
       );
     }
     if (!hasExcludePermission) {
@@ -115,7 +115,7 @@ export function ExcludeSection({
         awaitRefetchQueries: true,
       });
       if (!error) {
-        showMessage(t('Beneficiaries exclusion started'));
+        showMessage(t('Households exclusion started'));
         setExclusionsOpen(false);
       }
     } catch (e) {
@@ -125,7 +125,7 @@ export function ExcludeSection({
 
   const handleApply = (): void => {
     const idRegex =
-      /^(\s*IND-\d{2}-\d{4}\.\d{4}\s*)(,\s*IND-\d{2}-\d{4}\.\d{4}\s*)*$/;
+      /^(\s*HH-\d{2}-\d{4}\.\d{4}\s*)(,\s*HH-\d{2}-\d{4}\.\d{4}\s*)*$/;
     const ids = idsValue.trim().split(/,\s*|\s+/);
     const invalidIds: string[] = [];
     const alreadyExcludedIds: string[] = [];
@@ -311,7 +311,7 @@ export function ExcludeSection({
             <Grid item xs={6}>
               <Box mr={2}>
                 <StyledTextField
-                  label={t('Beneficiaries Ids')}
+                  label={t('Households Ids')}
                   value={idsValue}
                   onChange={handleIdsChange}
                   fullWidth
@@ -368,7 +368,7 @@ export function ExcludeSection({
               <Box mt={2} mb={2}>
                 <GreyText>
                   {`${numberOfExcluded} ${
-                    numberOfExcluded === 1 ? 'Beneficiary' : 'Beneficiaries'
+                    numberOfExcluded === 1 ? 'Household' : 'Households'
                   } excluded`}
                 </GreyText>
               </Box>
diff --git a/src/frontend/src/components/paymentmodulepeople/PaymentPlanDetails/ExcludeSection/ExcludeSection.tsx b/src/frontend/src/components/paymentmodulepeople/PaymentPlanDetails/ExcludeSection/ExcludeSection.tsx
index 2b86536934..f17af321fc 100644
--- a/src/frontend/src/components/paymentmodulepeople/PaymentPlanDetails/ExcludeSection/ExcludeSection.tsx
+++ b/src/frontend/src/components/paymentmodulepeople/PaymentPlanDetails/ExcludeSection/ExcludeSection.tsx
@@ -67,7 +67,7 @@ export function ExcludeSection({
   const getTooltipText = (): string => {
     if (!hasOpenOrLockedStatus) {
       return t(
-        'Households can only be excluded from a Payment Plan in status open or locked',
+        'Beneficiaries can only be excluded from a Payment Plan in status open or locked',
       );
     }
     if (!hasExcludePermission) {
@@ -115,7 +115,7 @@ export function ExcludeSection({
         awaitRefetchQueries: true,
       });
       if (!error) {
-        showMessage(t('Households exclusion started'));
+        showMessage(t('Beneficiaries exclusion started'));
         setExclusionsOpen(false);
       }
     } catch (e) {
@@ -311,7 +311,7 @@ export function ExcludeSection({
             <Grid item xs={6}>
               <Box mr={2}>
                 <StyledTextField
-                  label={t('Household Ids')}
+                  label={t('Beneficiaries Ids')}
                   value={idsValue}
                   onChange={handleIdsChange}
                   fullWidth
@@ -368,7 +368,7 @@ export function ExcludeSection({
               <Box mt={2} mb={2}>
                 <GreyText>
                   {`${numberOfExcluded} ${
-                    numberOfExcluded === 1 ? 'Household' : 'Households'
+                    numberOfExcluded === 1 ? 'Beneficiary' : 'Beneficiaries'
                   } excluded`}
                 </GreyText>
               </Box>