updated to fix breadcrumb

components/case/representation/index.js

@@ -322,9 +322,9 @@ let MakeRepresentation = (props) => {
             todaysDate <= statementDueDate &&
             buildArr.push("Statement");
 
-        currentView.caseReference.appealType != 846040004 &&
-            currentView.caseReference.appealType == 846040015 &&
-            currentView.caseReference.specialistProcess != 846040001 &&
+        (currentView.caseReference.appealType != 846040004 ||
+            (currentView.caseReference.appealType == 846040015 &&
+                currentView.caseReference.specialistProcess != 846040001)) &&
             todaysDate >= statementDueDate &&
             todaysDate <= finalCommentsDate &&
             buildArr.push("Final comments");

components/case/representation/representationAgent.js

@@ -196,6 +196,8 @@ const RepAgent = (props) => {
                     </div>
                 </>
             )}
+            {typeof formObj.representationForm.values.representationType !=
+                "undefined" && (
                 <div className="govuk-grid-row">
                     <div className="govuk-button-group">
                         <button
@@ -203,7 +205,7 @@ const RepAgent = (props) => {
                             className="govuk-button"
                             data-module="govuk-button"
                         >
-                        {t("common:continue-button")}{" "}
+                            {t("common:continue-button")}
                         </button>
 
                         <a
@@ -221,6 +223,7 @@ const RepAgent = (props) => {
                         </a>
                     </div>
                 </div>
+            )}
         </>
     );
 };

components/case/representation/representationAppellant.js

@@ -180,6 +180,8 @@ const RepAppellant = (props) => {
                     </div>{" "}
                 </div>
             )}
+            {typeof formObj.representationForm.values.representationType !=
+                "undefined" && (
                 <div className="govuk-grid-row">
                     <div className="govuk-button-group">
                         <button
@@ -189,7 +191,6 @@ const RepAppellant = (props) => {
                         >
                             {t("common:continue-button")}
                         </button>
-
                         <a
                             onClick={() => {
                                 setRepresentationCapacity();
@@ -205,6 +206,7 @@ const RepAppellant = (props) => {
                         </a>
                     </div>
                 </div>
+            )}
         </>
     );
 };

components/case/representation/representationElements.js

@@ -468,7 +468,7 @@ export const RenderPickList = ({
     datafieldname,
     name,
     label,
-    input,
+    input: { onChange, value },
     optionsArr,
     meta: { touched, error },
     errorMsg,
@@ -493,14 +493,15 @@ export const RenderPickList = ({
                         {errorMsg}
                     </span>
                 )}
-
+                {value}
                 <div>
                     <select
-                        {...input}
+                        // {...input}
                         className="govuk-select "
                         id={datafieldname}
                         name={datafieldname}
                         disabled={custom.disabled}
+                        onChange={onChange}
                     >
                         <option>Select...</option>
                         {Object.keys(optionsArr).map((key, index) => {

components/case/representation/representationInterestedPartyPerson.js

@@ -157,6 +157,8 @@ const RepInterestedPartyPerson = (props) => {
                     </div>
                 </>
             )}
+            {typeof formObj.representationForm.values.representationType !=
+                "undefined" && (
                 <div className="govuk-grid-row">
                     <div className="govuk-button-group">
                         <button
@@ -187,6 +189,7 @@ const RepInterestedPartyPerson = (props) => {
                         </a>
                     </div>
                 </div>
+            )}
         </>
     );
 };

components/case/representation/representationLandowner.js

@@ -104,7 +104,8 @@ const RepLandOwner = (props) => {
                         </fieldset>
                     </div>{" "}
                 </div>
-
+                {typeof formObj.representationForm.values.representationType !=
+                    "undefined" && (
                     <div className="govuk-grid-row">
                         <div className="govuk-button-group">
                             <button
@@ -124,6 +125,7 @@ const RepLandOwner = (props) => {
                             </a>
                         </div>
                     </div>
+                )}
             </div>
         </div>
     );

components/myportal/viewall.js

@@ -657,6 +657,7 @@ const ViewAllResults = (props) => {
                             </button>
                         </dd>
                     )}
+
                     {currentView.viewKey == "watchedCases" && (
                         <dd className="govuk-summary-list__value govuk-!-font-size-16 cardModuleItem ">
                             <button