From d32d7d016eb8eb727c2f911f2f4a3c6379f9e7ba Mon Sep 17 00:00:00 2001
From: robbond <rob@rdbsolutions.co.uk>
Date: Fri, 13 Mar 2026 17:44:27 +0000
Subject: [PATCH] TASK22028: fix myportal deleteRepItem caseRef and i18n
 namespace

---
 components/myportal/topthree_reps.js |  3 +--
 components/myportal/viewall.js       | 34 +++++++++++++++++++++-------
 i18n.js                              |  2 +-
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js
index ea1a2169..0a52ac96 100644
--- a/components/myportal/topthree_reps.js
+++ b/components/myportal/topthree_reps.js
@@ -273,8 +273,7 @@ const TopThree = (props) => {
                                             deleteRepItem(
                                                 props.accountDetails
                                                     .containerID,
-                                                showTopThreeArr[key]
-                                                    .ticketnumber,
+                                                showTopThreeArr[key].caseRef,
                                                 showTopThreeArr[key]
                                                     .repfile_name
                                             );
diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js
index 1885c7ea..6532be5a 100644
--- a/components/myportal/viewall.js
+++ b/components/myportal/viewall.js
@@ -686,7 +686,7 @@ const ViewAllResults = (props) => {
                                   ] || "N/A"}
                     </dd>
                     {isAwaitingSubmissionDetails && (
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16 cardModuleItem ">
+                        <dd className="govuk-summary-list__value govuk-!-font-size-16  ">
                             <button
                                 title={t(
                                     "case:do-you-want-to-delete-case-label"
@@ -714,7 +714,7 @@ const ViewAllResults = (props) => {
                         </dd>
                     )}
                     {isMyRepresentations && (
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16 cardModuleItem ">
+                        <dd className="govuk-summary-list__value govuk-!-font-size-16 ">
                             <button
                                 title={t(
                                     "case:do-you-want-to-delete-rep-label"
@@ -733,7 +733,7 @@ const ViewAllResults = (props) => {
                                     ) &&
                                         deleteRepItem(
                                             props.accountDetails.containerID,
-                                            item.pinswg_name,
+                                            item.caseRef,
                                             item.repfile_name
                                         );
                                 }}
@@ -744,12 +744,12 @@ const ViewAllResults = (props) => {
                     )}
 
                     {isWatchedCases && (
-                        <dd className="govuk-summary-list__value govuk-!-font-size-16 cardModuleItem ">
+                        <dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-summary-list__action">
                             <button
                                 title={t(
                                     "case:do-you-want-to-delete-case-label"
                                 )}
-                                className=" cardModuleRemoveCase govuk-link govuk-link--no-underline govuk-link--inverse "
+                                className=" cardModuleRemoveCase govuk-summary-list__actionLink watched_link"
                                 onClick={() => {
                                     confirm(
                                         t(
@@ -769,7 +769,7 @@ const ViewAllResults = (props) => {
                             </button>
                             {item.pinswg_emailnotifications === true ? (
                                 <button
-                                    className="govuk-summary-list__actionLink mailLink watched_link"
+                                    className="govuk-summary-list__actionLink mailLink"
                                     title={t("common:unsubscribe-title-label")}
                                     onClick={() => {
                                         confirm(
@@ -928,8 +928,26 @@ const ViewAllResults = (props) => {
                 .then((data) => data)
                 .then(() => {
                     getWatchedCasesProxy(cookies.pinsUser).then((data) => {
-                        (setWatchedCases(data),
-                            getDetailsProxy(data, "myWatchedCases")
+                        let showWatchedCases = (submittedArr) => {
+                            const required = submittedArr.value.filter((el) => {
+                                return (
+                                    el.pinswg_representationsubmitted == null
+                                );
+                            });
+
+                            let newObj = {};
+                            return Object.assign(newObj, {
+                                "@odata.count": required.length,
+                                "value": required
+                            });
+                        };
+
+                        let filteredWatchedCases = showWatchedCases(data);
+                        (setWatchedCases(filteredWatchedCases),
+                            getDetailsProxy(
+                                filteredWatchedCases,
+                                "myWatchedCases"
+                            )
                                 .then((data) => {
                                     setWatchedCasesDetails(data);
                                 })
diff --git a/i18n.js b/i18n.js
index aaac19af..9e62f9c3 100644
--- a/i18n.js
+++ b/i18n.js
@@ -60,7 +60,7 @@ module.exports = {
         "/myportal/[appealtypes]": ["newappeal", "home", "myportal"],
         "/newappeal": ["newappeal", "home"],
         "/newappeal/*": ["newappeal", "home"],
-        "/newappeal/[appealtypes]": ["newappeal", "home"],
+        "/newappeal/[appealtypes]": ["newappeal", "home", "myportal"],
         "/newappeal/selectappeal": ["newappeal", "home"],
         "/dns/*": ["dnsCommon", "case", "common"],
         "/dns/[developmentName]": ["dnsCommon", "case", "common"],