@hmcts/ccd-case-ui-toolkit 6.19.7 → 6.19.8-case-flags-v2-1-consolidation-final

package/bundles/hmcts-ccd-case-ui-toolkit.umd.js

@@ -144,14 +144,14 @@
         }
     }
     var _c0$12 = [[["", "footerSolsNavLinks", ""]], [["", "footerCaseWorkerNavLinks", ""]]];
-    var _c1$s = ["[footerSolsNavLinks]", "[footerCaseWorkerNavLinks]"];
+    var _c1$t = ["[footerSolsNavLinks]", "[footerCaseWorkerNavLinks]"];
     var FooterComponent = /** @class */ (function () {
         function FooterComponent() {
         }
         return FooterComponent;
     }());
     FooterComponent.ɵfac = function FooterComponent_Factory(t) { return new (t || FooterComponent)(); };
-    FooterComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: FooterComponent, selectors: [["cut-footer-bar"]], inputs: { email: "email", isSolicitor: "isSolicitor", phone: "phone", workhours: "workhours" }, ngContentSelectors: _c1$s, decls: 4, vars: 4, consts: [["id", "footer", "role", "footer", 1, "group", "js-footer"], [1, "footer-wrapper"], ["class", "footer-meta", 4, "ngIf"], [1, "footer-meta"], [1, "footer-meta-inner"], [1, "open-government-licence"], [1, "logo"], ["href", "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", "rel", "license"], [1, "copyright"], ["href", "https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/"], [1, "title"], [1, "footer-text"], [1, "email"], [3, "href"], [1, "phone"], [1, "work-hours"]], template: function FooterComponent_Template(rf, ctx) {
+    FooterComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: FooterComponent, selectors: [["cut-footer-bar"]], inputs: { email: "email", isSolicitor: "isSolicitor", phone: "phone", workhours: "workhours" }, ngContentSelectors: _c1$t, decls: 4, vars: 4, consts: [["id", "footer", "role", "footer", 1, "group", "js-footer"], [1, "footer-wrapper"], ["class", "footer-meta", 4, "ngIf"], [1, "footer-meta"], [1, "footer-meta-inner"], [1, "open-government-licence"], [1, "logo"], ["href", "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/", "rel", "license"], [1, "copyright"], ["href", "https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/"], [1, "title"], [1, "footer-text"], [1, "email"], [3, "href"], [1, "phone"], [1, "work-hours"]], template: function FooterComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵprojectionDef(_c0$12);
                 i0__namespace.ɵɵelementStart(0, "footer", 0);
@@ -240,7 +240,7 @@
         }
     }
     var _c0$11 = [[["", "headerNavigation", ""]]];
-    var _c1$r = ["[headerNavigation]"];
+    var _c1$s = ["[headerNavigation]"];
     var HeaderBarComponent = /** @class */ (function () {
         function HeaderBarComponent() {
             this.signOutRequest = new i0.EventEmitter();
@@ -251,7 +251,7 @@
         return HeaderBarComponent;
     }());
     HeaderBarComponent.ɵfac = function HeaderBarComponent_Factory(t) { return new (t || HeaderBarComponent)(); };
-    HeaderBarComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: HeaderBarComponent, selectors: [["cut-header-bar"]], inputs: { title: "title", isSolicitor: "isSolicitor", username: "username" }, outputs: { signOutRequest: "signOutRequest" }, ngContentSelectors: _c1$r, decls: 17, vars: 14, consts: [["role", "banner", "id", "global-header", 1, "with-proposition"], [1, "header-wrapper"], [1, "header-global"], [4, "ngIf"], ["class", "global-header", 4, "ngIf"], [1, "header-proposition"], [1, "content"], ["href", "#proposition-links", 1, "js-header-toggle", "menu"], ["id", "proposition-menu", 4, "ngIf"], [1, "proposition-right"], ["id", "user-name"], ["id", "sign-out", "href", "javascript:void(0)", 3, "click"], ["href", "https://www.gov.uk", "title", "Go to the GOV.UK homepage", "id", "logo", 1, "content", 2, "margin-left", "0px"], ["src", "/img/gov.uk_logotype_crown_invert_trans.png?0.23.0", "width", "36", "height", "32", "alt", ""], [1, "global-header"], [1, "title"], ["id", "proposition-menu"], [1, "title-solicitor"], ["id", "proposition-name"]], template: function HeaderBarComponent_Template(rf, ctx) {
+    HeaderBarComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: HeaderBarComponent, selectors: [["cut-header-bar"]], inputs: { title: "title", isSolicitor: "isSolicitor", username: "username" }, outputs: { signOutRequest: "signOutRequest" }, ngContentSelectors: _c1$s, decls: 17, vars: 14, consts: [["role", "banner", "id", "global-header", 1, "with-proposition"], [1, "header-wrapper"], [1, "header-global"], [4, "ngIf"], ["class", "global-header", 4, "ngIf"], [1, "header-proposition"], [1, "content"], ["href", "#proposition-links", 1, "js-header-toggle", "menu"], ["id", "proposition-menu", 4, "ngIf"], [1, "proposition-right"], ["id", "user-name"], ["id", "sign-out", "href", "javascript:void(0)", 3, "click"], ["href", "https://www.gov.uk", "title", "Go to the GOV.UK homepage", "id", "logo", 1, "content", 2, "margin-left", "0px"], ["src", "/img/gov.uk_logotype_crown_invert_trans.png?0.23.0", "width", "36", "height", "32", "alt", ""], [1, "global-header"], [1, "title"], ["id", "proposition-menu"], [1, "title-solicitor"], ["id", "proposition-name"]], template: function HeaderBarComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵprojectionDef(_c0$11);
                 i0__namespace.ɵɵelementStart(0, "header", 0);
@@ -321,14 +321,14 @@
     })();
 
     var _c0$10 = [[["", "leftNavLinks", ""]], [["", "rightNavLinks", ""]]];
-    var _c1$q = ["[leftNavLinks]", "[rightNavLinks]"];
+    var _c1$r = ["[leftNavLinks]", "[rightNavLinks]"];
     var NavigationComponent = /** @class */ (function () {
         function NavigationComponent() {
         }
         return NavigationComponent;
     }());
     NavigationComponent.ɵfac = function NavigationComponent_Factory(t) { return new (t || NavigationComponent)(); };
-    NavigationComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: NavigationComponent, selectors: [["cut-nav-bar"]], inputs: { isSolicitor: "isSolicitor" }, ngContentSelectors: _c1$q, decls: 4, vars: 2, consts: [[1, "cut-nav-bar"]], template: function NavigationComponent_Template(rf, ctx) {
+    NavigationComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: NavigationComponent, selectors: [["cut-nav-bar"]], inputs: { isSolicitor: "isSolicitor" }, ngContentSelectors: _c1$r, decls: 4, vars: 2, consts: [[1, "cut-nav-bar"]], template: function NavigationComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵprojectionDef(_c0$10);
                 i0__namespace.ɵɵelementStart(0, "div");
@@ -487,14 +487,14 @@
     })();
 
     var _c0$$ = [[["", "topBody", ""]], [["", "leftBody", ""]], [["", "rightBody", ""]]];
-    var _c1$p = ["[topBody]", "[leftBody]", "[rightBody]"];
+    var _c1$q = ["[topBody]", "[leftBody]", "[rightBody]"];
     var BodyComponent = /** @class */ (function () {
         function BodyComponent() {
         }
         return BodyComponent;
     }());
     BodyComponent.ɵfac = function BodyComponent_Factory(t) { return new (t || BodyComponent)(); };
-    BodyComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: BodyComponent, selectors: [["cut-body"]], ngContentSelectors: _c1$p, decls: 4, vars: 0, consts: [[1, "global-display"]], template: function BodyComponent_Template(rf, ctx) {
+    BodyComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: BodyComponent, selectors: [["cut-body"]], ngContentSelectors: _c1$q, decls: 4, vars: 0, consts: [[1, "global-display"]], template: function BodyComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵprojectionDef(_c0$$);
                 i0__namespace.ɵɵelementStart(0, "div", 0);
@@ -1683,14 +1683,14 @@
     })();
 
     var _c0$Y = function (a0) { return { "js-hidden": a0 }; };
-    var _c1$o = ["*"];
+    var _c1$p = ["*"];
     var TabComponent = /** @class */ (function () {
         function TabComponent() {
         }
         return TabComponent;
     }());
     TabComponent.ɵfac = function TabComponent_Factory(t) { return new (t || TabComponent)(); };
-    TabComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: TabComponent, selectors: [["cut-tab"]], inputs: { id: "id", title: "title", selected: "selected" }, ngContentSelectors: _c1$o, decls: 2, vars: 5, consts: [["role", "tabpanel", 1, "tabs-panel", 3, "id", "ngClass"]], template: function TabComponent_Template(rf, ctx) {
+    TabComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: TabComponent, selectors: [["cut-tab"]], inputs: { id: "id", title: "title", selected: "selected" }, ngContentSelectors: _c1$p, decls: 2, vars: 5, consts: [["role", "tabpanel", 1, "tabs-panel", 3, "id", "ngClass"]], template: function TabComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵprojectionDef();
                 i0__namespace.ɵɵelementStart(0, "div", 0);
@@ -1722,7 +1722,7 @@
     })();
 
     var _c0$X = ["tab"];
-    var _c1$n = function () { return ["."]; };
+    var _c1$o = function () { return ["."]; };
     var _c2$3 = function (a0) { return { "tabs-toggle-selected": a0 }; };
     function TabsComponent_li_2_Template(rf, ctx) {
         if (rf & 1) {
@@ -1738,7 +1738,7 @@
         if (rf & 2) {
             var panel_r1 = ctx.$implicit;
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("routerLink", i0__namespace.ɵɵpureFunction0(8, _c1$n))("fragment", panel_r1.id)("ngClass", i0__namespace.ɵɵpureFunction1(9, _c2$3, panel_r1.selected));
+            i0__namespace.ɵɵproperty("routerLink", i0__namespace.ɵɵpureFunction0(8, _c1$o))("fragment", panel_r1.id)("ngClass", i0__namespace.ɵɵpureFunction1(9, _c2$3, panel_r1.selected));
             i0__namespace.ɵɵattribute("aria-controls", panel_r1.id)("aria-selected", panel_r1.selected);
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 6, panel_r1.title));
@@ -4554,6 +4554,20 @@
             }
             return activeCount;
         };
+        FieldsUtils.getValidationErrorMessageForFlagLauncherCaseField = function (caseField) {
+            switch (caseField.display_context_parameter) {
+                case '#ARGUMENT(CREATE)':
+                    return 'Please select Next to complete the creation of the case flag';
+                case '#ARGUMENT(CREATE,EXTERNAL)':
+                    return 'Please select Next to complete the creation of the support request';
+                case '#ARGUMENT(UPDATE)':
+                    return 'Please select Next to complete the update of the selected case flag';
+                case '#ARGUMENT(UPDATE,EXTERNAL)':
+                    return 'Please select Next to complete the update of the selected support request';
+                default:
+                    return '';
+            }
+        };
         FieldsUtils.prototype.buildCanShowPredicate = function (eventTrigger, form) {
             var currentState = this.getCurrentEventState(eventTrigger, form);
             return function (page) {
@@ -9904,13 +9918,20 @@
     })();
 
     var ValidPageListCaseFieldsService = /** @class */ (function () {
-        function ValidPageListCaseFieldsService() {
+        function ValidPageListCaseFieldsService(fieldsUtils) {
+            this.fieldsUtils = fieldsUtils;
         }
-        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, data, notFromEventSubmit, fromPreviousPage) {
+        ValidPageListCaseFieldsService.prototype.isShown = function (page, eventTriggerFields, data) {
+            var fields = this.fieldsUtils
+                .mergeCaseFieldsAndFormFields(eventTriggerFields, data);
+            return page.parsedShowCondition.match(fields);
+        };
+        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, data, eventTriggerFields, fromPreviousPage) {
+            var _this = this;
             if (fromPreviousPage === void 0) { fromPreviousPage = false; }
             var validPageListCaseFields = [];
             validPageList.forEach(function (page) {
-                if (notFromEventSubmit || ShowCondition.getInstance(page.show_condition).match(data)) {
+                if (_this.isShown(page, eventTriggerFields, data)) {
                     page.case_fields.forEach(function (field) { return validPageListCaseFields.push(field); });
                 }
             });
@@ -9918,19 +9939,18 @@
                 Object.keys(data).forEach(function (key) {
                     if (validPageListCaseFields.findIndex(function (element) { return element.id === key; }) < 0) {
                         delete data[key];
-                        ;
                     }
                 });
             }
         };
         return ValidPageListCaseFieldsService;
     }());
-    ValidPageListCaseFieldsService.ɵfac = function ValidPageListCaseFieldsService_Factory(t) { return new (t || ValidPageListCaseFieldsService)(); };
+    ValidPageListCaseFieldsService.ɵfac = function ValidPageListCaseFieldsService_Factory(t) { return new (t || ValidPageListCaseFieldsService)(i0__namespace.ɵɵinject(FieldsUtils)); };
     ValidPageListCaseFieldsService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: ValidPageListCaseFieldsService, factory: ValidPageListCaseFieldsService.ɵfac });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ValidPageListCaseFieldsService, [{
                 type: i0.Injectable
-            }], null, null);
+            }], function () { return [{ type: FieldsUtils }]; }, null);
     })();
 
     var CaseEditComponent = /** @class */ (function () {
@@ -10122,7 +10142,7 @@
             // Remove "Launcher"-type fields (these have no values and are not intended to be persisted)
             this.formValueService.removeCaseFieldsOfType(caseEventData.data, eventTrigger.case_fields, ['FlagLauncher', 'ComponentLauncher']);
             // delete fields which are not part of the case event journey wizard pages case fields
-            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, false);
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, eventTrigger.case_fields, false);
             caseEventData.event_token = eventTrigger.event_token;
             caseEventData.ignore_warning = this.ignoreWarning;
             if (this.confirmation) {
@@ -11175,18 +11195,9 @@
                             });
                         }
                         else if (FieldsUtils.isCaseFieldOfType(casefield, ['FlagLauncher'])) {
-                            // Check whether the case field DisplayContextParameter is signalling "create" mode or "update" mode
-                            // (expected always to be one of the two), to set the correct error message
-                            var action = '';
-                            if (casefield.display_context_parameter === '#ARGUMENT(CREATE)') {
-                                action = 'creation';
-                            }
-                            else if (casefield.display_context_parameter === '#ARGUMENT(UPDATE)') {
-                                action = 'update';
-                            }
                             _this.validationErrors.push({
                                 id: id_1,
-                                message: "Please select Next to complete the " + action + " of the " + (action === 'update' ? 'selected ' : '') + "case flag"
+                                message: FieldsUtils.getValidationErrorMessageForFlagLauncherCaseField(casefield)
                             });
                         }
                         else {
@@ -11497,7 +11508,7 @@
             // Get hold of the CaseEventData.
             var caseEventData = this.formValueService.sanitise(formFields);
             // delete fields which are not part of the case event journey wizard pages case fields
-            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, true, fromPreviousPage);
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, this.eventTrigger.case_fields, fromPreviousPage);
             // Tidy it up before we return it.
             this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
             return caseEventData;
@@ -12148,7 +12159,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, "Enter the Postcode"));
         }
     }
-    var _c1$m = function (a0) { return { "form-group-error": a0 }; };
+    var _c1$n = function (a0) { return { "form-group-error": a0 }; };
     var _c2$2 = function (a0) { return { "govuk-input--error": a0 }; };
     function WriteAddressFieldComponent_div_1_div_5_Template(rf, ctx) {
         if (rf & 1) {
@@ -12171,7 +12182,7 @@
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("id", ctx_r2.createElementId("postcodeLookup"))("ngClass", i0__namespace.ɵɵpureFunction1(13, _c1$m, ctx_r2.missingPostcode));
+            i0__namespace.ɵɵproperty("id", ctx_r2.createElementId("postcodeLookup"))("ngClass", i0__namespace.ɵɵpureFunction1(13, _c1$n, ctx_r2.missingPostcode));
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("for", ctx_r2.createElementId("postcodeInput"));
             i0__namespace.ɵɵadvance(2);
@@ -12673,23 +12684,43 @@
     exports.AddCommentsErrorMessage = void 0;
     (function (AddCommentsErrorMessage) {
         AddCommentsErrorMessage["FLAG_COMMENTS_NOT_ENTERED"] = "Please enter comments for this flag";
+        AddCommentsErrorMessage["FLAG_COMMENTS_NOT_ENTERED_EXTERNAL"] = "Please enter comments for this support request";
         AddCommentsErrorMessage["FLAG_COMMENTS_CHAR_LIMIT_EXCEEDED"] = "Comments for this flag must be 200 characters or fewer";
     })(exports.AddCommentsErrorMessage || (exports.AddCommentsErrorMessage = {}));
 
     exports.AddCommentsStep = void 0;
     (function (AddCommentsStep) {
         AddCommentsStep["HINT_TEXT"] = "Explain why you are creating this flag. Do not include any sensitive information such as personal details.";
+        AddCommentsStep["HINT_TEXT_EXTERNAL"] = "Explain why you are creating this support request. Do not include any sensitive information such as personal details.";
         AddCommentsStep["CHARACTER_LIMIT_INFO"] = "You can enter up to 200 characters";
         AddCommentsStep["WARNING_TEXT"] = "The details entered here MAY be visible to the party in the future.";
     })(exports.AddCommentsStep || (exports.AddCommentsStep = {}));
 
+    exports.CaseFlagCheckYourAnswersPageStep = void 0;
+    (function (CaseFlagCheckYourAnswersPageStep) {
+        CaseFlagCheckYourAnswersPageStep["CASE_LEVEL_LOCATION"] = "Case level";
+        CaseFlagCheckYourAnswersPageStep["ADD_FLAG_HEADER_TEXT"] = "Add flag to";
+        CaseFlagCheckYourAnswersPageStep["ADD_FLAG_HEADER_TEXT_EXTERNAL"] = "Add support to";
+        CaseFlagCheckYourAnswersPageStep["UPDATE_FLAG_HEADER_TEXT"] = "Update flag for";
+        CaseFlagCheckYourAnswersPageStep["UPDATE_FLAG_HEADER_TEXT_EXTERNAL"] = "Update support for";
+        CaseFlagCheckYourAnswersPageStep["FLAG_TYPE_HEADER_TEXT"] = "Flag type";
+        CaseFlagCheckYourAnswersPageStep["FLAG_TYPE_HEADER_TEXT_EXTERNAL"] = "Support type";
+        CaseFlagCheckYourAnswersPageStep["NONE"] = "";
+    })(exports.CaseFlagCheckYourAnswersPageStep || (exports.CaseFlagCheckYourAnswersPageStep = {}));
+
+    /**
+     * Create and update contexts for external users are, by definition, part of Case Flags 2.1 - thus there is no enum
+     * value for these.
+     */
     exports.CaseFlagDisplayContextParameter = void 0;
     (function (CaseFlagDisplayContextParameter) {
         CaseFlagDisplayContextParameter["CREATE"] = "#ARGUMENT(CREATE)";
         CaseFlagDisplayContextParameter["CREATE_EXTERNAL"] = "#ARGUMENT(CREATE,EXTERNAL)";
+        CaseFlagDisplayContextParameter["CREATE_2_POINT_1"] = "#ARGUMENT(CREATE,VERSION2.1)";
         CaseFlagDisplayContextParameter["READ_EXTERNAL"] = "#ARGUMENT(READ,EXTERNAL)";
         CaseFlagDisplayContextParameter["UPDATE"] = "#ARGUMENT(UPDATE)";
         CaseFlagDisplayContextParameter["UPDATE_EXTERNAL"] = "#ARGUMENT(UPDATE,EXTERNAL)";
+        CaseFlagDisplayContextParameter["UPDATE_2_POINT_1"] = "#ARGUMENT(UPDATE,VERSION2.1)";
     })(exports.CaseFlagDisplayContextParameter || (exports.CaseFlagDisplayContextParameter = {}));
 
     exports.CaseFlagFormFields = void 0;
@@ -12716,6 +12747,9 @@
         CaseFlagWizardStepTitle["SELECT_FLAG_LOCATION"] = "Where should this flag be added?";
         CaseFlagWizardStepTitle["SELECT_FLAG_LOCATION_EXTERNAL"] = "Who is the support for?";
         CaseFlagWizardStepTitle["SELECT_CASE_FLAG"] = "Select flag type";
+        CaseFlagWizardStepTitle["SELECT_CASE_FLAG_EXTERNAL"] = "Select support type";
+        CaseFlagWizardStepTitle["OTHER_FLAG_TYPE_DESCRIPTION"] = "Enter a flag type";
+        CaseFlagWizardStepTitle["OTHER_FLAG_TYPE_DESCRIPTION_EXTERNAL"] = "Enter a support type";
         CaseFlagWizardStepTitle["ADD_FLAG_COMMENTS"] = "Add comments for this flag";
         CaseFlagWizardStepTitle["ADD_FLAG_COMMENTS_EXTERNAL_MODE"] = "Tell us more about the request";
         CaseFlagWizardStepTitle["CONFIRM_FLAG_STATUS"] = "Confirm the status of the flag";
@@ -12723,7 +12757,7 @@
         CaseFlagWizardStepTitle["MANAGE_CASE_FLAGS"] = "Manage case flags";
         CaseFlagWizardStepTitle["MANAGE_SUPPORT"] = "Which support is no longer needed?";
         CaseFlagWizardStepTitle["UPDATE_FLAG_TITLE"] = "Update flag";
-        CaseFlagWizardStepTitle["UPDATE_FLAG_TITLE_SUPPORT"] = "Tell us why the support is no longer needed";
+        CaseFlagWizardStepTitle["UPDATE_FLAG_TITLE_EXTERNAL"] = "Tell us why the support is no longer needed";
         CaseFlagWizardStepTitle["UPDATE_FLAG_ADD_TRANSLATION"] = "Add translations to flag";
         CaseFlagWizardStepTitle["NONE"] = "";
     })(exports.CaseFlagWizardStepTitle || (exports.CaseFlagWizardStepTitle = {}));
@@ -12771,8 +12805,10 @@
     exports.SelectFlagTypeErrorMessage = void 0;
     (function (SelectFlagTypeErrorMessage) {
         SelectFlagTypeErrorMessage["FLAG_TYPE_NOT_SELECTED"] = "Please select a flag type";
+        SelectFlagTypeErrorMessage["FLAG_TYPE_NOT_SELECTED_EXTERNAL"] = "Please select a support type";
         SelectFlagTypeErrorMessage["FLAG_TYPE_OPTION_NOT_SELECTED"] = "Select an option";
         SelectFlagTypeErrorMessage["FLAG_TYPE_NOT_ENTERED"] = "Please enter a flag type";
+        SelectFlagTypeErrorMessage["FLAG_TYPE_NOT_ENTERED_EXTERNAL"] = "Please enter a support type";
         SelectFlagTypeErrorMessage["FLAG_TYPE_LIMIT_EXCEEDED"] = "You can enter up to 80 characters only";
     })(exports.SelectFlagTypeErrorMessage || (exports.SelectFlagTypeErrorMessage = {}));
 
@@ -12793,14 +12829,18 @@
         UpdateFlagErrorMessage["FLAG_COMMENTS_NOT_ENTERED"] = "Please enter comments for this flag";
         UpdateFlagErrorMessage["FLAG_COMMENTS_CHAR_LIMIT_EXCEEDED"] = "Comments for this flag must be 200 characters or fewer";
         UpdateFlagErrorMessage["STATUS_REASON_NOT_ENTERED"] = "Comments and/or the name of the person approving the decision should be entered";
+        UpdateFlagErrorMessage["STATUS_REASON_NOT_ENTERED_EXTERNAL"] = "You must explain why the support is no longer needed";
         UpdateFlagErrorMessage["STATUS_REASON_CHAR_LIMIT_EXCEEDED"] = "Comments must be 200 characters or fewer";
+        UpdateFlagErrorMessage["NONE"] = "";
     })(exports.UpdateFlagErrorMessage || (exports.UpdateFlagErrorMessage = {}));
 
     exports.UpdateFlagStep = void 0;
     (function (UpdateFlagStep) {
-        UpdateFlagStep["COMMENT_HINT_TEXT"] = "Update the comments describing the user's support needs or flag description. Do not include any sensitive information such as personal details.";
+        UpdateFlagStep["COMMENT_HINT_TEXT_INTERNAL"] = "Explain why you are updating this flag. Do not include any sensitive information such as personal details.";
+        UpdateFlagStep["COMMENT_HINT_TEXT_INTERNAL_2_POINT_1"] = "Update the comments describing the user's support needs or flag description. Do not include any sensitive information such as personal details.";
+        UpdateFlagStep["COMMENT_HINT_TEXT_EXTERNAL"] = "Do not include any sensitive information such as personal details.";
         UpdateFlagStep["CHARACTER_LIMIT_INFO"] = "You can enter up to 200 characters";
-        UpdateFlagStep["STATUS_HINT_TEXT"] = "Describe reason for status change; if choosing 'Not approved' provide name of person approving decision.";
+        UpdateFlagStep["STATUS_HINT_TEXT"] = "Describe reason for status change.";
         UpdateFlagStep["WARNING_TEXT"] = "The details entered here MAY be visible to the party in the future.";
     })(exports.UpdateFlagStep || (exports.UpdateFlagStep = {}));
 
@@ -13050,6 +13090,7 @@
                     // The FlagLauncher component holds a reference (selectedFlagsLocation) containing the CaseField instance to
                     // which the new flag has been added
                     if ((flagLauncherComponent.caseField.display_context_parameter === exports.CaseFlagDisplayContextParameter.CREATE ||
+                        flagLauncherComponent.caseField.display_context_parameter === exports.CaseFlagDisplayContextParameter.CREATE_2_POINT_1 ||
                         flagLauncherComponent.caseField.display_context_parameter === exports.CaseFlagDisplayContextParameter.CREATE_EXTERNAL)
                         && flagLauncherComponent.selectedFlagsLocation) {
                         this.pathToFlagsFormGroup = flagLauncherComponent.selectedFlagsLocation.pathToFlagsFormGroup;
@@ -13058,6 +13099,7 @@
                         // Manage Case Flags journey
                     }
                     else if ((flagLauncherComponent.caseField.display_context_parameter === exports.CaseFlagDisplayContextParameter.UPDATE ||
+                        flagLauncherComponent.caseField.display_context_parameter === exports.CaseFlagDisplayContextParameter.UPDATE_2_POINT_1 ||
                         flagLauncherComponent.caseField.display_context_parameter === exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL) &&
                         flagLauncherComponent.selectedFlag) {
                         this.flagForSummaryDisplay =
@@ -13187,7 +13229,7 @@
         if (rf & 2) {
             var ctx_r8 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("formGroup", ctx_r8.caseFlagParentFormGroup)("jurisdiction", ctx_r8.jurisdiction)("caseTypeId", ctx_r8.caseTypeId)("hmctsServiceId", ctx_r8.hmctsServiceId)("isDisplayContextParameterExternal", ctx_r8.isDisplayContextParameterExternal)("selectedFlagsLocation", ctx_r8.selectedFlagsLocation);
+            i0__namespace.ɵɵproperty("formGroup", ctx_r8.caseFlagParentFormGroup)("jurisdiction", ctx_r8.jurisdiction)("caseTypeId", ctx_r8.caseTypeId)("hmctsServiceId", ctx_r8.hmctsServiceId)("isDisplayContextParameterExternal", ctx_r8.isDisplayContextParameterExternal)("isDisplayContextParameter2Point1Enabled", ctx_r8.isDisplayContextParameter2Point1Enabled)("selectedFlagsLocation", ctx_r8.selectedFlagsLocation);
         }
     }
     function WriteCaseFlagFieldComponent_div_1_ng_container_4_Template(rf, ctx) {
@@ -13217,7 +13259,7 @@
         if (rf & 2) {
             var ctx_r10 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("formGroup", ctx_r10.caseFlagParentFormGroup)("optional", ctx_r10.flagCommentsOptional)("isDisplayContextParameterExternal", ctx_r10.isDisplayContextParameterExternal);
+            i0__namespace.ɵɵproperty("formGroup", ctx_r10.caseFlagParentFormGroup)("optional", ctx_r10.flagCommentsOptional)("isDisplayContextParameterExternal", ctx_r10.isDisplayContextParameterExternal)("isDisplayContextParameter2Point1Enabled", ctx_r10.isDisplayContextParameter2Point1Enabled);
         }
     }
     function WriteCaseFlagFieldComponent_div_1_ng_container_6_Template(rf, ctx) {
@@ -13240,9 +13282,9 @@
             i0__namespace.ɵɵelementStart(0, "div", 8);
             i0__namespace.ɵɵelementStart(1, "div", 9);
             i0__namespace.ɵɵtemplate(2, WriteCaseFlagFieldComponent_div_1_ng_container_2_Template, 2, 3, "ng-container", 10);
-            i0__namespace.ɵɵtemplate(3, WriteCaseFlagFieldComponent_div_1_ng_container_3_Template, 2, 6, "ng-container", 10);
+            i0__namespace.ɵɵtemplate(3, WriteCaseFlagFieldComponent_div_1_ng_container_3_Template, 2, 7, "ng-container", 10);
             i0__namespace.ɵɵtemplate(4, WriteCaseFlagFieldComponent_div_1_ng_container_4_Template, 2, 2, "ng-container", 10);
-            i0__namespace.ɵɵtemplate(5, WriteCaseFlagFieldComponent_div_1_ng_container_5_Template, 2, 3, "ng-container", 10);
+            i0__namespace.ɵɵtemplate(5, WriteCaseFlagFieldComponent_div_1_ng_container_5_Template, 2, 4, "ng-container", 10);
             i0__namespace.ɵɵtemplate(6, WriteCaseFlagFieldComponent_div_1_ng_container_6_Template, 2, 2, "ng-container", 10);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -13432,6 +13474,8 @@
                     this.isDisplayContextParameterUpdate = this.setDisplayContextParameterUpdate(this.displayContextParameter);
                     // Set boolean indicating the display_context_parameter is "external"
                     this.isDisplayContextParameterExternal = this.setDisplayContextParameterExternal(this.displayContextParameter);
+                    // Set boolean indicating the display_context_parameter is Case Flags v2.1 enabled
+                    this.isDisplayContextParameter2Point1Enabled = this.setDisplayContextParameter2Point1Enabled(this.displayContextParameter);
                     // Set starting field state if fieldState not the right value
                     if (!this.fieldState) {
                         this.fieldState = this.isDisplayContextParameterUpdate ? exports.CaseFlagFieldState.FLAG_MANAGE_CASE_FLAGS : exports.CaseFlagFieldState.FLAG_LOCATION;
@@ -13447,12 +13491,17 @@
         };
         WriteCaseFlagFieldComponent.prototype.setDisplayContextParameterUpdate = function (displayContextParameter) {
             return displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE ||
-                displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL;
+                displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL ||
+                displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE_2_POINT_1;
         };
         WriteCaseFlagFieldComponent.prototype.setDisplayContextParameterExternal = function (displayContextParameter) {
             return displayContextParameter === exports.CaseFlagDisplayContextParameter.CREATE_EXTERNAL ||
                 displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL;
         };
+        WriteCaseFlagFieldComponent.prototype.setDisplayContextParameter2Point1Enabled = function (displayContextParameter) {
+            return displayContextParameter === exports.CaseFlagDisplayContextParameter.CREATE_2_POINT_1 ||
+                displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE_2_POINT_1;
+        };
         WriteCaseFlagFieldComponent.prototype.onCaseFlagStateEmitted = function (caseFlagState) {
             this.caseEditDataService.clearFormValidationErrors();
             this.errorMessages = caseFlagState.errorMessages;
@@ -13480,11 +13529,15 @@
                     caseFlagState.currentCaseFlagFieldState === exports.CaseFlagFieldState.FLAG_UPDATE;
             }
             // If the current state is one of:
-            // * CaseFlagFieldState.FLAG_STATUS
+            // * CaseFlagFieldState.FLAG_STATUS AND Case Flags v2.1 is enabled
+            // * CaseFlagFieldState.FLAG_COMMENTS AND Case Flags v2.1 is not enabled
             // * CaseFlagFieldState.FLAG_UPDATE and Welsh translation checkbox is not selected
             // * CaseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION
             // then move to final review stage
-            return caseFlagState.currentCaseFlagFieldState === exports.CaseFlagFieldState.FLAG_STATUS ||
+            return (caseFlagState.currentCaseFlagFieldState ===
+                exports.CaseFlagFieldState.FLAG_STATUS && this.isDisplayContextParameter2Point1Enabled) ||
+                (caseFlagState.currentCaseFlagFieldState ===
+                    exports.CaseFlagFieldState.FLAG_COMMENTS && !this.isDisplayContextParameter2Point1Enabled) ||
                 (caseFlagState.currentCaseFlagFieldState === exports.CaseFlagFieldState.FLAG_UPDATE &&
                     !((_a = this.caseFlagParentFormGroup.get(exports.CaseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED)) === null || _a === void 0 ? void 0 : _a.value)) ||
                 caseFlagState.currentCaseFlagFieldState === exports.CaseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION;
@@ -13510,7 +13563,7 @@
                     this.addFlagToCollection();
                     break;
                 case exports.CaseFlagFieldState.FLAG_COMMENTS:
-                    if (this.isDisplayContextParameterExternal) {
+                    if (this.isDisplayContextParameterExternal || !this.isDisplayContextParameter2Point1Enabled) {
                         this.addFlagToCollection();
                     }
                     break;
@@ -13725,7 +13778,9 @@
         WriteCaseFlagFieldComponent.prototype.isAtFinalState = function () {
             return this.isDisplayContextParameterUpdate
                 ? this.fieldState === this.manageFlagFinalState
-                : this.fieldState === exports.CaseFlagFieldState.FLAG_STATUS;
+                : !this.isDisplayContextParameter2Point1Enabled
+                    ? this.fieldState === exports.CaseFlagFieldState.FLAG_COMMENTS
+                    : this.fieldState === exports.CaseFlagFieldState.FLAG_STATUS;
         };
         WriteCaseFlagFieldComponent.prototype.navigateToErrorElement = function (elementId) {
             if (elementId) {
@@ -13767,8 +13822,12 @@
                 path: ((_f = formValues === null || formValues === void 0 ? void 0 : formValues.flagType) === null || _f === void 0 ? void 0 : _f.Path) && ((_g = formValues === null || formValues === void 0 ? void 0 : formValues.flagType) === null || _g === void 0 ? void 0 : _g.Path.map(function (pathValue) { return Object.assign({ id: null, value: pathValue }); })),
                 hearingRelevant: ((_h = formValues === null || formValues === void 0 ? void 0 : formValues.flagType) === null || _h === void 0 ? void 0 : _h.hearingRelevant) ? 'Yes' : 'No',
                 flagCode: (_j = formValues === null || formValues === void 0 ? void 0 : formValues.flagType) === null || _j === void 0 ? void 0 : _j.flagCode,
-                // Status should be set to whatever the default is for this flag type, if flag is being created by an external user
-                status: this.isDisplayContextParameterExternal ? (_k = formValues === null || formValues === void 0 ? void 0 : formValues.flagType) === null || _k === void 0 ? void 0 : _k.defaultStatus : exports.CaseFlagStatus[formValues === null || formValues === void 0 ? void 0 : formValues.selectedStatus],
+                // Status should be set to "Active" if Case Flags v2.1 is NOT enabled, otherwise it should be set to whatever
+                // the default is for this flag type, if flag is being created by an external user
+                status: !this.isDisplayContextParameter2Point1Enabled
+                    ? exports.CaseFlagStatus.ACTIVE
+                    : this.isDisplayContextParameterExternal
+                        ? (_k = formValues === null || formValues === void 0 ? void 0 : formValues.flagType) === null || _k === void 0 ? void 0 : _k.defaultStatus : exports.CaseFlagStatus[formValues === null || formValues === void 0 ? void 0 : formValues.selectedStatus],
                 availableExternally: ((_l = formValues === null || formValues === void 0 ? void 0 : formValues.flagType) === null || _l === void 0 ? void 0 : _l.externallyAvailable) ? 'Yes' : 'No'
             };
         };
@@ -13807,7 +13866,7 @@
         return WriteCaseFlagFieldComponent;
     }(AbstractFieldWriteComponent));
     WriteCaseFlagFieldComponent.ɵfac = function WriteCaseFlagFieldComponent_Factory(t) { return new (t || WriteCaseFlagFieldComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(CaseEditDataService), i0__namespace.ɵɵdirectiveInject(CaseFlagStateService), i0__namespace.ɵɵdirectiveInject(i1__namespace.RpxTranslationService)); };
-    WriteCaseFlagFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteCaseFlagFieldComponent, selectors: [["ccd-write-case-flag-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 3, vars: 3, consts: [["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], ["class", "form-group", 3, "formGroup", 4, "ngIf"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], ["class", "govuk-error-summary__body", 4, "ngFor", "ngForOf"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [1, "validation-error", 3, "click"], [1, "form-group", 3, "formGroup"], [1, "govuk-form-group", 3, "ngSwitch"], [4, "ngSwitchCase"], [3, "formGroup", "flagsData", "isDisplayContextParameterExternal", "caseFlagStateEmitter"], [3, "formGroup", "jurisdiction", "caseTypeId", "hmctsServiceId", "isDisplayContextParameterExternal", "selectedFlagsLocation", "caseFlagStateEmitter", "flagCommentsOptionalEmitter"], [3, "formGroup", "flagType", "caseFlagStateEmitter"], [3, "formGroup", "optional", "isDisplayContextParameterExternal", "caseFlagStateEmitter"], [3, "formGroup", "defaultStatus", "caseFlagStateEmitter"], [3, "formGroup", "flagsData", "caseTitle", "displayContextParameter", "caseFlagStateEmitter"], [3, "formGroup", "displayContextParameter", "caseFlagStateEmitter"], [3, "formGroup", "caseFlagStateEmitter"]], template: function WriteCaseFlagFieldComponent_Template(rf, ctx) {
+    WriteCaseFlagFieldComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: WriteCaseFlagFieldComponent, selectors: [["ccd-write-case-flag-field"]], features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 3, vars: 3, consts: [["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], ["class", "form-group", 3, "formGroup", 4, "ngIf"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], ["class", "govuk-error-summary__body", 4, "ngFor", "ngForOf"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [1, "validation-error", 3, "click"], [1, "form-group", 3, "formGroup"], [1, "govuk-form-group", 3, "ngSwitch"], [4, "ngSwitchCase"], [3, "formGroup", "flagsData", "isDisplayContextParameterExternal", "caseFlagStateEmitter"], [3, "formGroup", "jurisdiction", "caseTypeId", "hmctsServiceId", "isDisplayContextParameterExternal", "isDisplayContextParameter2Point1Enabled", "selectedFlagsLocation", "caseFlagStateEmitter", "flagCommentsOptionalEmitter"], [3, "formGroup", "flagType", "caseFlagStateEmitter"], [3, "formGroup", "optional", "isDisplayContextParameterExternal", "isDisplayContextParameter2Point1Enabled", "caseFlagStateEmitter"], [3, "formGroup", "defaultStatus", "caseFlagStateEmitter"], [3, "formGroup", "flagsData", "caseTitle", "displayContextParameter", "caseFlagStateEmitter"], [3, "formGroup", "displayContextParameter", "caseFlagStateEmitter"], [3, "formGroup", "caseFlagStateEmitter"]], template: function WriteCaseFlagFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, WriteCaseFlagFieldComponent_div_0_Template, 5, 4, "div", 0);
                 i0__namespace.ɵɵtemplate(1, WriteCaseFlagFieldComponent_div_1_Template, 7, 7, "div", 1);
@@ -13955,7 +14014,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind2(3, 3, ctx_r2.caseReferenceControl.errors, ctx_r2.caseField.label)), " ");
         }
     }
-    var _c1$l = function (a0) { return { "form-group-error": a0 }; };
+    var _c1$m = function (a0) { return { "form-group-error": a0 }; };
     var WriteCaseLinkFieldComponent = /** @class */ (function (_super) {
         __extends(WriteCaseLinkFieldComponent, _super);
         function WriteCaseLinkFieldComponent() {
@@ -14039,7 +14098,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c1$l, !ctx.caseReferenceControl.valid && (ctx.caseReferenceControl.dirty || ctx.caseReferenceControl.touched)));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c1$m, !ctx.caseReferenceControl.valid && (ctx.caseReferenceControl.dirty || ctx.caseReferenceControl.touched)));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -14084,7 +14143,7 @@
             i0__namespace.ɵɵproperty("caseField", i0__namespace.ɵɵpureFunction6(3, _c0$R, ctx_r1.caseField.label, ctx_r1.caseField.label, ctx_r1.caseField.field_type.collection_field_type, ctx_r1.caseField.display_context_parameter, ctx_r1.caseField.value, ctx_r1.caseField.hidden))("context", ctx_r1.context)("topLevelFormGroup", ctx_r1.topLevelFormGroup);
         }
     }
-    var _c1$k = function (a0, a1, a2, a3, a4) { return { id: a0, label: a1, field_type: a2, value: a3, hidden: a4 }; };
+    var _c1$l = function (a0, a1, a2, a3, a4) { return { id: a0, label: a1, field_type: a2, value: a3, hidden: a4 }; };
     function ReadCollectionFieldComponent_table_0_tbody_3_tr_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "tr");
@@ -14098,7 +14157,7 @@
             var i_r5 = ctx.index;
             var ctx_r3 = i0__namespace.ɵɵnextContext(3);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("caseField", i0__namespace.ɵɵpureFunction5(4, _c1$k, i_r5, ctx_r3.caseField.label + " " + (i_r5 + 1), ctx_r3.caseField.field_type.collection_field_type, item_r4.value, ctx_r3.caseField.hidden))("context", ctx_r3.context)("topLevelFormGroup", ctx_r3.topLevelFormGroup)("idPrefix", ctx_r3.buildIdPrefix(i_r5));
+            i0__namespace.ɵɵproperty("caseField", i0__namespace.ɵɵpureFunction5(4, _c1$l, i_r5, ctx_r3.caseField.label + " " + (i_r5 + 1), ctx_r3.caseField.field_type.collection_field_type, item_r4.value, ctx_r3.caseField.hidden))("context", ctx_r3.context)("topLevelFormGroup", ctx_r3.topLevelFormGroup)("idPrefix", ctx_r3.buildIdPrefix(i_r5));
         }
     }
     function ReadCollectionFieldComponent_table_0_tbody_3_Template(rf, ctx) {
@@ -15426,7 +15485,7 @@
             i0__namespace.ɵɵproperty("caseField", ctx_r2.caseField);
         }
     }
-    var _c1$j = function (a0) { return { "form-group-error bottom-30": a0 }; };
+    var _c1$k = function (a0) { return { "form-group-error bottom-30": a0 }; };
     var WriteDocumentFieldComponent = /** @class */ (function (_super) {
         __extends(WriteDocumentFieldComponent, _super);
         function WriteDocumentFieldComponent(appConfig, caseNotifier, documentManagement, dialog, fileUploadStateService, jurisdictionService) {
@@ -15748,7 +15807,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(20, _c1$j, !ctx.valid));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(20, _c1$k, !ctx.valid));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -16453,7 +16512,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 7, radioButton_r5.label));
         }
     }
-    var _c1$i = function (a0) { return { "form-group-error": a0 }; };
+    var _c1$j = function (a0) { return { "form-group-error": a0 }; };
     var WriteDynamicRadioListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteDynamicRadioListFieldComponent, _super);
         function WriteDynamicRadioListFieldComponent() {
@@ -16500,7 +16559,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c1$i, !ctx.dynamicRadioListControl.valid && ctx.dynamicRadioListControl.dirty))("id", ctx.id());
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c1$j, !ctx.dynamicRadioListControl.valid && ctx.dynamicRadioListControl.dirty))("id", ctx.id());
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -16611,7 +16670,7 @@
         }
     }
     var _c0$L = function (a0) { return { "form-group-error": a0 }; };
-    var _c1$h = function (a0) { return { "govuk-input--error": a0 }; };
+    var _c1$i = function (a0) { return { "govuk-input--error": a0 }; };
     var WriteEmailFieldComponent = /** @class */ (function (_super) {
         __extends(WriteEmailFieldComponent, _super);
         function WriteEmailFieldComponent() {
@@ -16645,7 +16704,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.emailControl.errors && (ctx.emailControl.dirty || ctx.emailControl.touched));
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$h, ctx.emailControl.errors && (ctx.emailControl.dirty || ctx.emailControl.touched)))("id", ctx.id())("formControl", ctx.emailControl);
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$i, ctx.emailControl.errors && (ctx.emailControl.dirty || ctx.emailControl.touched)))("id", ctx.id())("formControl", ctx.emailControl);
             }
         }, directives: [i5__namespace.NgClass, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlDirective], pipes: [i1__namespace.RpxTranslatePipe, FieldLabelPipe, FirstErrorPipe], encapsulation: 2 });
     var ɵWriteEmailFieldComponent_BaseFactory = /*@__PURE__*/ i0__namespace.ɵɵgetInheritedFactory(WriteEmailFieldComponent);
@@ -16940,7 +16999,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 7, radioButton_r4.label));
         }
     }
-    var _c1$g = function (a0) { return { "form-group-error": a0 }; };
+    var _c1$h = function (a0) { return { "form-group-error": a0 }; };
     var WriteFixedRadioListFieldComponent = /** @class */ (function (_super) {
         __extends(WriteFixedRadioListFieldComponent, _super);
         function WriteFixedRadioListFieldComponent() {
@@ -16971,7 +17030,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c1$g, !ctx.fixedRadioListControl.valid && (ctx.fixedRadioListControl.dirty || ctx.fixedRadioListControl.touched)))("id", ctx.id());
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(7, _c1$h, !ctx.fixedRadioListControl.valid && (ctx.fixedRadioListControl.dirty || ctx.fixedRadioListControl.touched)))("id", ctx.id());
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -17145,7 +17204,7 @@
             i0__namespace.ɵɵelementEnd();
         }
     }
-    var _c1$f = function (a0) { return { "form-group-error": a0 }; };
+    var _c1$g = function (a0) { return { "form-group-error": a0 }; };
     var WriteJudicialUserFieldComponent = /** @class */ (function (_super) {
         __extends(WriteJudicialUserFieldComponent, _super);
         function WriteJudicialUserFieldComponent(jurisdictionService, sessionStorageService, caseFlagRefDataService, compoundPipe, validatorsService) {
@@ -17307,7 +17366,7 @@
             }
             if (rf & 2) {
                 var _r3 = i0__namespace.ɵɵreference(7);
-                i0__namespace.ɵɵproperty("formGroup", ctx.formGroup)("ngClass", i0__namespace.ɵɵpureFunction1(15, _c1$f, !!ctx.judicialUserControl && ctx.errors));
+                i0__namespace.ɵɵproperty("formGroup", ctx.formGroup)("ngClass", i0__namespace.ɵɵpureFunction1(15, _c1$g, !!ctx.judicialUserControl && ctx.errors));
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.id());
                 i0__namespace.ɵɵadvance(1);
@@ -18174,7 +18233,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, reason_r19));
         }
     }
-    var _c1$e = function (a0) { return { "table-group-error": a0 }; };
+    var _c1$f = function (a0) { return { "table-group-error": a0 }; };
     function LinkCasesComponent_tr_31_Template(rf, ctx) {
         if (rf & 1) {
             var _r21_1 = i0__namespace.ɵɵgetCurrentView();
@@ -18212,7 +18271,7 @@
             var case_r16 = ctx.$implicit;
             var ctx_r2 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(12, _c1$e, ctx_r2.caseSelectionError && case_r16.caseReference === ctx_r2.linkCaseForm.value.caseNumber));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(12, _c1$f, ctx_r2.caseSelectionError && case_r16.caseReference === ctx_r2.linkCaseForm.value.caseNumber));
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate1("", case_r16.caseName, " ");
             i0__namespace.ɵɵadvance(2);
@@ -20518,7 +20577,7 @@
         }
     }
     var _c0$D = function (a0) { return { "form-group-error": a0 }; };
-    var _c1$d = function (a0) { return { "govuk-input--error": a0 }; };
+    var _c1$e = function (a0) { return { "govuk-input--error": a0 }; };
     var WriteNumberFieldComponent = /** @class */ (function (_super) {
         __extends(WriteNumberFieldComponent, _super);
         function WriteNumberFieldComponent() {
@@ -20552,7 +20611,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.numberControl.errors && ctx.numberControl.dirty);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$d, ctx.numberControl.errors && ctx.numberControl.dirty))("id", ctx.id())("formControl", ctx.numberControl);
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$e, ctx.numberControl.errors && ctx.numberControl.dirty))("id", ctx.id())("formControl", ctx.numberControl);
             }
         }, directives: [i5__namespace.NgClass, i5__namespace.NgIf, i3__namespace.NumberValueAccessor, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlDirective], pipes: [i1__namespace.RpxTranslatePipe, FieldLabelPipe, FirstErrorPipe], encapsulation: 2 });
     var ɵWriteNumberFieldComponent_BaseFactory = /*@__PURE__*/ i0__namespace.ɵɵgetInheritedFactory(WriteNumberFieldComponent);
@@ -21396,7 +21455,7 @@
         }
     }
     var _c0$B = function (a0) { return { "form-group-error": a0 }; };
-    var _c1$c = function (a0) { return { "govuk-input--error": a0 }; };
+    var _c1$d = function (a0) { return { "govuk-input--error": a0 }; };
     var WritePhoneUKFieldComponent = /** @class */ (function (_super) {
         __extends(WritePhoneUKFieldComponent, _super);
         function WritePhoneUKFieldComponent() {
@@ -21430,7 +21489,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.phoneUkControl.errors && (ctx.phoneUkControl.dirty || ctx.phoneUkControl.touched));
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$c, ctx.phoneUkControl.errors && ctx.phoneUkControl.dirty))("id", ctx.id())("formControl", ctx.phoneUkControl);
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$d, ctx.phoneUkControl.errors && ctx.phoneUkControl.dirty))("id", ctx.id())("formControl", ctx.phoneUkControl);
             }
         }, directives: [i5__namespace.NgClass, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlDirective], pipes: [i1__namespace.RpxTranslatePipe, FieldLabelPipe, FirstErrorPipe], encapsulation: 2 });
     var ɵWritePhoneUKFieldComponent_BaseFactory = /*@__PURE__*/ i0__namespace.ɵɵgetInheritedFactory(WritePhoneUKFieldComponent);
@@ -21732,11 +21791,11 @@
         QualifyingQuestionsErrorMessage["SELECT_AN_OPTION"] = "Select an option";
     })(exports.QualifyingQuestionsErrorMessage || (exports.QualifyingQuestionsErrorMessage = {}));
 
-    function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_7_Template(rf, ctx) {
+    function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_10_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "p", 7);
-            i0__namespace.ɵɵelementStart(2, "span", 8);
+            i0__namespace.ɵɵelementStart(1, "p", 8);
+            i0__namespace.ɵɵelementStart(2, "span", 9);
             i0__namespace.ɵɵtext(3);
             i0__namespace.ɵɵpipe(4, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21753,23 +21812,52 @@
             i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(6, 4, ctx_r1.qualifyingQuestionsErrorMessage.SELECT_AN_OPTION), " ");
         }
     }
-    function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_9_ng_container_1_Template(rf, ctx) {
+    function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_12_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelement(1, "hr");
+            i0__namespace.ɵɵelementStart(1, "div", 14);
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵpipe(3, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
+        if (rf & 2) {
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 1, "or"));
+        }
+    }
+    function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_12_div_7_Template(rf, ctx) {
+        if (rf & 1) {
+            var _r8_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "div", 15);
+            i0__namespace.ɵɵtext(1);
+            i0__namespace.ɵɵpipe(2, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(3, "a", 16);
+            i0__namespace.ɵɵlistener("click", function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_12_div_7_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r8_1); var ctx_r7 = i0__namespace.ɵɵnextContext(3); return ctx_r7.click(); });
+            i0__namespace.ɵɵtext(4);
+            i0__namespace.ɵɵpipe(5, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtext(6, ".) ");
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "(To reply to an existing query"), " ");
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(5, 4, "click here"));
+        }
     }
-    function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_9_Template(rf, ctx) {
+    function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_12_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_9_ng_container_1_Template, 2, 0, "ng-container", 0);
-            i0__namespace.ɵɵelementStart(2, "div", 9);
-            i0__namespace.ɵɵelement(3, "input", 10);
-            i0__namespace.ɵɵelementStart(4, "label", 11);
+            i0__namespace.ɵɵtemplate(1, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_12_ng_container_1_Template, 4, 3, "ng-container", 0);
+            i0__namespace.ɵɵelementStart(2, "div", 10);
+            i0__namespace.ɵɵelement(3, "input", 11);
+            i0__namespace.ɵɵelementStart(4, "label", 12);
             i0__namespace.ɵɵtext(5);
             i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(7, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_12_div_7_Template, 7, 6, "div", 13);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
@@ -21785,7 +21873,9 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("for", qualifyingQuestion_r3.name);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(6, 6, qualifyingQuestion_r3.name));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(6, 7, qualifyingQuestion_r3.name));
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵproperty("ngIf", isLast_r4);
         }
     }
     function QualifyingQuestionOptionsComponent_ng_container_0_Template(rf, ctx) {
@@ -21799,10 +21889,14 @@
             i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(7, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_7_Template, 7, 6, "ng-container", 0);
-            i0__namespace.ɵɵelementStart(8, "div", 5);
-            i0__namespace.ɵɵtemplate(9, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_9_Template, 7, 8, "ng-container", 6);
-            i0__namespace.ɵɵpipe(10, "async");
+            i0__namespace.ɵɵelementStart(7, "h2", 5);
+            i0__namespace.ɵɵtext(8);
+            i0__namespace.ɵɵpipe(9, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(10, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_10_Template, 7, 6, "ng-container", 0);
+            i0__namespace.ɵɵelementStart(11, "div", 6);
+            i0__namespace.ɵɵtemplate(12, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_12_Template, 8, 9, "ng-container", 7);
+            i0__namespace.ɵɵpipe(13, "async");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -21813,17 +21907,27 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵclassProp("govuk-form-group--error", ctx_r0.displayError);
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(6, 5, "Are you contacting us about any of the following:"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(6, 6, "Raise a new query"), " ");
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(9, 8, "Select the type of query you are raising:"), " ");
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.displayError);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(10, 7, ctx_r0.qualifyingQuestions$));
+            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(13, 10, ctx_r0.qualifyingQuestions$));
         }
     }
     var QualifyingQuestionOptionsComponent = /** @class */ (function () {
-        function QualifyingQuestionOptionsComponent() {
+        function QualifyingQuestionOptionsComponent(route, router) {
+            this.route = route;
+            this.router = router;
             this.qualifyingQuestionsErrorMessage = exports.QualifyingQuestionsErrorMessage;
         }
+        QualifyingQuestionOptionsComponent.prototype.ngOnInit = function () {
+            this.caseId = this.route.snapshot.params.cid;
+        };
+        QualifyingQuestionOptionsComponent.prototype.click = function () {
+            this.router.navigate(['cases', 'case-details', this.caseId], { fragment: 'Queries' });
+        };
         Object.defineProperty(QualifyingQuestionOptionsComponent.prototype, "displayError", {
             get: function () {
                 return this.qualifyingQuestionsControl.touched && this.qualifyingQuestionsControl.hasError('required');
@@ -21833,10 +21937,10 @@
         });
         return QualifyingQuestionOptionsComponent;
     }());
-    QualifyingQuestionOptionsComponent.ɵfac = function QualifyingQuestionOptionsComponent_Factory(t) { return new (t || QualifyingQuestionOptionsComponent)(); };
-    QualifyingQuestionOptionsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QualifyingQuestionOptionsComponent, selectors: [["ccd-qualifying-question-options"]], inputs: { qualifyingQuestionsControl: "qualifyingQuestionsControl", qualifyingQuestions$: "qualifyingQuestions$" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-form-group"], [1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--l"], [1, "govuk-fieldset__heading"], ["data-module", "govuk-radios", 1, "govuk-radios"], [4, "ngFor", "ngForOf"], [1, "govuk-error-message"], [1, "govuk-visually-hidden"], [1, "govuk-radios__item"], ["name", "qualifyingQuestionOption", "type", "radio", 1, "govuk-radios__input", 3, "id", "formControl", "value"], [1, "govuk-label", "govuk-radios__label", 3, "for"]], template: function QualifyingQuestionOptionsComponent_Template(rf, ctx) {
+    QualifyingQuestionOptionsComponent.ɵfac = function QualifyingQuestionOptionsComponent_Factory(t) { return new (t || QualifyingQuestionOptionsComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router)); };
+    QualifyingQuestionOptionsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QualifyingQuestionOptionsComponent, selectors: [["ccd-qualifying-question-options"]], inputs: { qualifyingQuestionsControl: "qualifyingQuestionsControl", qualifyingQuestions$: "qualifyingQuestions$" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-form-group"], [1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--l"], [1, "govuk-fieldset__heading"], [1, "govuk-heading-m", "govuk-!-margin-top-10"], ["data-module", "govuk-radios", 1, "govuk-radios"], [4, "ngFor", "ngForOf"], [1, "govuk-error-message"], [1, "govuk-visually-hidden"], [1, "govuk-radios__item"], ["name", "qualifyingQuestionOption", "type", "radio", 1, "govuk-radios__input", 3, "id", "formControl", "value"], [1, "govuk-label", "govuk-radios__label", 3, "for"], ["class", "govuk-hint govuk-radios__hint", 4, "ngIf"], [1, "govuk-radios__divider"], [1, "govuk-hint", "govuk-radios__hint"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"]], template: function QualifyingQuestionOptionsComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, QualifyingQuestionOptionsComponent_ng_container_0_Template, 11, 9, "ng-container", 0);
+                i0__namespace.ɵɵtemplate(0, QualifyingQuestionOptionsComponent_ng_container_0_Template, 14, 12, "ng-container", 0);
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", ctx.qualifyingQuestionsControl);
@@ -21849,7 +21953,7 @@
                         selector: 'ccd-qualifying-question-options',
                         templateUrl: './qualifying-question-options.component.html'
                     }]
-            }], null, { qualifyingQuestionsControl: [{
+            }], function () { return [{ type: i1__namespace$1.ActivatedRoute }, { type: i1__namespace$1.Router }]; }, { qualifyingQuestionsControl: [{
                     type: i0.Input
                 }], qualifyingQuestions$: [{
                     type: i0.Input
@@ -23891,7 +23995,7 @@
         }
     }
     var _c0$y = function (a0) { return { "form-group-error": a0 }; };
-    var _c1$b = function (a0) { return { "govuk-textarea--error": a0 }; };
+    var _c1$c = function (a0) { return { "govuk-textarea--error": a0 }; };
     var WriteTextAreaFieldComponent = /** @class */ (function (_super) {
         __extends(WriteTextAreaFieldComponent, _super);
         function WriteTextAreaFieldComponent(browserService) {
@@ -23936,7 +24040,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.textareaControl.errors && (ctx.textareaControl.dirty || ctx.textareaControl.touched));
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$b, ctx.textareaControl.errors && (ctx.textareaControl.dirty || ctx.textareaControl.touched)))("id", ctx.id())("formControl", ctx.textareaControl);
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$c, ctx.textareaControl.errors && (ctx.textareaControl.dirty || ctx.textareaControl.touched)))("id", ctx.id())("formControl", ctx.textareaControl);
             }
         }, directives: [i5__namespace.NgClass, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlDirective], pipes: [i1__namespace.RpxTranslatePipe, FieldLabelPipe, FirstErrorPipe], encapsulation: 2 });
     (function () {
@@ -24023,7 +24127,7 @@
         }
     }
     var _c0$x = function (a0) { return { "form-group-error": a0 }; };
-    var _c1$a = function (a0) { return { "govuk-input--error": a0 }; };
+    var _c1$b = function (a0) { return { "govuk-input--error": a0 }; };
     var WriteTextFieldComponent = /** @class */ (function (_super) {
         __extends(WriteTextFieldComponent, _super);
         function WriteTextFieldComponent() {
@@ -24062,7 +24166,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", (ctx.textControl == null ? null : ctx.textControl.errors) && (ctx.textControl.dirty || ctx.textControl.touched));
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$a, (ctx.textControl == null ? null : ctx.textControl.errors) && (ctx.textControl.dirty || ctx.textControl.touched)))("id", ctx.id())("formControl", ctx.textControl);
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(10, _c1$b, (ctx.textControl == null ? null : ctx.textControl.errors) && (ctx.textControl.dirty || ctx.textControl.touched)))("id", ctx.id())("formControl", ctx.textControl);
             }
         }, directives: [i5__namespace.NgClass, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlDirective], pipes: [i1__namespace.RpxTranslatePipe, FieldLabelPipe, FirstErrorPipe], encapsulation: 2 });
     var ɵWriteTextFieldComponent_BaseFactory = /*@__PURE__*/ i0__namespace.ɵɵgetInheritedFactory(WriteTextFieldComponent);
@@ -24290,7 +24394,7 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 8, value_r4));
         }
     }
-    var _c1$9 = function (a0) { return { "form-group-error": a0 }; };
+    var _c1$a = function (a0) { return { "form-group-error": a0 }; };
     var WriteYesNoFieldComponent = /** @class */ (function (_super) {
         __extends(WriteYesNoFieldComponent, _super);
         function WriteYesNoFieldComponent(yesNoService) {
@@ -24321,7 +24425,7 @@
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("id", ctx.id())("ngClass", i0__namespace.ɵɵpureFunction1(7, _c1$9, !ctx.yesNoControl.valid && (ctx.yesNoControl.dirty || ctx.yesNoControl.touched)));
+                i0__namespace.ɵɵproperty("id", ctx.id())("ngClass", i0__namespace.ɵɵpureFunction1(7, _c1$a, !ctx.yesNoControl.valid && (ctx.yesNoControl.dirty || ctx.yesNoControl.touched)));
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("ngIf", ctx.caseField.label);
                 i0__namespace.ɵɵadvance(1);
@@ -24752,7 +24856,7 @@
             i0__namespace.ɵɵelementContainer(0);
         }
     }
-    var _c1$8 = function (a0, a1) { return { cat: a0, level: a1 }; };
+    var _c1$9 = function (a0, a1) { return { cat: a0, level: a1 }; };
     function CaseFileViewFolderSelectorComponent_ng_template_12_ng_container_5_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
@@ -24765,7 +24869,7 @@
             i0__namespace.ɵɵnextContext();
             var _r1 = i0__namespace.ɵɵreference(13);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngTemplateOutlet", _r1)("ngTemplateOutletContext", i0__namespace.ɵɵpureFunction2(2, _c1$8, subcat_r8, level_r6 + 1));
+            i0__namespace.ɵɵproperty("ngTemplateOutlet", _r1)("ngTemplateOutletContext", i0__namespace.ɵɵpureFunction2(2, _c1$9, subcat_r8, level_r6 + 1));
         }
     }
     function CaseFileViewFolderSelectorComponent_ng_template_12_Template(rf, ctx) {
@@ -24987,7 +25091,7 @@
         }
     }
     var _c0$r = [[["", "trigger", ""]]];
-    var _c1$7 = ["[trigger]"];
+    var _c1$8 = ["[trigger]"];
     var CaseFileViewOverlayMenuComponent = /** @class */ (function () {
         function CaseFileViewOverlayMenuComponent() {
             this.title = '';
@@ -25002,7 +25106,7 @@
         return CaseFileViewOverlayMenuComponent;
     }());
     CaseFileViewOverlayMenuComponent.ɵfac = function CaseFileViewOverlayMenuComponent_Factory(t) { return new (t || CaseFileViewOverlayMenuComponent)(); };
-    CaseFileViewOverlayMenuComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFileViewOverlayMenuComponent, selectors: [["ccd-case-file-view-overlay-menu"]], inputs: { title: "title", menuItems: "menuItems", isOpen: "isOpen" }, outputs: { isOpenChange: "isOpenChange" }, ngContentSelectors: _c1$7, decls: 5, vars: 4, consts: [["type", "button", "cdkOverlayOrigin", "", 1, "overlay-toggle", 3, "click"], ["trigger", "cdkOverlayOrigin"], ["cdkConnectedOverlay", "", 3, "cdkConnectedOverlayOrigin", "cdkConnectedOverlayOpen", "cdkConnectedOverlayHasBackdrop", "cdkConnectedOverlayBackdropClass", "backdropClick"], [1, "overlay-menu"], [4, "ngIf"], [4, "ngFor", "ngForOf"], [1, "overlay-menu__title"], [1, "overlay-menu__item", 3, "click"], ["class", "overlay-menu__itemIcon", 3, "src", "alt", 4, "ngIf"], [1, "overlay-menu__actionText"], [1, "overlay-menu__itemIcon", 3, "src", "alt"]], template: function CaseFileViewOverlayMenuComponent_Template(rf, ctx) {
+    CaseFileViewOverlayMenuComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFileViewOverlayMenuComponent, selectors: [["ccd-case-file-view-overlay-menu"]], inputs: { title: "title", menuItems: "menuItems", isOpen: "isOpen" }, outputs: { isOpenChange: "isOpenChange" }, ngContentSelectors: _c1$8, decls: 5, vars: 4, consts: [["type", "button", "cdkOverlayOrigin", "", 1, "overlay-toggle", 3, "click"], ["trigger", "cdkOverlayOrigin"], ["cdkConnectedOverlay", "", 3, "cdkConnectedOverlayOrigin", "cdkConnectedOverlayOpen", "cdkConnectedOverlayHasBackdrop", "cdkConnectedOverlayBackdropClass", "backdropClick"], [1, "overlay-menu"], [4, "ngIf"], [4, "ngFor", "ngForOf"], [1, "overlay-menu__title"], [1, "overlay-menu__item", 3, "click"], ["class", "overlay-menu__itemIcon", 3, "src", "alt", 4, "ngIf"], [1, "overlay-menu__actionText"], [1, "overlay-menu__itemIcon", 3, "src", "alt"]], template: function CaseFileViewOverlayMenuComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵprojectionDef(_c0$r);
                 i0__namespace.ɵɵelementStart(0, "div");
@@ -25703,6 +25807,7 @@
         function AddCommentsComponent() {
             this.optional = false;
             this.isDisplayContextParameterExternal = false;
+            this.isDisplayContextParameter2Point1Enabled = false;
             this.caseFlagStateEmitter = new i0.EventEmitter();
             this.errorMessages = [];
             this.flagCommentsNotEnteredErrorMessage = null;
@@ -25714,6 +25819,8 @@
         AddCommentsComponent.prototype.ngOnInit = function () {
             this.addCommentsTitle = !this.isDisplayContextParameterExternal ?
                 exports.CaseFlagWizardStepTitle.ADD_FLAG_COMMENTS : exports.CaseFlagWizardStepTitle.ADD_FLAG_COMMENTS_EXTERNAL_MODE;
+            this.addCommentsHint = !this.isDisplayContextParameterExternal ?
+                exports.AddCommentsStep.HINT_TEXT : exports.AddCommentsStep.HINT_TEXT_EXTERNAL;
             if (!this.formGroup.get(this.flagCommentsControlName)) {
                 this.formGroup.addControl(this.flagCommentsControlName, new i3.FormControl(''));
             }
@@ -25729,10 +25836,12 @@
             this.flagCommentsCharLimitErrorMessage = null;
             this.errorMessages = [];
             if (!this.optional && !this.formGroup.get(this.flagCommentsControlName).value) {
-                this.flagCommentsNotEnteredErrorMessage = exports.AddCommentsErrorMessage.FLAG_COMMENTS_NOT_ENTERED;
+                this.flagCommentsNotEnteredErrorMessage = this.isDisplayContextParameterExternal
+                    ? exports.AddCommentsErrorMessage.FLAG_COMMENTS_NOT_ENTERED_EXTERNAL
+                    : exports.AddCommentsErrorMessage.FLAG_COMMENTS_NOT_ENTERED;
                 this.errorMessages.push({
                     title: '',
-                    description: exports.AddCommentsErrorMessage.FLAG_COMMENTS_NOT_ENTERED,
+                    description: this.flagCommentsNotEnteredErrorMessage,
                     fieldId: this.flagCommentsControlName
                 });
             }
@@ -25749,7 +25858,7 @@
         return AddCommentsComponent;
     }());
     AddCommentsComponent.ɵfac = function AddCommentsComponent_Factory(t) { return new (t || AddCommentsComponent)(); };
-    AddCommentsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: AddCommentsComponent, selectors: [["ccd-add-comments"]], inputs: { formGroup: "formGroup", optional: "optional", isDisplayContextParameterExternal: "isDisplayContextParameterExternal" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter" }, decls: 22, vars: 24, consts: [[3, "formGroup"], ["data-module", "govuk-character-count", "data-maxlength", "200", 1, "govuk-character-count"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper"], [1, "govuk-label", "govuk-label--m", 3, "for"], [4, "ngIf"], ["id", "add-comments-hint", 1, "govuk-hint"], ["class", "govuk-warning-text", 4, "ngIf"], ["id", "flag-comments-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "add-comments-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", "aria-describedby", "add-comments-hint add-comments-char-limit-info add-comments-char-limit-error", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "add-comments-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], [1, "govuk-button-group"], ["type", "button", 1, "button", "button-primary", 3, "click"], [1, "govuk-warning-text"], ["aria-hidden", "true", 1, "govuk-warning-text__icon"], [1, "govuk-warning-text__text"], [1, "govuk-warning-text__assistive"], ["id", "flag-comments-not-entered-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "add-comments-char-limit-error", 1, "govuk-error-message"]], template: function AddCommentsComponent_Template(rf, ctx) {
+    AddCommentsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: AddCommentsComponent, selectors: [["ccd-add-comments"]], inputs: { formGroup: "formGroup", optional: "optional", isDisplayContextParameterExternal: "isDisplayContextParameterExternal", isDisplayContextParameter2Point1Enabled: "isDisplayContextParameter2Point1Enabled" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter" }, decls: 22, vars: 24, consts: [[3, "formGroup"], ["data-module", "govuk-character-count", "data-maxlength", "200", 1, "govuk-character-count"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper"], [1, "govuk-label", "govuk-label--m", 3, "for"], [4, "ngIf"], ["id", "add-comments-hint", 1, "govuk-hint"], ["class", "govuk-warning-text", 4, "ngIf"], ["id", "flag-comments-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "add-comments-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", "aria-describedby", "add-comments-hint add-comments-char-limit-info add-comments-char-limit-error", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "add-comments-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], [1, "govuk-button-group"], ["type", "button", 1, "button", "button-primary", 3, "click"], [1, "govuk-warning-text"], ["aria-hidden", "true", 1, "govuk-warning-text__icon"], [1, "govuk-warning-text__text"], [1, "govuk-warning-text__assistive"], ["id", "flag-comments-not-entered-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "add-comments-char-limit-error", 1, "govuk-error-message"]], template: function AddCommentsComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementContainerStart(0, 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
@@ -25795,9 +25904,9 @@
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.optional);
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(10, 16, ctx.addCommentsStepEnum.HINT_TEXT), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(10, 16, ctx.addCommentsHint), " ");
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", !ctx.isDisplayContextParameterExternal);
+                i0__namespace.ɵɵproperty("ngIf", !ctx.isDisplayContextParameterExternal && ctx.isDisplayContextParameter2Point1Enabled);
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.flagCommentsNotEnteredErrorMessage);
                 i0__namespace.ɵɵadvance(1);
@@ -25823,6 +25932,8 @@
                     type: i0.Input
                 }], isDisplayContextParameterExternal: [{
                     type: i0.Input
+                }], isDisplayContextParameter2Point1Enabled: [{
+                    type: i0.Input
                 }], caseFlagStateEmitter: [{
                     type: i0.Output
                 }] });
@@ -25830,7 +25941,7 @@
 
     function CaseFlagSummaryListComponent_dl_0_div_28_Template(rf, ctx) {
         if (rf & 1) {
-            var _r6_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r5_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "div", 2);
             i0__namespace.ɵɵelementStart(1, "dt", 3);
             i0__namespace.ɵɵtext(2);
@@ -25841,7 +25952,7 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(6, "dd", 5);
             i0__namespace.ɵɵelementStart(7, "a", 6);
-            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_div_28_Template_a_click_7_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var ctx_r5 = i0__namespace.ɵɵnextContext(2); return ctx_r5.changeButtonEmitter.emit(ctx_r5.summaryListDisplayMode === ctx_r5.displayMode.MANAGE ? ctx_r5.caseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION : ctx_r5.caseFlagFieldState.FLAG_TYPE); });
+            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_div_28_Template_a_click_7_listener() { i0__namespace.ɵɵrestoreView(_r5_1); var ctx_r4 = i0__namespace.ɵɵnextContext(2); return ctx_r4.changeButtonEmitter.emit(ctx_r4.summaryListDisplayMode === ctx_r4.displayMode.MANAGE ? ctx_r4.caseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION : ctx_r4.caseFlagFieldState.FLAG_TYPE); });
             i0__namespace.ɵɵtext(8);
             i0__namespace.ɵɵpipe(9, "rpxTranslate");
             i0__namespace.ɵɵelementStart(10, "span", 7);
@@ -25866,7 +25977,7 @@
     }
     function CaseFlagSummaryListComponent_dl_0_div_29_Template(rf, ctx) {
         if (rf & 1) {
-            var _r8_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r7_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "div", 2);
             i0__namespace.ɵɵelementStart(1, "dt", 3);
             i0__namespace.ɵɵtext(2);
@@ -25877,7 +25988,7 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(6, "dd", 5);
             i0__namespace.ɵɵelementStart(7, "a", 6);
-            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_div_29_Template_a_click_7_listener() { i0__namespace.ɵɵrestoreView(_r8_1); var ctx_r7 = i0__namespace.ɵɵnextContext(2); return ctx_r7.changeButtonEmitter.emit(ctx_r7.summaryListDisplayMode === ctx_r7.displayMode.MANAGE ? ctx_r7.caseFlagFieldState.FLAG_UPDATE : ctx_r7.caseFlagFieldState.FLAG_COMMENTS); });
+            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_div_29_Template_a_click_7_listener() { i0__namespace.ɵɵrestoreView(_r7_1); var ctx_r6 = i0__namespace.ɵɵnextContext(2); return ctx_r6.changeButtonEmitter.emit(ctx_r6.summaryListDisplayMode === ctx_r6.displayMode.MANAGE ? ctx_r6.caseFlagFieldState.FLAG_UPDATE : ctx_r6.caseFlagFieldState.FLAG_COMMENTS); });
             i0__namespace.ɵɵtext(8);
             i0__namespace.ɵɵpipe(9, "rpxTranslate");
             i0__namespace.ɵɵelementStart(10, "span", 7);
@@ -25902,7 +26013,7 @@
     }
     function CaseFlagSummaryListComponent_dl_0_div_30_Template(rf, ctx) {
         if (rf & 1) {
-            var _r10_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r9_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "div", 2);
             i0__namespace.ɵɵelementStart(1, "dt", 3);
             i0__namespace.ɵɵtext(2);
@@ -25913,7 +26024,7 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(6, "dd", 5);
             i0__namespace.ɵɵelementStart(7, "a", 6);
-            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_div_30_Template_a_click_7_listener() { i0__namespace.ɵɵrestoreView(_r10_1); var ctx_r9 = i0__namespace.ɵɵnextContext(2); return ctx_r9.changeButtonEmitter.emit(ctx_r9.summaryListDisplayMode === ctx_r9.displayMode.MANAGE ? ctx_r9.caseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION : ctx_r9.caseFlagFieldState.FLAG_COMMENTS); });
+            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_div_30_Template_a_click_7_listener() { i0__namespace.ɵɵrestoreView(_r9_1); var ctx_r8 = i0__namespace.ɵɵnextContext(2); return ctx_r8.changeButtonEmitter.emit(ctx_r8.summaryListDisplayMode === ctx_r8.displayMode.MANAGE ? ctx_r8.caseFlagFieldState.FLAG_UPDATE_WELSH_TRANSLATION : ctx_r8.caseFlagFieldState.FLAG_COMMENTS); });
             i0__namespace.ɵɵtext(8);
             i0__namespace.ɵɵpipe(9, "rpxTranslate");
             i0__namespace.ɵɵelementStart(10, "span", 7);
@@ -25936,46 +26047,9 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(12, 8, "comments (Welsh)"), "");
         }
     }
-    function CaseFlagSummaryListComponent_dl_0_div_31_Template(rf, ctx) {
-        if (rf & 1) {
-            var _r12_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "div", 2);
-            i0__namespace.ɵɵelementStart(1, "dt", 3);
-            i0__namespace.ɵɵtext(2);
-            i0__namespace.ɵɵpipe(3, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(4, "dd", 4);
-            i0__namespace.ɵɵtext(5);
-            i0__namespace.ɵɵpipe(6, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(7, "dd", 5);
-            i0__namespace.ɵɵelementStart(8, "a", 6);
-            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_div_31_Template_a_click_8_listener() { i0__namespace.ɵɵrestoreView(_r12_1); var ctx_r11 = i0__namespace.ɵɵnextContext(2); return ctx_r11.changeButtonEmitter.emit(ctx_r11.caseFlagFieldState.FLAG_UPDATE); });
-            i0__namespace.ɵɵtext(9);
-            i0__namespace.ɵɵpipe(10, "rpxTranslate");
-            i0__namespace.ɵɵelementStart(11, "span", 7);
-            i0__namespace.ɵɵtext(12);
-            i0__namespace.ɵɵpipe(13, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r4 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 4, "Status"), " ");
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(6, 6, ctx_r4.flagStatus), " ");
-            i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(10, 8, "Change"), "");
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(13, 10, "status"), "");
-        }
-    }
     function CaseFlagSummaryListComponent_dl_0_Template(rf, ctx) {
         if (rf & 1) {
-            var _r14_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r11_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "dl", 1);
             i0__namespace.ɵɵelementStart(1, "div", 2);
             i0__namespace.ɵɵelementStart(2, "dt", 3);
@@ -25988,7 +26062,7 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(8, "dd", 5);
             i0__namespace.ɵɵelementStart(9, "a", 6);
-            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_Template_a_click_9_listener() { i0__namespace.ɵɵrestoreView(_r14_1); var ctx_r13 = i0__namespace.ɵɵnextContext(); return ctx_r13.changeButtonEmitter.emit(ctx_r13.summaryListDisplayMode === ctx_r13.displayMode.MANAGE ? ctx_r13.caseFlagFieldState.FLAG_MANAGE_CASE_FLAGS : ctx_r13.caseFlagFieldState.FLAG_LOCATION); });
+            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_Template_a_click_9_listener() { i0__namespace.ɵɵrestoreView(_r11_1); var ctx_r10 = i0__namespace.ɵɵnextContext(); return ctx_r10.changeButtonEmitter.emit(ctx_r10.summaryListDisplayMode === ctx_r10.displayMode.MANAGE ? ctx_r10.caseFlagFieldState.FLAG_MANAGE_CASE_FLAGS : ctx_r10.caseFlagFieldState.FLAG_LOCATION); });
             i0__namespace.ɵɵtext(10);
             i0__namespace.ɵɵpipe(11, "rpxTranslate");
             i0__namespace.ɵɵelementStart(12, "span", 7);
@@ -26008,7 +26082,7 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(21, "dd", 5);
             i0__namespace.ɵɵelementStart(22, "a", 6);
-            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_Template_a_click_22_listener() { i0__namespace.ɵɵrestoreView(_r14_1); var ctx_r15 = i0__namespace.ɵɵnextContext(); return ctx_r15.changeButtonEmitter.emit(ctx_r15.summaryListDisplayMode === ctx_r15.displayMode.MANAGE ? ctx_r15.caseFlagFieldState.FLAG_MANAGE_CASE_FLAGS : ctx_r15.caseFlagFieldState.FLAG_TYPE); });
+            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_Template_a_click_22_listener() { i0__namespace.ɵɵrestoreView(_r11_1); var ctx_r12 = i0__namespace.ɵɵnextContext(); return ctx_r12.changeButtonEmitter.emit(ctx_r12.summaryListDisplayMode === ctx_r12.displayMode.MANAGE ? ctx_r12.caseFlagFieldState.FLAG_MANAGE_CASE_FLAGS : ctx_r12.caseFlagFieldState.FLAG_TYPE); });
             i0__namespace.ɵɵtext(23);
             i0__namespace.ɵɵpipe(24, "rpxTranslate");
             i0__namespace.ɵɵelementStart(25, "span", 7);
@@ -26021,35 +26095,61 @@
             i0__namespace.ɵɵtemplate(28, CaseFlagSummaryListComponent_dl_0_div_28_Template, 13, 10, "div", 8);
             i0__namespace.ɵɵtemplate(29, CaseFlagSummaryListComponent_dl_0_div_29_Template, 13, 10, "div", 8);
             i0__namespace.ɵɵtemplate(30, CaseFlagSummaryListComponent_dl_0_div_30_Template, 13, 10, "div", 8);
-            i0__namespace.ɵɵtemplate(31, CaseFlagSummaryListComponent_dl_0_div_31_Template, 14, 12, "div", 8);
+            i0__namespace.ɵɵelementStart(31, "div", 2);
+            i0__namespace.ɵɵelementStart(32, "dt", 3);
+            i0__namespace.ɵɵtext(33);
+            i0__namespace.ɵɵpipe(34, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(35, "dd", 4);
+            i0__namespace.ɵɵtext(36);
+            i0__namespace.ɵɵpipe(37, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(38, "dd", 5);
+            i0__namespace.ɵɵelementStart(39, "a", 6);
+            i0__namespace.ɵɵlistener("click", function CaseFlagSummaryListComponent_dl_0_Template_a_click_39_listener() { i0__namespace.ɵɵrestoreView(_r11_1); var ctx_r13 = i0__namespace.ɵɵnextContext(); return ctx_r13.changeButtonEmitter.emit(ctx_r13.caseFlagFieldState.FLAG_UPDATE); });
+            i0__namespace.ɵɵtext(40);
+            i0__namespace.ɵɵpipe(41, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(42, "span", 7);
+            i0__namespace.ɵɵtext(43);
+            i0__namespace.ɵɵpipe(44, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r0 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 12, ctx_r0.addUpdateFlagHeaderText), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 15, ctx_r0.addUpdateFlagHeaderText), " ");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(7, 14, ctx_r0.flagForSummaryDisplay.partyName || ctx_r0.caseLevelLocation), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(7, 17, ctx_r0.flagForSummaryDisplay.partyName || ctx_r0.caseFlagCheckYourAnswersPageStep.CASE_LEVEL_LOCATION), " ");
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(11, 16, "Change"), "");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(11, 19, "Change"), "");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(14, 18, "party name"), "");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(14, 21, "party name"), "");
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(18, 20, "Flag type"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(18, 23, ctx_r0.flagTypeHeaderText), " ");
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate1(" ", ctx_r0.flagDescription, " ");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(24, 22, "Change"), "");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(24, 25, "Change"), "");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(27, 24, "flag type"), "");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(27, 27, "flag type"), "");
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngIf", (ctx_r0.flagDescriptionWelsh == null ? null : ctx_r0.flagDescriptionWelsh.length) > 0);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", (ctx_r0.flagComments == null ? null : ctx_r0.flagComments.length) > 0);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", (ctx_r0.flagCommentsWelsh == null ? null : ctx_r0.flagCommentsWelsh.length) > 0);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r0.canDisplayStatus);
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(34, 29, "Status"), " ");
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(37, 31, ctx_r0.flagStatus), " ");
+            i0__namespace.ɵɵadvance(4);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(41, 33, "Change"), "");
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(44, 35, "status"), "");
         }
     }
     var CaseFlagSummaryListComponent = /** @class */ (function () {
@@ -26057,11 +26157,8 @@
             this.rpxTranslationService = rpxTranslationService;
             this.changeButtonEmitter = new i0.EventEmitter();
             this.caseFlagFieldState = exports.CaseFlagFieldState;
-            this.caseLevelLocation = 'Case level';
-            this.updateFlagHeaderText = 'Update flag for';
-            this.addFlagHeaderText = 'Add flag to';
             this.displayMode = exports.CaseFlagSummaryListDisplayMode;
-            this.canDisplayStatus = false;
+            this.caseFlagCheckYourAnswersPageStep = exports.CaseFlagCheckYourAnswersPageStep;
         }
         CaseFlagSummaryListComponent.prototype.ngOnInit = function () {
             if (this.flagForSummaryDisplay) {
@@ -26071,9 +26168,9 @@
                 this.flagComments = flagDetail.flagComment;
                 this.flagCommentsWelsh = flagDetail.flagComment_cy;
                 this.flagStatus = flagDetail.status;
-                this.addUpdateFlagHeaderText = this.getHeaderText();
+                this.addUpdateFlagHeaderText = this.getAddUpdateFlagHeaderText();
+                this.flagTypeHeaderText = this.getFlagTypeHeaderText();
                 this.summaryListDisplayMode = this.getSummaryListDisplayMode();
-                this.canDisplayStatus = this.getCanDisplayStatus();
             }
         };
         CaseFlagSummaryListComponent.prototype.getFlagDescription = function (flagDetail) {
@@ -26092,16 +26189,35 @@
             var subTypeValueForDisplay = subTypeValue ? " - " + subTypeValue : '';
             return "" + flagName + otherDescription + subTypeValueForDisplay;
         };
-        CaseFlagSummaryListComponent.prototype.getHeaderText = function () {
-            if (this.displayContextParameter === exports.CaseFlagDisplayContextParameter.CREATE ||
-                this.displayContextParameter === exports.CaseFlagDisplayContextParameter.CREATE_EXTERNAL) {
-                return this.addFlagHeaderText;
+        CaseFlagSummaryListComponent.prototype.getAddUpdateFlagHeaderText = function () {
+            switch (this.displayContextParameter) {
+                case exports.CaseFlagDisplayContextParameter.CREATE:
+                case exports.CaseFlagDisplayContextParameter.CREATE_2_POINT_1:
+                    return exports.CaseFlagCheckYourAnswersPageStep.ADD_FLAG_HEADER_TEXT;
+                case exports.CaseFlagDisplayContextParameter.CREATE_EXTERNAL:
+                    return exports.CaseFlagCheckYourAnswersPageStep.ADD_FLAG_HEADER_TEXT_EXTERNAL;
+                case exports.CaseFlagDisplayContextParameter.UPDATE:
+                case exports.CaseFlagDisplayContextParameter.UPDATE_2_POINT_1:
+                    return exports.CaseFlagCheckYourAnswersPageStep.UPDATE_FLAG_HEADER_TEXT;
+                case exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL:
+                    return exports.CaseFlagCheckYourAnswersPageStep.UPDATE_FLAG_HEADER_TEXT_EXTERNAL;
+                default:
+                    return exports.CaseFlagCheckYourAnswersPageStep.NONE;
             }
-            if (this.displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE ||
-                this.displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL) {
-                return this.updateFlagHeaderText;
+        };
+        CaseFlagSummaryListComponent.prototype.getFlagTypeHeaderText = function () {
+            switch (this.displayContextParameter) {
+                case exports.CaseFlagDisplayContextParameter.CREATE:
+                case exports.CaseFlagDisplayContextParameter.CREATE_2_POINT_1:
+                case exports.CaseFlagDisplayContextParameter.UPDATE:
+                case exports.CaseFlagDisplayContextParameter.UPDATE_2_POINT_1:
+                    return exports.CaseFlagCheckYourAnswersPageStep.FLAG_TYPE_HEADER_TEXT;
+                case exports.CaseFlagDisplayContextParameter.CREATE_EXTERNAL:
+                case exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL:
+                    return exports.CaseFlagCheckYourAnswersPageStep.FLAG_TYPE_HEADER_TEXT_EXTERNAL;
+                default:
+                    return exports.CaseFlagCheckYourAnswersPageStep.NONE;
             }
-            return '';
         };
         CaseFlagSummaryListComponent.prototype.getSummaryListDisplayMode = function () {
             if (this.displayContextParameter === exports.CaseFlagDisplayContextParameter.CREATE ||
@@ -26110,17 +26226,12 @@
             }
             return exports.CaseFlagSummaryListDisplayMode.MANAGE;
         };
-        CaseFlagSummaryListComponent.prototype.getCanDisplayStatus = function () {
-            return !(this.displayContextParameter === exports.CaseFlagDisplayContextParameter.CREATE_EXTERNAL ||
-                this.displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL ||
-                this.displayContextParameter === exports.CaseFlagDisplayContextParameter.CREATE);
-        };
         return CaseFlagSummaryListComponent;
     }());
     CaseFlagSummaryListComponent.ɵfac = function CaseFlagSummaryListComponent_Factory(t) { return new (t || CaseFlagSummaryListComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace.RpxTranslationService)); };
     CaseFlagSummaryListComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFlagSummaryListComponent, selectors: [["ccd-case-flag-summary-list"]], inputs: { flagForSummaryDisplay: "flagForSummaryDisplay", displayContextParameter: "displayContextParameter" }, outputs: { changeButtonEmitter: "changeButtonEmitter" }, decls: 1, vars: 1, consts: [["class", "govuk-summary-list", 4, "ngIf"], [1, "govuk-summary-list"], [1, "govuk-summary-list__row"], [1, "govuk-summary-list__key"], [1, "govuk-summary-list__value"], [1, "govuk-summary-list__actions"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "govuk-visually-hidden"], ["class", "govuk-summary-list__row", 4, "ngIf"]], template: function CaseFlagSummaryListComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, CaseFlagSummaryListComponent_dl_0_Template, 32, 26, "dl", 0);
+                i0__namespace.ɵɵtemplate(0, CaseFlagSummaryListComponent_dl_0_Template, 45, 37, "dl", 0);
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", ctx.flagForSummaryDisplay);
@@ -26171,7 +26282,7 @@
     function CaseFlagTableComponent_table_0_tbody_20_tr_1_div_15_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div");
-            i0__namespace.ɵɵelementStart(1, "span", 21);
+            i0__namespace.ɵɵelementStart(1, "span", 23);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -26184,7 +26295,7 @@
     }
     function CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_23_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "strong", 22);
+            i0__namespace.ɵɵelementStart(0, "strong", 24);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -26196,7 +26307,7 @@
     }
     function CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_24_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "strong", 23);
+            i0__namespace.ɵɵelementStart(0, "strong", 25);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -26208,7 +26319,7 @@
     }
     function CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_25_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "strong", 23);
+            i0__namespace.ɵɵelementStart(0, "strong", 26);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -26220,7 +26331,7 @@
     }
     function CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_26_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "strong", 24);
+            i0__namespace.ɵɵelementStart(0, "strong", 27);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -26262,11 +26373,11 @@
             i0__namespace.ɵɵtext(20);
             i0__namespace.ɵɵpipe(21, "date");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(22, "td", 17);
-            i0__namespace.ɵɵtemplate(23, CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_23_Template, 3, 3, "strong", 18);
-            i0__namespace.ɵɵtemplate(24, CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_24_Template, 3, 3, "strong", 19);
-            i0__namespace.ɵɵtemplate(25, CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_25_Template, 3, 3, "strong", 19);
-            i0__namespace.ɵɵtemplate(26, CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_26_Template, 3, 3, "strong", 20);
+            i0__namespace.ɵɵelementStart(22, "td", 18);
+            i0__namespace.ɵɵtemplate(23, CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_23_Template, 3, 3, "strong", 19);
+            i0__namespace.ɵɵtemplate(24, CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_24_Template, 3, 3, "strong", 20);
+            i0__namespace.ɵɵtemplate(25, CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_25_Template, 3, 3, "strong", 21);
+            i0__namespace.ɵɵtemplate(26, CaseFlagTableComponent_table_0_tbody_20_tr_1_strong_26_Template, 3, 3, "strong", 22);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
@@ -26376,14 +26487,14 @@
         return CaseFlagTableComponent;
     }());
     CaseFlagTableComponent.ɵfac = function CaseFlagTableComponent_Factory(t) { return new (t || CaseFlagTableComponent)(); };
-    CaseFlagTableComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFlagTableComponent, selectors: [["ccd-case-flag-table"]], inputs: { tableCaption: "tableCaption", flagData: "flagData", firstColumnHeader: "firstColumnHeader", caseFlagsExternalUser: "caseFlagsExternalUser" }, decls: 1, vars: 1, consts: [["class", "govuk-table", 4, "ngIf"], [1, "govuk-table"], ["class", "govuk-table__caption govuk-table__caption--l", 4, "ngIf"], [1, "govuk-table__head"], [1, "govuk-table__row"], ["scope", "col", 1, "govuk-table__header", "col-party-name"], ["scope", "col", 1, "govuk-table__header", "col-comments"], ["scope", "col", 1, "govuk-table__header", "col-creation-date"], ["scope", "col", 1, "govuk-table__header", "col-last-modified"], ["scope", "col", 1, "govuk-table__header", "col-flag-status"], [1, "govuk-table__body"], [4, "ngIf"], ["class", "govuk-table__body", 4, "ngIf"], [1, "govuk-table__caption", "govuk-table__caption--l"], ["colspan", "5"], ["scope", "row", "class", "govuk-table__row", 4, "ngFor", "ngForOf"], ["scope", "row", 1, "govuk-table__row"], [1, "govuk-table__cell"], ["class", "govuk-tag", 4, "ngIf"], ["class", "govuk-tag govuk-tag--grey", 4, "ngIf"], ["class", "govuk-tag govuk-tag--red", 4, "ngIf"], [1, "govuk-!-font-weight-bold"], [1, "govuk-tag"], [1, "govuk-tag", "govuk-tag--grey"], [1, "govuk-tag", "govuk-tag--red"]], template: function CaseFlagTableComponent_Template(rf, ctx) {
+    CaseFlagTableComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFlagTableComponent, selectors: [["ccd-case-flag-table"]], inputs: { tableCaption: "tableCaption", flagData: "flagData", firstColumnHeader: "firstColumnHeader", caseFlagsExternalUser: "caseFlagsExternalUser" }, decls: 1, vars: 1, consts: [["class", "govuk-table", 4, "ngIf"], [1, "govuk-table"], ["class", "govuk-table__caption govuk-table__caption--l", 4, "ngIf"], [1, "govuk-table__head"], [1, "govuk-table__row"], ["scope", "col", 1, "govuk-table__header", "col-party-name"], ["scope", "col", 1, "govuk-table__header", "col-comments"], ["scope", "col", 1, "govuk-table__header", "col-creation-date"], ["scope", "col", 1, "govuk-table__header", "col-last-modified"], ["scope", "col", 1, "govuk-table__header", "col-flag-status"], [1, "govuk-table__body"], [4, "ngIf"], ["class", "govuk-table__body", 4, "ngIf"], [1, "govuk-table__caption", "govuk-table__caption--l"], ["colspan", "5"], ["scope", "row", "class", "govuk-table__row", 4, "ngFor", "ngForOf"], ["scope", "row", 1, "govuk-table__row"], [1, "govuk-table__cell"], [1, "govuk-table__cell", "cell-flag-status"], ["class", "govuk-tag govuk-tag--turquoise", 4, "ngIf"], ["class", "govuk-tag govuk-tag--grey", 4, "ngIf"], ["class", "govuk-tag govuk-tag--yellow", 4, "ngIf"], ["class", "govuk-tag govuk-tag--red", 4, "ngIf"], [1, "govuk-!-font-weight-bold"], [1, "govuk-tag", "govuk-tag--turquoise"], [1, "govuk-tag", "govuk-tag--grey"], [1, "govuk-tag", "govuk-tag--yellow"], [1, "govuk-tag", "govuk-tag--red"]], template: function CaseFlagTableComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, CaseFlagTableComponent_table_0_Template, 21, 16, "table", 0);
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", ctx.flagData);
             }
-        }, styles: [".govuk-table[_ngcontent-%COMP%]   .govuk-table__caption[_ngcontent-%COMP%]{margin-top:10px}.govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-party-name[_ngcontent-%COMP%]{width:24%}.govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-comments[_ngcontent-%COMP%]{width:42%}.govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-creation-date[_ngcontent-%COMP%], .govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-last-modified[_ngcontent-%COMP%]{width:12%}.govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-flag-status[_ngcontent-%COMP%]{width:10%}"] });
+        }, styles: [".govuk-table[_ngcontent-%COMP%]   .govuk-table__caption[_ngcontent-%COMP%]{margin-top:10px}.govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-party-name[_ngcontent-%COMP%]{width:24%}.govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-comments[_ngcontent-%COMP%]{width:42%}.govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-creation-date[_ngcontent-%COMP%], .govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-last-modified[_ngcontent-%COMP%]{width:12%}.govuk-table[_ngcontent-%COMP%]   .govuk-table__head[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .col-flag-status[_ngcontent-%COMP%]{width:10%}.govuk-table[_ngcontent-%COMP%]   .govuk-table__body[_ngcontent-%COMP%]   .govuk-table__row[_ngcontent-%COMP%]   .cell-flag-status[_ngcontent-%COMP%]{white-space:nowrap}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CaseFlagTableComponent, [{
                 type: i0.Component,
@@ -27094,9 +27205,14 @@
                 exports.CaseFlagWizardStepTitle.SELECT_FLAG_LOCATION_EXTERNAL : exports.CaseFlagWizardStepTitle.SELECT_FLAG_LOCATION;
             // Filter out any flags instances that don't have a party name, unless the instance is for case-level flags (this
             // is expected not to have a party name)
+            // Also de-duplicate flags instances where the groupId, if present, is the same
             if (this.flagsData) {
                 this.filteredFlagsData =
-                    this.flagsData.filter(function (f) { return f.flags.partyName !== null || f.pathToFlagsFormGroup === _this.caseLevelCaseFlagsFieldId; });
+                    this.flagsData
+                        .filter(function (f) { return f.flags.partyName !== null || f.pathToFlagsFormGroup === _this.caseLevelCaseFlagsFieldId; })
+                        .filter(function (value, index, partyLevelFlags) { return !value.flags.groupId
+                        ? value
+                        : partyLevelFlags.findIndex(function (p) { return p.flags.groupId === value.flags.groupId; }) === index; });
             }
             // Add a FormControl for the selected flag location if there is at least one flags instance remaining after filtering
             if (this.filteredFlagsData && this.filteredFlagsData.length > 0) {
@@ -27259,12 +27375,13 @@
             i0__namespace.ɵɵelementContainerStart(0);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "rpxTranslate");
+            i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r2.caseFlagWizardStepTitle.SELECT_CASE_FLAG), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r2.isDisplayContextParameterExternal ? i0__namespace.ɵɵpipeBind1(2, 1, ctx_r2.caseFlagWizardStepTitle.SELECT_CASE_FLAG_EXTERNAL) : i0__namespace.ɵɵpipeBind1(3, 3, ctx_r2.caseFlagWizardStepTitle.SELECT_CASE_FLAG), " ");
         }
     }
     function SelectFlagTypeComponent_ng_container_0_ng_template_6_Template(rf, ctx) {
@@ -27319,7 +27436,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(4, 6, flagType_r8, "name"), " ");
         }
     }
-    function SelectFlagTypeComponent_ng_container_0_div_11_div_5_Template(rf, ctx) {
+    function SelectFlagTypeComponent_ng_container_0_div_11_div_6_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 23);
             i0__namespace.ɵɵelementStart(1, "span", 14);
@@ -27338,7 +27455,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r10.flagTypeErrorMessage), " ");
         }
     }
-    function SelectFlagTypeComponent_ng_container_0_div_11_div_7_Template(rf, ctx) {
+    function SelectFlagTypeComponent_ng_container_0_div_11_div_8_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 24);
             i0__namespace.ɵɵelement(1, "input", 25);
@@ -27357,7 +27474,7 @@
         }
     }
     var _c0$m = function (a0) { return { "form-group-error": a0 }; };
-    var _c1$6 = function (a0) { return { "govuk-input--error": a0 }; };
+    var _c1$7 = function (a0) { return { "govuk-input--error": a0 }; };
     function SelectFlagTypeComponent_ng_container_0_div_11_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 18);
@@ -27365,25 +27482,26 @@
             i0__namespace.ɵɵelementStart(2, "label", 19);
             i0__namespace.ɵɵtext(3);
             i0__namespace.ɵɵpipe(4, "rpxTranslate");
+            i0__namespace.ɵɵpipe(5, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(5, SelectFlagTypeComponent_ng_container_0_div_11_div_5_Template, 6, 6, "div", 20);
-            i0__namespace.ɵɵelement(6, "input", 21);
-            i0__namespace.ɵɵtemplate(7, SelectFlagTypeComponent_ng_container_0_div_11_div_7_Template, 5, 5, "div", 22);
+            i0__namespace.ɵɵtemplate(6, SelectFlagTypeComponent_ng_container_0_div_11_div_6_Template, 6, 6, "div", 20);
+            i0__namespace.ɵɵelement(7, "input", 21);
+            i0__namespace.ɵɵtemplate(8, SelectFlagTypeComponent_ng_container_0_div_11_div_8_Template, 5, 5, "div", 22);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var ctx_r7 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(9, _c0$m, ctx_r7.flagTypeErrorMessage.length > 0));
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 7, "Enter a flag type"));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c0$m, ctx_r7.flagTypeErrorMessage.length > 0));
             i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r7.isDisplayContextParameterExternal ? i0__namespace.ɵɵpipeBind1(4, 7, ctx_r7.caseFlagWizardStepTitle.OTHER_FLAG_TYPE_DESCRIPTION_EXTERNAL) : i0__namespace.ɵɵpipeBind1(5, 9, ctx_r7.caseFlagWizardStepTitle.OTHER_FLAG_TYPE_DESCRIPTION), " ");
+            i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", ctx_r7.flagTypeErrorMessage.length > 0);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(11, _c1$6, ctx_r7.flagTypeErrorMessage.length > 0))("name", ctx_r7.caseFlagFormField.OTHER_FLAG_DESCRIPTION)("formControlName", ctx_r7.caseFlagFormField.OTHER_FLAG_DESCRIPTION);
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(13, _c1$7, ctx_r7.flagTypeErrorMessage.length > 0))("name", ctx_r7.caseFlagFormField.OTHER_FLAG_DESCRIPTION)("formControlName", ctx_r7.caseFlagFormField.OTHER_FLAG_DESCRIPTION);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", !ctx_r7.isDisplayContextParameterExternal && !ctx_r7.isCaseLevelFlag);
+            i0__namespace.ɵɵproperty("ngIf", !ctx_r7.isDisplayContextParameterExternal && !ctx_r7.isCaseLevelFlag && ctx_r7.isDisplayContextParameter2Point1Enabled);
         }
     }
     function SelectFlagTypeComponent_ng_container_0_Template(rf, ctx) {
@@ -27393,14 +27511,14 @@
             i0__namespace.ɵɵelementStart(2, "fieldset", 4);
             i0__namespace.ɵɵelementStart(3, "legend", 5);
             i0__namespace.ɵɵelementStart(4, "h1", 6);
-            i0__namespace.ɵɵtemplate(5, SelectFlagTypeComponent_ng_container_0_ng_container_5_Template, 3, 3, "ng-container", 7);
+            i0__namespace.ɵɵtemplate(5, SelectFlagTypeComponent_ng_container_0_ng_container_5_Template, 4, 5, "ng-container", 7);
             i0__namespace.ɵɵtemplate(6, SelectFlagTypeComponent_ng_container_0_ng_template_6_Template, 2, 4, "ng-template", null, 8, i0__namespace.ɵɵtemplateRefExtractor);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵtemplate(8, SelectFlagTypeComponent_ng_container_0_div_8_Template, 6, 6, "div", 9);
             i0__namespace.ɵɵelementStart(9, "div", 10);
             i0__namespace.ɵɵtemplate(10, SelectFlagTypeComponent_ng_container_0_div_10_Template, 5, 9, "div", 11);
-            i0__namespace.ɵɵtemplate(11, SelectFlagTypeComponent_ng_container_0_div_11_Template, 8, 13, "div", 12);
+            i0__namespace.ɵɵtemplate(11, SelectFlagTypeComponent_ng_container_0_div_11_Template, 9, 15, "div", 12);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -27442,6 +27560,7 @@
         function SelectFlagTypeComponent(caseFlagRefdataService) {
             this.caseFlagRefdataService = caseFlagRefdataService;
             this.isDisplayContextParameterExternal = false;
+            this.isDisplayContextParameter2Point1Enabled = false;
             this.caseFlagStateEmitter = new i0.EventEmitter();
             this.flagCommentsOptionalEmitter = new i0.EventEmitter();
             this.flagTypeNotSelectedErrorMessage = '';
@@ -27566,17 +27685,25 @@
             this.errorMessages = [];
             if (!this.selectedFlagType) {
                 // If there is any prior flag type selection then the message will differ
-                var errorMessage = !this.cachedFlagType
-                    ? exports.SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_SELECTED
-                    : exports.SelectFlagTypeErrorMessage.FLAG_TYPE_OPTION_NOT_SELECTED;
+                var errorMessage = '';
+                if (this.cachedFlagType) {
+                    errorMessage = exports.SelectFlagTypeErrorMessage.FLAG_TYPE_OPTION_NOT_SELECTED;
+                }
+                else {
+                    errorMessage = this.isDisplayContextParameterExternal
+                        ? exports.SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_SELECTED_EXTERNAL
+                        : exports.SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_SELECTED;
+                }
                 this.flagTypeNotSelectedErrorMessage = errorMessage;
                 this.errorMessages.push({ title: '', description: errorMessage, fieldId: 'conditional-radios-list' });
             }
             if (this.otherFlagTypeSelected) {
                 var otherFlagTypeDescription = this.formGroup.get(exports.CaseFlagFormFields.OTHER_FLAG_DESCRIPTION).value;
                 if (!otherFlagTypeDescription) {
-                    this.flagTypeErrorMessage = exports.SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_ENTERED;
-                    this.errorMessages.push({ title: '', description: "" + exports.SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_ENTERED, fieldId: 'other-flag-type-description' });
+                    this.flagTypeErrorMessage = this.isDisplayContextParameterExternal
+                        ? exports.SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_ENTERED_EXTERNAL
+                        : exports.SelectFlagTypeErrorMessage.FLAG_TYPE_NOT_ENTERED;
+                    this.errorMessages.push({ title: '', description: "" + this.flagTypeErrorMessage, fieldId: 'other-flag-type-description' });
                 }
                 if (otherFlagTypeDescription.length > this.maxCharactersForOtherFlagType) {
                     this.flagTypeErrorMessage = exports.SelectFlagTypeErrorMessage.FLAG_TYPE_LIMIT_EXCEEDED;
@@ -27610,7 +27737,7 @@
         return SelectFlagTypeComponent;
     }());
     SelectFlagTypeComponent.ɵfac = function SelectFlagTypeComponent_Factory(t) { return new (t || SelectFlagTypeComponent)(i0__namespace.ɵɵdirectiveInject(CaseFlagRefdataService)); };
-    SelectFlagTypeComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: SelectFlagTypeComponent, selectors: [["ccd-select-flag-type"]], inputs: { formGroup: "formGroup", jurisdiction: "jurisdiction", caseTypeId: "caseTypeId", hmctsServiceId: "hmctsServiceId", isDisplayContextParameterExternal: "isDisplayContextParameterExternal", selectedFlagsLocation: "selectedFlagsLocation" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter", flagCommentsOptionalEmitter: "flagCommentsOptionalEmitter" }, decls: 2, vars: 2, consts: [[3, "formGroup", 4, "ngIf"], ["class", "govuk-button-group", 4, "ngIf"], [3, "formGroup"], [1, "govuk-form-group", 3, "ngClass"], ["aria-describedby", "flag-type-heading", 1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--m"], ["id", "flag-type-heading", 1, "govuk-fieldset__heading", "govuk-!-margin-bottom-1"], [4, "ngIf", "ngIfElse"], ["priorFlagTypeSelected", ""], ["id", "flag-type-not-selected-error-message", "class", "govuk-error-message", 4, "ngIf"], ["data-module", "govuk-radios", "id", "conditional-radios-list", 1, "govuk-radios", "govuk-radios--conditional"], ["class", "govuk-radios__item", 4, "ngFor", "ngForOf", "ngForTrackBy"], ["class", "govuk-radios__conditional", "id", "conditional-flagType", 4, "ngIf"], ["id", "flag-type-not-selected-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], [1, "govuk-radios__item"], ["type", "radio", 1, "govuk-radios__input", 3, "id", "name", "value", "formControlName"], [1, "govuk-label", "govuk-radios__label", 3, "for"], ["id", "conditional-flagType", 1, "govuk-radios__conditional"], ["for", "other-flag-type-description", 1, "govuk-label"], ["id", "flag-type-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "other-flag-type-description", "type", "text", 1, "govuk-input", "govuk-!-width-one-half", 3, "ngClass", "name", "formControlName"], ["class", "govuk-checkboxes__item govuk-!-margin-top-4", 4, "ngIf"], ["id", "flag-type-error-message", 1, "govuk-error-message"], [1, "govuk-checkboxes__item", "govuk-!-margin-top-4"], ["id", "is-visible-externally", "type", "checkbox", 1, "govuk-checkboxes__input", 3, "name", "formControlName"], ["for", "is-visible-externally", 1, "govuk-label", "govuk-checkboxes__label"], [1, "govuk-button-group"], ["type", "button", 1, "button", "button-primary", 3, "click"]], template: function SelectFlagTypeComponent_Template(rf, ctx) {
+    SelectFlagTypeComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: SelectFlagTypeComponent, selectors: [["ccd-select-flag-type"]], inputs: { formGroup: "formGroup", jurisdiction: "jurisdiction", caseTypeId: "caseTypeId", hmctsServiceId: "hmctsServiceId", isDisplayContextParameterExternal: "isDisplayContextParameterExternal", isDisplayContextParameter2Point1Enabled: "isDisplayContextParameter2Point1Enabled", selectedFlagsLocation: "selectedFlagsLocation" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter", flagCommentsOptionalEmitter: "flagCommentsOptionalEmitter" }, decls: 2, vars: 2, consts: [[3, "formGroup", 4, "ngIf"], ["class", "govuk-button-group", 4, "ngIf"], [3, "formGroup"], [1, "govuk-form-group", 3, "ngClass"], ["aria-describedby", "flag-type-heading", 1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--m"], ["id", "flag-type-heading", 1, "govuk-fieldset__heading", "govuk-!-margin-bottom-1"], [4, "ngIf", "ngIfElse"], ["priorFlagTypeSelected", ""], ["id", "flag-type-not-selected-error-message", "class", "govuk-error-message", 4, "ngIf"], ["data-module", "govuk-radios", "id", "conditional-radios-list", 1, "govuk-radios", "govuk-radios--conditional"], ["class", "govuk-radios__item", 4, "ngFor", "ngForOf", "ngForTrackBy"], ["class", "govuk-radios__conditional", "id", "conditional-flagType", 4, "ngIf"], ["id", "flag-type-not-selected-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], [1, "govuk-radios__item"], ["type", "radio", 1, "govuk-radios__input", 3, "id", "name", "value", "formControlName"], [1, "govuk-label", "govuk-radios__label", 3, "for"], ["id", "conditional-flagType", 1, "govuk-radios__conditional"], ["for", "other-flag-type-description", 1, "govuk-label"], ["id", "flag-type-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "other-flag-type-description", "type", "text", 1, "govuk-input", "govuk-!-width-one-half", 3, "ngClass", "name", "formControlName"], ["class", "govuk-checkboxes__item govuk-!-margin-top-4", 4, "ngIf"], ["id", "flag-type-error-message", 1, "govuk-error-message"], [1, "govuk-checkboxes__item", "govuk-!-margin-top-4"], ["id", "is-visible-externally", "type", "checkbox", 1, "govuk-checkboxes__input", 3, "name", "formControlName"], ["for", "is-visible-externally", 1, "govuk-label", "govuk-checkboxes__label"], [1, "govuk-button-group"], ["type", "button", 1, "button", "button-primary", 3, "click"]], template: function SelectFlagTypeComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, SelectFlagTypeComponent_ng_container_0_Template, 12, 10, "ng-container", 0);
                 i0__namespace.ɵɵtemplate(1, SelectFlagTypeComponent_div_1_Template, 4, 3, "div", 1);
@@ -27639,6 +27766,8 @@
                     type: i0.Input
                 }], isDisplayContextParameterExternal: [{
                     type: i0.Input
+                }], isDisplayContextParameter2Point1Enabled: [{
+                    type: i0.Input
                 }], selectedFlagsLocation: [{
                     type: i0.Input
                 }], caseFlagStateEmitter: [{
@@ -27650,7 +27779,7 @@
 
     function UpdateFlagComponent_div_7_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 8);
+            i0__namespace.ɵɵelementStart(0, "div", 17);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "updateFlagTitleDisplay");
             i0__namespace.ɵɵelementEnd();
@@ -27661,14 +27790,27 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r0.selectedFlag == null ? null : ctx_r0.selectedFlag.flagDetailDisplay == null ? null : ctx_r0.selectedFlag.flagDetailDisplay.flagDetail), " ");
         }
     }
-    function UpdateFlagComponent_div_16_Template(rf, ctx) {
+    function UpdateFlagComponent_div_13_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 18);
-            i0__namespace.ɵɵelementStart(1, "span", 19);
+            i0__namespace.ɵɵtext(1);
+            i0__namespace.ɵɵpipe(2, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r1 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r1.updateFlagStepEnum.COMMENT_HINT_TEXT_EXTERNAL), " ");
+        }
+    }
+    function UpdateFlagComponent_ng_container_14_div_5_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 25);
+            i0__namespace.ɵɵelementStart(1, "span", 26);
             i0__namespace.ɵɵtext(2, "!");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(3, "strong", 20);
-            i0__namespace.ɵɵelementStart(4, "span", 21);
+            i0__namespace.ɵɵelementStart(3, "strong", 27);
+            i0__namespace.ɵɵelementStart(4, "span", 28);
             i0__namespace.ɵɵtext(5);
             i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -27678,17 +27820,17 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r1 = i0__namespace.ɵɵnextContext();
+            var ctx_r10 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(5);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(6, 2, "Warning"));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(8, 4, ctx_r1.updateFlagStepEnum.WARNING_TEXT), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(8, 4, ctx_r10.updateFlagStepEnum.WARNING_TEXT), " ");
         }
     }
-    function UpdateFlagComponent_div_17_Template(rf, ctx) {
+    function UpdateFlagComponent_ng_container_14_div_6_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 22);
-            i0__namespace.ɵɵelementStart(1, "span", 23);
+            i0__namespace.ɵɵelementStart(0, "div", 29);
+            i0__namespace.ɵɵelementStart(1, "span", 30);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -27697,17 +27839,17 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r2 = i0__namespace.ɵɵnextContext();
+            var ctx_r11 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "Error:"));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r2.updateFlagNotEnteredErrorMessage), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r11.commentsNotEnteredErrorMessage), " ");
         }
     }
-    function UpdateFlagComponent_div_18_Template(rf, ctx) {
+    function UpdateFlagComponent_ng_container_14_div_7_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 24);
-            i0__namespace.ɵɵelementStart(1, "span", 23);
+            i0__namespace.ɵɵelementStart(0, "div", 31);
+            i0__namespace.ɵɵelementStart(1, "span", 30);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -27716,38 +27858,80 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r3 = i0__namespace.ɵɵnextContext();
+            var ctx_r12 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "Error:"));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r3.updateFlagCharLimitErrorMessage), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r12.commentsCharLimitErrorMessage), " ");
         }
     }
-    function UpdateFlagComponent_div_24_div_8_Template(rf, ctx) {
+    function UpdateFlagComponent_ng_container_14_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 36);
-            i0__namespace.ɵɵelement(1, "input", 37);
-            i0__namespace.ɵɵelementStart(2, "label", 38);
-            i0__namespace.ɵɵtext(3);
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "div", 19);
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵpipe(4, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(5, UpdateFlagComponent_ng_container_14_div_5_Template, 9, 6, "div", 20);
+            i0__namespace.ɵɵtemplate(6, UpdateFlagComponent_ng_container_14_div_6_Template, 6, 6, "div", 21);
+            i0__namespace.ɵɵtemplate(7, UpdateFlagComponent_ng_container_14_div_7_Template, 6, 6, "div", 22);
+            i0__namespace.ɵɵelementStart(8, "textarea", 23);
+            i0__namespace.ɵɵtext(9, "          ");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(10, "div", 24);
+            i0__namespace.ɵɵtext(11);
+            i0__namespace.ɵɵpipe(12, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var status_r9 = ctx.$implicit;
-            var ctx_r6 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r2 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r2.internalUserUpdate ? i0__namespace.ɵɵpipeBind1(3, 8, ctx_r2.updateFlagStepEnum.COMMENT_HINT_TEXT_INTERNAL) : i0__namespace.ɵɵpipeBind1(4, 10, ctx_r2.updateFlagStepEnum.COMMENT_HINT_TEXT_INTERNAL_2_POINT_1), " ");
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r2.internalUser2Point1EnabledUpdate);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("id", ctx_r6.caseFlagFormFields.STATUS + "_" + status_r9)("name", ctx_r6.caseFlagFormFields.STATUS)("formControlName", ctx_r6.caseFlagFormFields.STATUS)("value", status_r9);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r2.commentsNotEnteredErrorMessage);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("for", ctx_r6.caseFlagFormFields.STATUS + "_" + status_r9);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r2.commentsCharLimitErrorMessage);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 6, ctx_r6.caseFlagStatusEnum[status_r9]), " ");
+            i0__namespace.ɵɵproperty("id", ctx_r2.caseFlagFormFields.COMMENTS)("name", ctx_r2.caseFlagFormFields.COMMENTS)("formControlName", ctx_r2.caseFlagFormFields.COMMENTS);
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(12, 12, ctx_r2.updateFlagStepEnum.CHARACTER_LIMIT_INFO), " ");
         }
     }
-    function UpdateFlagComponent_div_24_div_12_Template(rf, ctx) {
+    function UpdateFlagComponent_ng_template_15_ng_container_0_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 39);
-            i0__namespace.ɵɵelementStart(1, "span", 23);
+            i0__namespace.ɵɵelementContainer(0);
+        }
+    }
+    function UpdateFlagComponent_ng_template_15_ng_container_0_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵtemplate(1, UpdateFlagComponent_ng_template_15_ng_container_0_ng_container_1_Template, 1, 0, "ng-container", 33);
+            i0__namespace.ɵɵelementContainerEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵnextContext(2);
+            var _r5 = i0__namespace.ɵɵreference(18);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngTemplateOutlet", _r5);
+        }
+    }
+    function UpdateFlagComponent_ng_template_15_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵtemplate(0, UpdateFlagComponent_ng_template_15_ng_container_0_Template, 2, 1, "ng-container", 32);
+        }
+        if (rf & 2) {
+            var ctx_r4 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵproperty("ngIf", ctx_r4.externalUserUpdate);
+        }
+    }
+    function UpdateFlagComponent_ng_template_17_div_0_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 38);
+            i0__namespace.ɵɵelementStart(1, "span", 30);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -27756,17 +27940,17 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r7 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r15 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "Error:"));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r7.statusReasonNotEnteredErrorMessage), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r15.statusReasonNotEnteredErrorMessage), " ");
         }
     }
-    function UpdateFlagComponent_div_24_div_13_Template(rf, ctx) {
+    function UpdateFlagComponent_ng_template_17_div_1_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 40);
-            i0__namespace.ɵɵelementStart(1, "span", 23);
+            i0__namespace.ɵɵelementStart(0, "div", 39);
+            i0__namespace.ɵɵelementStart(1, "span", 30);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -27775,70 +27959,106 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r8 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r16 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "Error:"));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r8.statusReasonCharLimitErrorMessage), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r16.statusReasonCharLimitErrorMessage), " ");
         }
     }
-    function UpdateFlagComponent_div_24_Template(rf, ctx) {
+    function UpdateFlagComponent_ng_template_17_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 25);
-            i0__namespace.ɵɵelementStart(1, "fieldset", 26);
-            i0__namespace.ɵɵelementStart(2, "legend", 27);
-            i0__namespace.ɵɵelementStart(3, "h1", 28);
+            i0__namespace.ɵɵtemplate(0, UpdateFlagComponent_ng_template_17_div_0_Template, 6, 6, "div", 34);
+            i0__namespace.ɵɵtemplate(1, UpdateFlagComponent_ng_template_17_div_1_Template, 6, 6, "div", 35);
+            i0__namespace.ɵɵelementStart(2, "textarea", 36);
+            i0__namespace.ɵɵtext(3, "        ");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(4, "div", 37);
+            i0__namespace.ɵɵtext(5);
+            i0__namespace.ɵɵpipe(6, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r6 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵproperty("ngIf", ctx_r6.statusReasonNotEnteredErrorMessage);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r6.statusReasonCharLimitErrorMessage);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("id", ctx_r6.caseFlagFormFields.STATUS_CHANGE_REASON)("name", ctx_r6.caseFlagFormFields.STATUS_CHANGE_REASON)("formControlName", ctx_r6.caseFlagFormFields.STATUS_CHANGE_REASON);
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(6, 6, ctx_r6.updateFlagStepEnum.CHARACTER_LIMIT_INFO), " ");
+        }
+    }
+    function UpdateFlagComponent_div_19_div_8_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 47);
+            i0__namespace.ɵɵelement(1, "input", 48);
+            i0__namespace.ɵɵelementStart(2, "label", 49);
+            i0__namespace.ɵɵtext(3);
+            i0__namespace.ɵɵpipe(4, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var status_r19 = ctx.$implicit;
+            var ctx_r17 = i0__namespace.ɵɵnextContext(2);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("id", ctx_r17.caseFlagFormFields.STATUS + "_" + status_r19)("name", ctx_r17.caseFlagFormFields.STATUS)("formControlName", ctx_r17.caseFlagFormFields.STATUS)("value", status_r19);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("for", ctx_r17.caseFlagFormFields.STATUS + "_" + status_r19);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 6, ctx_r17.caseFlagStatusEnum[status_r19]), " ");
+        }
+    }
+    function UpdateFlagComponent_div_19_ng_container_12_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementContainer(0);
+        }
+    }
+    function UpdateFlagComponent_div_19_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 40);
+            i0__namespace.ɵɵelementStart(1, "fieldset", 41);
+            i0__namespace.ɵɵelementStart(2, "legend", 42);
+            i0__namespace.ɵɵelementStart(3, "h1", 43);
             i0__namespace.ɵɵtext(4);
             i0__namespace.ɵɵpipe(5, "rpxTranslate");
             i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(7, "div", 29);
-            i0__namespace.ɵɵtemplate(8, UpdateFlagComponent_div_24_div_8_Template, 5, 8, "div", 30);
+            i0__namespace.ɵɵelementStart(7, "div", 44);
+            i0__namespace.ɵɵtemplate(8, UpdateFlagComponent_div_19_div_8_Template, 5, 8, "div", 45);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(9, "div", 31);
+            i0__namespace.ɵɵelementStart(9, "div", 46);
             i0__namespace.ɵɵtext(10);
             i0__namespace.ɵɵpipe(11, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(12, UpdateFlagComponent_div_24_div_12_Template, 6, 6, "div", 32);
-            i0__namespace.ɵɵtemplate(13, UpdateFlagComponent_div_24_div_13_Template, 6, 6, "div", 33);
-            i0__namespace.ɵɵelementStart(14, "textarea", 34);
-            i0__namespace.ɵɵtext(15, "        ");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(16, "div", 35);
-            i0__namespace.ɵɵtext(17);
-            i0__namespace.ɵɵpipe(18, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(12, UpdateFlagComponent_div_19_ng_container_12_Template, 1, 0, "ng-container", 33);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r4 = i0__namespace.ɵɵnextContext();
+            var ctx_r7 = i0__namespace.ɵɵnextContext();
+            var _r5 = i0__namespace.ɵɵreference(18);
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate2(" ", i0__namespace.ɵɵpipeBind1(5, 11, ctx_r4.updateFlagTitle), " ", i0__namespace.ɵɵpipeBind1(6, 13, "status"), " ");
+            i0__namespace.ɵɵtextInterpolate2(" ", i0__namespace.ɵɵpipeBind1(5, 6, ctx_r7.updateFlagTitle), " ", i0__namespace.ɵɵpipeBind1(6, 8, "status"), " ");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("id", ctx_r4.caseFlagFormFields.STATUS);
+            i0__namespace.ɵɵproperty("id", ctx_r7.caseFlagFormFields.STATUS);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", ctx_r4.validStatusProgressions);
+            i0__namespace.ɵɵproperty("ngForOf", ctx_r7.validStatusProgressions);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(11, 15, ctx_r4.updateFlagStepEnum.STATUS_HINT_TEXT), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(11, 10, ctx_r7.updateFlagStepEnum.STATUS_HINT_TEXT), " ");
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r4.statusReasonNotEnteredErrorMessage);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r4.statusReasonCharLimitErrorMessage);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("id", ctx_r4.caseFlagFormFields.STATUS_CHANGE_REASON)("name", ctx_r4.caseFlagFormFields.STATUS_CHANGE_REASON)("formControlName", ctx_r4.caseFlagFormFields.STATUS_CHANGE_REASON);
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(18, 17, ctx_r4.updateFlagStepEnum.CHARACTER_LIMIT_INFO), " ");
+            i0__namespace.ɵɵproperty("ngTemplateOutlet", _r5);
         }
     }
-    function UpdateFlagComponent_div_25_Template(rf, ctx) {
+    function UpdateFlagComponent_div_20_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 41);
-            i0__namespace.ɵɵelementStart(1, "div", 42);
-            i0__namespace.ɵɵelementStart(2, "div", 43);
-            i0__namespace.ɵɵelement(3, "input", 44);
-            i0__namespace.ɵɵelementStart(4, "label", 45);
+            i0__namespace.ɵɵelementStart(0, "div", 50);
+            i0__namespace.ɵɵelementStart(1, "div", 51);
+            i0__namespace.ɵɵelementStart(2, "div", 52);
+            i0__namespace.ɵɵelement(3, "input", 53);
+            i0__namespace.ɵɵelementStart(4, "label", 54);
             i0__namespace.ɵɵtext(5);
             i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -27847,24 +28067,71 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r5 = i0__namespace.ɵɵnextContext();
+            var ctx_r8 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("formControlName", ctx_r5.caseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED)("id", ctx_r5.caseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED)("name", ctx_r5.caseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED);
+            i0__namespace.ɵɵproperty("formControlName", ctx_r8.caseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED)("id", ctx_r8.caseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED)("name", ctx_r8.caseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("for", ctx_r5.caseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED);
+            i0__namespace.ɵɵproperty("for", ctx_r8.caseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(6, 5, "I need to add a translation"), " ");
         }
     }
-    var _c0$l = function (a0) { return { "form-group-error": a0 }; };
+    function UpdateFlagComponent_div_21_button_10_Template(rf, ctx) {
+        if (rf & 1) {
+            var _r22_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "button", 59);
+            i0__namespace.ɵɵlistener("click", function UpdateFlagComponent_div_21_button_10_Template_button_click_0_listener() { i0__namespace.ɵɵrestoreView(_r22_1); var ctx_r21 = i0__namespace.ɵɵnextContext(2); return ctx_r21.onMakeInactive(); });
+            i0__namespace.ɵɵtext(1);
+            i0__namespace.ɵɵpipe(2, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, "Make inactive"), " ");
+        }
+    }
+    var _c0$l = function (a0) { return { "govuk-tag--grey": a0 }; };
+    function UpdateFlagComponent_div_21_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 55);
+            i0__namespace.ɵɵelementStart(1, "div", 56);
+            i0__namespace.ɵɵelementStart(2, "p");
+            i0__namespace.ɵɵtext(3);
+            i0__namespace.ɵɵpipe(4, "rpxTranslate");
+            i0__namespace.ɵɵelementStart(5, "span");
+            i0__namespace.ɵɵelementStart(6, "strong", 57);
+            i0__namespace.ɵɵtext(7);
+            i0__namespace.ɵɵpipe(8, "rpxTranslate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(9, "div", 56);
+            i0__namespace.ɵɵtemplate(10, UpdateFlagComponent_div_21_button_10_Template, 3, 3, "button", 58);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r9 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(4, 4, "Flag status:"), " ");
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(8, _c0$l, ctx_r9.selectedFlag.flagDetailDisplay.flagDetail.status === "Inactive"));
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(8, 6, ctx_r9.selectedFlag == null ? null : ctx_r9.selectedFlag.flagDetailDisplay == null ? null : ctx_r9.selectedFlag.flagDetailDisplay.flagDetail == null ? null : ctx_r9.selectedFlag.flagDetailDisplay.flagDetail.status), " ");
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r9.selectedFlag.flagDetailDisplay.flagDetail.status === "Active");
+        }
+    }
+    var _c1$6 = function (a0) { return { "form-group-error": a0 }; };
     var UpdateFlagComponent = /** @class */ (function () {
         function UpdateFlagComponent(rpxTranslationService) {
             this.rpxTranslationService = rpxTranslationService;
             this.caseFlagStateEmitter = new i0.EventEmitter();
             this.updateFlagTitle = '';
             this.errorMessages = [];
-            this.updateFlagNotEnteredErrorMessage = null;
-            this.updateFlagCharLimitErrorMessage = null;
+            this.commentsNotEnteredErrorMessage = null;
+            this.commentsCharLimitErrorMessage = null;
             this.statusReasonNotEnteredErrorMessage = null;
             this.statusReasonCharLimitErrorMessage = null;
             this.updateFlagStepEnum = exports.UpdateFlagStep;
@@ -27873,10 +28140,17 @@
             this.textMaxCharLimit = 200;
             this.selectedManageCaseLocation = 'selectedManageCaseLocation';
             this.caseFlagDisplayContextParameter = exports.CaseFlagDisplayContextParameter;
+            this.externalUserUpdate = false;
+            this.internalUserUpdate = false;
+            this.internalUser2Point1EnabledUpdate = false;
         }
         UpdateFlagComponent.prototype.ngOnInit = function () {
             var _this = this;
             var _a, _b;
+            // Set whether this is an external, internal, or internal Case Flags v2.1 enabled user update
+            this.externalUserUpdate = this.displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL;
+            this.internalUserUpdate = this.displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE;
+            this.internalUser2Point1EnabledUpdate = this.displayContextParameter === exports.CaseFlagDisplayContextParameter.UPDATE_2_POINT_1;
             this.selectedFlag = this.formGroup.get(this.selectedManageCaseLocation).value;
             if ((_b = (_a = this.selectedFlag) === null || _a === void 0 ? void 0 : _a.flagDetailDisplay) === null || _b === void 0 ? void 0 : _b.flagDetail) {
                 this.flagDetail = this.selectedFlag.flagDetailDisplay.flagDetail;
@@ -27893,7 +28167,8 @@
                 }
                 this.formGroup.addControl(exports.CaseFlagFormFields.COMMENTS, new i3.FormControl(existingComments));
                 this.formGroup.addControl(exports.CaseFlagFormFields.STATUS, new i3.FormControl(currentFlagStatusKey));
-                this.formGroup.addControl(exports.CaseFlagFormFields.STATUS_CHANGE_REASON, new i3.FormControl(''));
+                // Populate status reason only if the user is not external
+                this.formGroup.addControl(exports.CaseFlagFormFields.STATUS_CHANGE_REASON, new i3.FormControl(this.externalUserUpdate ? '' : this.flagDetail.flagUpdateComment));
                 this.formGroup.addControl(exports.CaseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED, new i3.FormControl(false));
                 this.updateFlagTitle = this.setUpdateCaseFlagTitle(this.flagDetail);
                 // Set the valid status options for display, based on current status of the selected flag. "Active" flags can
@@ -27916,12 +28191,14 @@
         UpdateFlagComponent.prototype.setUpdateCaseFlagTitle = function (flagDetail) {
             switch (this.displayContextParameter) {
                 case exports.CaseFlagDisplayContextParameter.UPDATE:
+                case exports.CaseFlagDisplayContextParameter.UPDATE_2_POINT_1:
                     if (flagDetail === null || flagDetail === void 0 ? void 0 : flagDetail.name) {
-                        return exports.CaseFlagWizardStepTitle.UPDATE_FLAG_TITLE + " \"" + flagDetail.name + (flagDetail.subTypeValue ? ", " + flagDetail.subTypeValue + "\"" : '"');
+                        var subTypeValue = flagDetail.subTypeValue ? ", " + flagDetail.subTypeValue : '';
+                        return exports.CaseFlagWizardStepTitle.UPDATE_FLAG_TITLE + " \"" + flagDetail.name + subTypeValue + "\"";
                     }
                     return "" + exports.CaseFlagWizardStepTitle.UPDATE_FLAG_TITLE;
                 case exports.CaseFlagDisplayContextParameter.UPDATE_EXTERNAL:
-                    return exports.CaseFlagWizardStepTitle.UPDATE_FLAG_TITLE_SUPPORT;
+                    return exports.CaseFlagWizardStepTitle.UPDATE_FLAG_TITLE_EXTERNAL;
                 default:
                     return exports.CaseFlagWizardStepTitle.NONE;
             }
@@ -27929,6 +28206,10 @@
         UpdateFlagComponent.prototype.onNext = function () {
             // Validate flag comments and status reason entry
             this.validateTextEntry();
+            // Set selected flag status to "Inactive" if update is by external user
+            if (this.externalUserUpdate) {
+                this.formGroup.get(exports.CaseFlagFormFields.STATUS).setValue(Object.keys(exports.CaseFlagStatus)[2]);
+            }
             // Return case flag field state, error messages, and selected flag detail to the parent. The selected flag must be
             // re-emitted because the parent component repopulates this on handling this EventEmitter
             this.caseFlagStateEmitter.emit({
@@ -27938,9 +28219,14 @@
             });
             window.scrollTo(0, 0);
         };
+        UpdateFlagComponent.prototype.onMakeInactive = function () {
+            // Set selected flag status to "Inactive" on screen and in the FormGroup
+            this.selectedFlag.flagDetailDisplay.flagDetail.status = exports.CaseFlagStatus.INACTIVE;
+            this.formGroup.get(exports.CaseFlagFormFields.STATUS).setValue(Object.keys(exports.CaseFlagStatus)[2]);
+        };
         UpdateFlagComponent.prototype.validateTextEntry = function () {
-            this.updateFlagNotEnteredErrorMessage = null;
-            this.updateFlagCharLimitErrorMessage = null;
+            this.commentsNotEnteredErrorMessage = null;
+            this.commentsCharLimitErrorMessage = null;
             this.statusReasonNotEnteredErrorMessage = null;
             this.statusReasonCharLimitErrorMessage = null;
             this.errorMessages = [];
@@ -27948,15 +28234,17 @@
             // is no existing comment then one is not required for validation to pass
             var comment = this.formGroup.get(exports.CaseFlagFormFields.COMMENTS).value;
             if (!comment && (this.flagDetail.flagComment || this.flagDetail.flagComment_cy)) {
-                this.updateFlagNotEnteredErrorMessage = exports.UpdateFlagErrorMessage.FLAG_COMMENTS_NOT_ENTERED;
+                this.commentsNotEnteredErrorMessage = !this.displayContextParameter
+                    ? exports.UpdateFlagErrorMessage.NONE
+                    : exports.UpdateFlagErrorMessage.FLAG_COMMENTS_NOT_ENTERED;
                 this.errorMessages.push({
                     title: '',
-                    description: exports.UpdateFlagErrorMessage.FLAG_COMMENTS_NOT_ENTERED,
+                    description: this.commentsNotEnteredErrorMessage,
                     fieldId: exports.CaseFlagFormFields.COMMENTS
                 });
             }
             if (comment && comment.length > this.textMaxCharLimit) {
-                this.updateFlagCharLimitErrorMessage = exports.UpdateFlagErrorMessage.FLAG_COMMENTS_CHAR_LIMIT_EXCEEDED;
+                this.commentsCharLimitErrorMessage = exports.UpdateFlagErrorMessage.FLAG_COMMENTS_CHAR_LIMIT_EXCEEDED;
                 this.errorMessages.push({
                     title: '',
                     description: exports.UpdateFlagErrorMessage.FLAG_COMMENTS_CHAR_LIMIT_EXCEEDED,
@@ -27965,6 +28253,7 @@
             }
             var statusReason = this.formGroup.get(exports.CaseFlagFormFields.STATUS_CHANGE_REASON).value;
             var flagStatusNotApprovedKey = Object.keys(exports.CaseFlagStatus).find(function (key) { return exports.CaseFlagStatus[key] === exports.CaseFlagStatus.NOT_APPROVED; });
+            // Status reason is mandatory if flag status is "Not approved" or user is external
             if (this.formGroup.get(exports.CaseFlagFormFields.STATUS).value === flagStatusNotApprovedKey && !statusReason) {
                 this.statusReasonNotEnteredErrorMessage = exports.UpdateFlagErrorMessage.STATUS_REASON_NOT_ENTERED;
                 this.errorMessages.push({
@@ -27973,6 +28262,14 @@
                     fieldId: exports.CaseFlagFormFields.STATUS_CHANGE_REASON
                 });
             }
+            if (this.externalUserUpdate && !statusReason) {
+                this.statusReasonNotEnteredErrorMessage = exports.UpdateFlagErrorMessage.STATUS_REASON_NOT_ENTERED_EXTERNAL;
+                this.errorMessages.push({
+                    title: '',
+                    description: exports.UpdateFlagErrorMessage.STATUS_REASON_NOT_ENTERED_EXTERNAL,
+                    fieldId: exports.CaseFlagFormFields.STATUS_CHANGE_REASON
+                });
+            }
             if (statusReason && statusReason.length > this.textMaxCharLimit) {
                 this.statusReasonCharLimitErrorMessage = exports.UpdateFlagErrorMessage.STATUS_REASON_CHAR_LIMIT_EXCEEDED;
                 this.errorMessages.push({
@@ -27985,7 +28282,7 @@
         return UpdateFlagComponent;
     }());
     UpdateFlagComponent.ɵfac = function UpdateFlagComponent_Factory(t) { return new (t || UpdateFlagComponent)(i0__namespace.ɵɵdirectiveInject(i1__namespace.RpxTranslationService)); };
-    UpdateFlagComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: UpdateFlagComponent, selectors: [["ccd-update-flag"]], inputs: { formGroup: "formGroup", displayContextParameter: "displayContextParameter" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter" }, decls: 30, vars: 32, consts: [[3, "formGroup"], ["data-module", "govuk-character-count", "data-maxlength", "200", 1, "govuk-character-count"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper", "govuk-!-margin-bottom-4"], [1, "govuk-label", "govuk-label--m"], ["id", "update-flag-hint", "class", "govuk-hint", 4, "ngIf"], [1, "govuk-!-margin-bottom-4"], [1, "govuk-label", "govuk-label--s", 3, "for"], ["id", "update-flag-hint", 1, "govuk-hint"], ["class", "govuk-warning-text", 4, "ngIf"], ["id", "update-flag-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "update-flag-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", "aria-describedby", "update-flag-hint update-flag-char-limit-info update-flag-char-limit-error", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "update-flag-comments-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], ["id", "flag-status-container", "class", "govuk-!-margin-bottom-4", 4, "ngIf"], ["class", "govuk-!-margin-bottom-6", 4, "ngIf"], [1, "govuk-button-group"], ["id", "updateFlagNextButton", "type", "button", 1, "govuk-button", 3, "click"], [1, "govuk-warning-text"], ["aria-hidden", "true", 1, "govuk-warning-text__icon"], [1, "govuk-warning-text__text"], [1, "govuk-warning-text__assistive"], ["id", "update-flag-not-entered-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "update-flag-char-limit-error", 1, "govuk-error-message"], ["id", "flag-status-container", 1, "govuk-!-margin-bottom-4"], ["aria-describedby", "update-flag-status-heading", 1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--s"], ["id", "update-flag-status-heading", 1, "govuk-fieldset__heading"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--conditional", "govuk-!-margin-bottom-4", 3, "id"], ["class", "govuk-radios__item", 4, "ngFor", "ngForOf"], ["id", "update-flag-status-hint", 1, "govuk-hint"], ["id", "update-flag-status-reason-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "update-flag-status-reason-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "update-flag-status-reason-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], [1, "govuk-radios__item"], ["type", "radio", 1, "govuk-radios__input", 3, "id", "name", "formControlName", "value"], [1, "govuk-label", "govuk-radios__label", 3, "for"], ["id", "update-flag-status-reason-not-entered-error-message", 1, "govuk-error-message"], ["id", "update-flag-status-reason-char-limit-error", 1, "govuk-error-message"], [1, "govuk-!-margin-bottom-6"], ["data-module", "govuk-checkboxes", 1, "govuk-checkboxes"], [1, "govuk-checkboxes__item"], ["type", "checkbox", 1, "govuk-checkboxes__input", 3, "formControlName", "id", "name"], [1, "govuk-label", "govuk-checkboxes__label", 3, "for"]], template: function UpdateFlagComponent_Template(rf, ctx) {
+    UpdateFlagComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: UpdateFlagComponent, selectors: [["ccd-update-flag"]], inputs: { formGroup: "formGroup", displayContextParameter: "displayContextParameter" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter" }, decls: 26, vars: 24, consts: [[3, "formGroup"], ["data-module", "govuk-character-count", "data-maxlength", "200", 1, "govuk-character-count"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper", "govuk-!-margin-bottom-4"], [1, "govuk-label", "govuk-label--m"], ["id", "update-flag-hint-external", "class", "govuk-hint", 4, "ngIf"], [1, "govuk-!-margin-bottom-4"], [1, "govuk-label", "govuk-label--s", 3, "for"], ["id", "update-flag-comments-hint-external", "class", "govuk-hint", 4, "ngIf"], [4, "ngIf", "ngIfElse"], ["externalUser", ""], ["updateFlagStatusReason", ""], ["id", "flag-status-container-v2_1", "class", "govuk-!-margin-bottom-4", 4, "ngIf"], ["id", "translation-checkbox-container", "class", "govuk-!-margin-bottom-6", 4, "ngIf"], ["id", "flag-status-container-v1", "class", "govuk-grid-row", 4, "ngIf"], [1, "govuk-button-group"], ["id", "updateFlagNextButton", "type", "button", 1, "govuk-button", 3, "click"], ["id", "update-flag-hint-external", 1, "govuk-hint"], ["id", "update-flag-comments-hint-external", 1, "govuk-hint"], ["id", "update-flag-comments-hint", 1, "govuk-hint"], ["class", "govuk-warning-text", 4, "ngIf"], ["id", "update-flag-comments-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "update-flag-comments-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", "aria-describedby", "update-flag-comments-hint update-flag-comments-char-limit-info update-flag-comments-char-limit-error", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "update-flag-comments-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], [1, "govuk-warning-text"], ["aria-hidden", "true", 1, "govuk-warning-text__icon"], [1, "govuk-warning-text__text"], [1, "govuk-warning-text__assistive"], ["id", "update-flag-comments-not-entered-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "update-flag-comments-char-limit-error", 1, "govuk-error-message"], [4, "ngIf"], [4, "ngTemplateOutlet"], ["id", "update-flag-status-reason-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "update-flag-status-reason-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", "aria-describedby", "update-flag-comments-hint-external update-flag-status-hint update-flag-status-reason-char-limit-info\n                  update-flag-status-reason-char-limit-error", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "update-flag-status-reason-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], ["id", "update-flag-status-reason-not-entered-error-message", 1, "govuk-error-message"], ["id", "update-flag-status-reason-char-limit-error", 1, "govuk-error-message"], ["id", "flag-status-container-v2_1", 1, "govuk-!-margin-bottom-4"], ["aria-describedby", "update-flag-status-heading", 1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--s"], ["id", "update-flag-status-heading", 1, "govuk-fieldset__heading"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--conditional", "govuk-!-margin-bottom-4", 3, "id"], ["class", "govuk-radios__item", 4, "ngFor", "ngForOf"], ["id", "update-flag-status-hint", 1, "govuk-hint"], [1, "govuk-radios__item"], ["type", "radio", 1, "govuk-radios__input", 3, "id", "name", "formControlName", "value"], [1, "govuk-label", "govuk-radios__label", 3, "for"], ["id", "translation-checkbox-container", 1, "govuk-!-margin-bottom-6"], ["data-module", "govuk-checkboxes", 1, "govuk-checkboxes"], [1, "govuk-checkboxes__item"], ["type", "checkbox", 1, "govuk-checkboxes__input", 3, "formControlName", "id", "name"], [1, "govuk-label", "govuk-checkboxes__label", 3, "for"], ["id", "flag-status-container-v1", 1, "govuk-grid-row"], [1, "govuk-grid-column-one-half"], [1, "govuk-tag", 3, "ngClass"], ["class", "button button-secondary", "type", "button", 3, "click", 4, "ngIf"], ["type", "button", 1, "button", "button-secondary", 3, "click"]], template: function UpdateFlagComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementContainerStart(0, 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
@@ -28003,64 +28300,50 @@
                 i0__namespace.ɵɵpipe(11, "rpxTranslate");
                 i0__namespace.ɵɵpipe(12, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(13, "div", 8);
-                i0__namespace.ɵɵtext(14);
-                i0__namespace.ɵɵpipe(15, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(16, UpdateFlagComponent_div_16_Template, 9, 6, "div", 9);
-                i0__namespace.ɵɵtemplate(17, UpdateFlagComponent_div_17_Template, 6, 6, "div", 10);
-                i0__namespace.ɵɵtemplate(18, UpdateFlagComponent_div_18_Template, 6, 6, "div", 11);
-                i0__namespace.ɵɵelementStart(19, "textarea", 12);
-                i0__namespace.ɵɵtext(20, "        ");
+                i0__namespace.ɵɵtemplate(13, UpdateFlagComponent_div_13_Template, 3, 3, "div", 8);
+                i0__namespace.ɵɵtemplate(14, UpdateFlagComponent_ng_container_14_Template, 13, 14, "ng-container", 9);
+                i0__namespace.ɵɵtemplate(15, UpdateFlagComponent_ng_template_15_Template, 1, 1, "ng-template", null, 10, i0__namespace.ɵɵtemplateRefExtractor);
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(21, "div", 13);
-                i0__namespace.ɵɵtext(22);
-                i0__namespace.ɵɵpipe(23, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(24, UpdateFlagComponent_div_24_Template, 19, 19, "div", 14);
-                i0__namespace.ɵɵtemplate(25, UpdateFlagComponent_div_25_Template, 7, 7, "div", 15);
+                i0__namespace.ɵɵtemplate(17, UpdateFlagComponent_ng_template_17_Template, 7, 8, "ng-template", null, 11, i0__namespace.ɵɵtemplateRefExtractor);
+                i0__namespace.ɵɵtemplate(19, UpdateFlagComponent_div_19_Template, 13, 12, "div", 12);
+                i0__namespace.ɵɵtemplate(20, UpdateFlagComponent_div_20_Template, 7, 7, "div", 13);
+                i0__namespace.ɵɵtemplate(21, UpdateFlagComponent_div_21_Template, 11, 10, "div", 14);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementContainerEnd();
-                i0__namespace.ɵɵelementStart(26, "div", 16);
-                i0__namespace.ɵɵelementStart(27, "button", 17);
-                i0__namespace.ɵɵlistener("click", function UpdateFlagComponent_Template_button_click_27_listener() { return ctx.onNext(); });
-                i0__namespace.ɵɵtext(28);
-                i0__namespace.ɵɵpipe(29, "rpxTranslate");
+                i0__namespace.ɵɵelementStart(22, "div", 15);
+                i0__namespace.ɵɵelementStart(23, "button", 16);
+                i0__namespace.ɵɵlistener("click", function UpdateFlagComponent_Template_button_click_23_listener() { return ctx.onNext(); });
+                i0__namespace.ɵɵtext(24);
+                i0__namespace.ɵɵpipe(25, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
+                var _r3 = i0__namespace.ɵɵreference(16);
                 i0__namespace.ɵɵproperty("formGroup", ctx.formGroup);
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(30, _c0$l, ctx.errorMessages.length > 0));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(22, _c1$6, ctx.errorMessages.length > 0));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(6, 18, ctx.updateFlagTitle), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(6, 14, ctx.updateFlagTitle), " ");
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", ctx.displayContextParameter === ctx.caseFlagDisplayContextParameter.UPDATE_EXTERNAL);
+                i0__namespace.ɵɵproperty("ngIf", ctx.externalUserUpdate);
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("for", ctx.caseFlagFormFields.COMMENTS);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵtextInterpolate2(" ", i0__namespace.ɵɵpipeBind1(11, 20, ctx.updateFlagTitle), " ", i0__namespace.ɵɵpipeBind1(12, 22, "comments"), " ");
-                i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(15, 24, ctx.updateFlagStepEnum.COMMENT_HINT_TEXT), " ");
-                i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", ctx.displayContextParameter === ctx.caseFlagDisplayContextParameter.UPDATE);
+                i0__namespace.ɵɵtextInterpolate2(" ", i0__namespace.ɵɵpipeBind1(11, 16, ctx.updateFlagTitle), " ", i0__namespace.ɵɵpipeBind1(12, 18, "comments"), " ");
+                i0__namespace.ɵɵadvance(3);
+                i0__namespace.ɵɵproperty("ngIf", ctx.externalUserUpdate);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.updateFlagNotEnteredErrorMessage);
+                i0__namespace.ɵɵproperty("ngIf", ctx.internalUserUpdate || ctx.internalUser2Point1EnabledUpdate || ctx.displayContextParameter === "")("ngIfElse", _r3);
+                i0__namespace.ɵɵadvance(5);
+                i0__namespace.ɵɵproperty("ngIf", ctx.internalUser2Point1EnabledUpdate);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.updateFlagCharLimitErrorMessage);
+                i0__namespace.ɵɵproperty("ngIf", ctx.internalUser2Point1EnabledUpdate);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("id", ctx.caseFlagFormFields.COMMENTS)("name", ctx.caseFlagFormFields.COMMENTS)("formControlName", ctx.caseFlagFormFields.COMMENTS);
+                i0__namespace.ɵɵproperty("ngIf", ctx.internalUserUpdate);
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(23, 26, ctx.updateFlagStepEnum.CHARACTER_LIMIT_INFO), " ");
-                i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", ctx.displayContextParameter === ctx.caseFlagDisplayContextParameter.UPDATE);
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.displayContextParameter === ctx.caseFlagDisplayContextParameter.UPDATE);
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(29, 28, "Next"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(25, 20, "Next"), " ");
             }
         }, encapsulation: 2 });
     (function () {
@@ -32135,7 +32418,7 @@
     i0__namespace.ɵɵsetComponentScope(SelectFlagTypeComponent, [i5__namespace.NgIf, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgClass, i5__namespace.NgForOf, i3__namespace.RadioControlValueAccessor, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName, i3__namespace.CheckboxControlValueAccessor], [i1__namespace.RpxTranslatePipe, FlagFieldDisplayPipe]);
     i0__namespace.ɵɵsetComponentScope(SearchLanguageInterpreterComponent, [i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgClass, i5__namespace.NgIf, i14__namespace.MatInput, i3__namespace.DefaultValueAccessor, i5__namespace$1.MatAutocompleteTrigger, i3__namespace.NgControlStatus, i3__namespace.FormControlName, i5__namespace$1.MatAutocomplete, i5__namespace.NgForOf, i6__namespace.MatOption], [FlagFieldDisplayPipe, i1__namespace.RpxTranslatePipe, i5__namespace.AsyncPipe, LanguageInterpreterDisplayPipe]);
     i0__namespace.ɵɵsetComponentScope(ManageCaseFlagsComponent, [i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgClass, i5__namespace.NgIf, i5__namespace.NgForOf, i3__namespace.RadioControlValueAccessor, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName], [i1__namespace.RpxTranslatePipe, ManageCaseFlagsLabelDisplayPipe]);
-    i0__namespace.ɵɵsetComponentScope(UpdateFlagComponent, [i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgClass, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName, i5__namespace.NgForOf, i3__namespace.RadioControlValueAccessor, i3__namespace.CheckboxControlValueAccessor], [i1__namespace.RpxTranslatePipe, UpdateFlagTitleDisplayPipe]);
+    i0__namespace.ɵɵsetComponentScope(UpdateFlagComponent, [i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgClass, i5__namespace.NgIf, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName, i5__namespace.NgTemplateOutlet, i5__namespace.NgForOf, i3__namespace.RadioControlValueAccessor, i3__namespace.CheckboxControlValueAccessor], [i1__namespace.RpxTranslatePipe, UpdateFlagTitleDisplayPipe]);
     i0__namespace.ɵɵsetComponentScope(
     // Components for linked cases
     LinkedCasesToTableComponent, [i5__namespace.NgIf, i5__namespace.NgForOf], [CaseReferencePipe, LinkCasesReasonValuePipe]);
@@ -32160,12 +32443,19 @@
         CaseEventCompletionComponent
     ], []);
 
-    function CaseEditSubmitComponent_div_0_div_3_Template(rf, ctx) {
+    var CaseEditSubmitTitles;
+    (function (CaseEditSubmitTitles) {
+        CaseEditSubmitTitles["REVIEW_SUPPORT_REQUEST"] = "Review support request";
+        CaseEditSubmitTitles["REVIEW_FLAG_DETAILS"] = "Review flag details";
+        CaseEditSubmitTitles["CHECK_YOUR_ANSWERS"] = "Check your answers";
+    })(CaseEditSubmitTitles || (CaseEditSubmitTitles = {}));
+
+    function CaseEditSubmitComponent_div_0_div_4_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelement(0, "div");
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_template_4_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_template_5_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelement(0, "ccd-markdown", 14);
             i0__namespace.ɵɵpipe(1, "ccdCaseTitle");
@@ -32175,7 +32465,7 @@
             i0__namespace.ɵɵproperty("content", i0__namespace.ɵɵpipeBind3(1, 1, ctx_r4.getCaseTitle(), ctx_r4.contextFields, ctx_r4.editForm.controls["data"]));
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_template_6_h2_0_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_template_7_h2_0_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "h2", 16);
             i0__namespace.ɵɵtext(1);
@@ -32188,16 +32478,16 @@
             i0__namespace.ɵɵtextInterpolate1("#", i0__namespace.ɵɵpipeBind1(2, 1, ctx_r10.getCaseId()), "");
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_template_6_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_template_7_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵtemplate(0, CaseEditSubmitComponent_div_0_ng_template_6_h2_0_Template, 3, 3, "h2", 15);
+            i0__namespace.ɵɵtemplate(0, CaseEditSubmitComponent_div_0_ng_template_7_h2_0_Template, 3, 3, "h2", 15);
         }
         if (rf & 2) {
             var ctx_r6 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵproperty("ngIf", ctx_r6.getCaseId());
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_11_span_4_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_span_4_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "span", 20);
             i0__namespace.ɵɵtext(1);
@@ -32209,9 +32499,9 @@
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(2, 1, "Check the information below carefully."));
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_ng_container_1_ng_container_1_th_2_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_ng_container_1_th_2_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "th", 27);
+            i0__namespace.ɵɵelementStart(0, "th", 25);
             i0__namespace.ɵɵelementStart(1, "span", 20);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵelementEnd();
@@ -32223,33 +32513,51 @@
             i0__namespace.ɵɵtextInterpolate(field_r16.label);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_ng_container_1_ng_container_1_a_6_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_ng_container_1_ng_container_5_a_2_Template(rf, ctx) {
         if (rf & 1) {
-            var _r23_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r24_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "a", 13);
-            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_ng_container_1_ng_container_1_a_6_Template_a_click_0_listener() { i0__namespace.ɵɵrestoreView(_r23_1); var page_r13 = i0__namespace.ɵɵnextContext(4).$implicit; var ctx_r21 = i0__namespace.ɵɵnextContext(3); return ctx_r21.navigateToPage(page_r13.id); });
+            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_ng_container_1_ng_container_5_a_2_Template_a_click_0_listener() { i0__namespace.ɵɵrestoreView(_r24_1); var page_r13 = i0__namespace.ɵɵnextContext(5).$implicit; var ctx_r22 = i0__namespace.ɵɵnextContext(3); return ctx_r22.navigateToPage(page_r13.id); });
             i0__namespace.ɵɵelementStart(1, "span", 20);
-            i0__namespace.ɵɵtext(2, "Change");
+            i0__namespace.ɵɵpipe(2, "rpxTranslate");
+            i0__namespace.ɵɵpipe(3, "rpxTranslate");
+            i0__namespace.ɵɵtext(4);
+            i0__namespace.ɵɵpipe(5, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r16 = i0__namespace.ɵɵnextContext(2).$implicit;
+            var field_r16 = i0__namespace.ɵɵnextContext(3).$implicit;
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵattributeInterpolate1("aria-label", "Change ", field_r16.label, "");
+            i0__namespace.ɵɵattributeInterpolate2("aria-label", "", i0__namespace.ɵɵpipeBind1(2, 3, "Change"), " ", i0__namespace.ɵɵpipeBind1(3, 5, field_r16.label), "");
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(5, 7, "Change"), " ");
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_ng_container_1_ng_container_1_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_ng_container_1_ng_container_5_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "td", 26);
+            i0__namespace.ɵɵtemplate(2, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_ng_container_1_ng_container_5_a_2_Template, 6, 9, "a", 27);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementContainerEnd();
+        }
+        if (rf & 2) {
+            var field_r16 = i0__namespace.ɵɵnextContext(2).$implicit;
+            var ctx_r19 = i0__namespace.ɵɵnextContext(5);
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r19.isChangeAllowed(field_r16));
+        }
+    }
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
             i0__namespace.ɵɵelementStart(1, "tr", 21);
-            i0__namespace.ɵɵtemplate(2, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_ng_container_1_ng_container_1_th_2_Template, 3, 1, "th", 22);
+            i0__namespace.ɵɵtemplate(2, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_ng_container_1_th_2_Template, 3, 1, "th", 22);
             i0__namespace.ɵɵelementStart(3, "td", 23);
             i0__namespace.ɵɵelement(4, "ccd-field-read", 24);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(5, "td", 25);
-            i0__namespace.ɵɵtemplate(6, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_ng_container_1_ng_container_1_a_6_Template, 3, 1, "a", 26);
-            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵtemplate(5, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_ng_container_1_ng_container_5_Template, 3, 1, "ng-container", 0);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
@@ -32264,14 +32572,14 @@
             i0__namespace.ɵɵattribute("colspan", ctx_r17.isLabel(field_r16) ? "2" : "1");
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("formGroup", ctx_r17.editForm.controls["data"])("topLevelFormGroup", ctx_r17.editForm.controls["data"])("caseField", ctx_r17.summaryCaseField(field_r16))("context", ctx_r17.paletteContext)("caseFields", ctx_r17.contextFields);
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r17.isChangeAllowed(field_r16));
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngIf", !ctx_r17.caseEdit.isCaseFlagSubmission);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_ng_container_1_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_ng_container_1_ng_container_1_Template, 7, 12, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_ng_container_1_Template, 6, 12, "ng-container", 0);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
@@ -32282,10 +32590,10 @@
         }
     }
     var _c0$d = function (a0, a4) { return [a0, false, undefined, true, a4]; };
-    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_ng_container_1_Template, 2, 1, "ng-container", 19);
+            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_ng_container_1_Template, 2, 1, "ng-container", 19);
             i0__namespace.ɵɵpipe(2, "ccdCYAPageLabelFilter");
             i0__namespace.ɵɵpipe(3, "ccdReadFieldsFilter");
             i0__namespace.ɵɵpipe(4, "ccdPageFields");
@@ -32298,10 +32606,10 @@
             i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(12, _c0$d, i0__namespace.ɵɵpipeBind2(4, 9, page_r13, ctx_r14.editForm), ctx_r14.editForm.controls["data"]))));
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_Template, 5, 15, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_ng_container_1_Template, 5, 15, "ng-container", 0);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
@@ -32311,17 +32619,17 @@
             i0__namespace.ɵɵproperty("ngIf", ctx_r12.isShown(page_r13));
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_11_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_12_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
             i0__namespace.ɵɵelementStart(1, "h2", 16);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(4, CaseEditSubmitComponent_div_0_ng_container_11_span_4_Template, 3, 3, "span", 17);
+            i0__namespace.ɵɵtemplate(4, CaseEditSubmitComponent_div_0_ng_container_12_span_4_Template, 3, 3, "span", 17);
             i0__namespace.ɵɵelementStart(5, "table", 18);
             i0__namespace.ɵɵelementStart(6, "tbody");
-            i0__namespace.ɵɵtemplate(7, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_Template, 2, 1, "ng-container", 19);
+            i0__namespace.ɵɵtemplate(7, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_7_Template, 2, 1, "ng-container", 19);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
@@ -32336,7 +32644,7 @@
             i0__namespace.ɵɵproperty("ngForOf", ctx_r7.wizard.pages);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_tr_3_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_tr_3_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "tr", 32);
             i0__namespace.ɵɵelementStart(1, "th", 33);
@@ -32348,16 +32656,16 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r28 = i0__namespace.ɵɵnextContext().$implicit;
-            var ctx_r29 = i0__namespace.ɵɵnextContext(3);
-            i0__namespace.ɵɵproperty("caseField", field_r28)("formGroup", ctx_r29.editForm.controls["data"])("contextFields", ctx_r29.contextFields);
+            var field_r30 = i0__namespace.ɵɵnextContext().$implicit;
+            var ctx_r31 = i0__namespace.ɵɵnextContext(3);
+            i0__namespace.ɵɵproperty("caseField", field_r30)("formGroup", ctx_r31.editForm.controls["data"])("contextFields", ctx_r31.contextFields);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(field_r28.label);
+            i0__namespace.ɵɵtextInterpolate(field_r30.label);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("formGroup", ctx_r29.editForm.controls["data"])("caseField", ctx_r29.summaryCaseField(field_r28));
+            i0__namespace.ɵɵproperty("formGroup", ctx_r31.editForm.controls["data"])("caseField", ctx_r31.summaryCaseField(field_r30));
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_tr_4_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_tr_4_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "tr", 36);
             i0__namespace.ɵɵelementStart(1, "td", 37);
@@ -32366,39 +32674,39 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var field_r28 = i0__namespace.ɵɵnextContext().$implicit;
-            var ctx_r30 = i0__namespace.ɵɵnextContext(3);
-            i0__namespace.ɵɵproperty("caseField", field_r28)("formGroup", ctx_r30.editForm.controls["data"])("contextFields", ctx_r30.contextFields);
+            var field_r30 = i0__namespace.ɵɵnextContext().$implicit;
+            var ctx_r32 = i0__namespace.ɵɵnextContext(3);
+            i0__namespace.ɵɵproperty("caseField", field_r30)("formGroup", ctx_r32.editForm.controls["data"])("contextFields", ctx_r32.contextFields);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("formGroup", ctx_r30.editForm.controls["data"])("caseField", ctx_r30.summaryCaseField(field_r28))("caseFields", ctx_r30.contextFields);
+            i0__namespace.ɵɵproperty("formGroup", ctx_r32.editForm.controls["data"])("caseField", ctx_r32.summaryCaseField(field_r30))("caseFields", ctx_r32.contextFields);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
             i0__namespace.ɵɵelementContainerStart(1, 29);
             i0__namespace.ɵɵpipe(2, "ccdIsCompound");
-            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_tr_3_Template, 5, 6, "tr", 30);
-            i0__namespace.ɵɵtemplate(4, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_tr_4_Template, 3, 6, "tr", 31);
+            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_tr_3_Template, 5, 6, "tr", 30);
+            i0__namespace.ɵɵtemplate(4, CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_tr_4_Template, 3, 6, "tr", 31);
             i0__namespace.ɵɵelementContainerEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var field_r28 = ctx.$implicit;
+            var field_r30 = ctx.$implicit;
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngSwitch", !i0__namespace.ɵɵpipeBind1(2, 3, field_r28));
+            i0__namespace.ɵɵproperty("ngSwitch", !i0__namespace.ɵɵpipeBind1(2, 3, field_r30));
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngSwitchCase", true);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngSwitchCase", false);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_12_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_13_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
             i0__namespace.ɵɵelementStart(1, "table", 28);
             i0__namespace.ɵɵelementStart(2, "tbody");
-            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_12_ng_container_3_Template, 5, 5, "ng-container", 19);
+            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_ng_container_13_ng_container_3_Template, 5, 5, "ng-container", 19);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
@@ -32409,84 +32717,78 @@
             i0__namespace.ɵɵproperty("ngForOf", ctx_r8.showSummaryFields);
         }
     }
-    function CaseEditSubmitComponent_div_0_ng_container_13_fieldset_1_Template(rf, ctx) {
+    function CaseEditSubmitComponent_div_0_ng_container_14_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "fieldset", 40);
-            i0__namespace.ɵɵelement(1, "legend", 41);
-            i0__namespace.ɵɵelementStart(2, "div", 42);
-            i0__namespace.ɵɵelementStart(3, "label", 43);
-            i0__namespace.ɵɵtext(4, " Event summary (optional) ");
-            i0__namespace.ɵɵelementStart(5, "span", 44);
-            i0__namespace.ɵɵtext(6, "A few words describing the purpose of the event.");
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelementStart(1, "fieldset", 39);
+            i0__namespace.ɵɵelement(2, "legend", 40);
+            i0__namespace.ɵɵelementStart(3, "div", 41);
+            i0__namespace.ɵɵelementStart(4, "label", 42);
+            i0__namespace.ɵɵtext(5, " Event summary (optional) ");
+            i0__namespace.ɵɵelementStart(6, "span", 43);
+            i0__namespace.ɵɵtext(7, "A few words describing the purpose of the event.");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelement(7, "input", 45);
+            i0__namespace.ɵɵelement(8, "input", 44);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(8, "div", 42);
-            i0__namespace.ɵɵelementStart(9, "label", 46);
-            i0__namespace.ɵɵtext(10, "Event description (optional)");
+            i0__namespace.ɵɵelementStart(9, "div", 41);
+            i0__namespace.ɵɵelementStart(10, "label", 45);
+            i0__namespace.ɵɵtext(11, "Event description (optional)");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelement(11, "textarea", 47);
+            i0__namespace.ɵɵelement(12, "textarea", 46);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-        }
-    }
-    function CaseEditSubmitComponent_div_0_ng_container_13_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_13_fieldset_1_Template, 12, 0, "fieldset", 39);
             i0__namespace.ɵɵelementContainerEnd();
         }
-        if (rf & 2) {
-            var ctx_r9 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r9.profile && !ctx_r9.isSolicitor());
-        }
     }
     function CaseEditSubmitComponent_div_0_Template(rf, ctx) {
         if (rf & 1) {
-            var _r35_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r36_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "div");
             i0__namespace.ɵɵelementStart(1, "h1", 2);
             i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(3, CaseEditSubmitComponent_div_0_div_3_Template, 1, 0, "div", 3);
-            i0__namespace.ɵɵtemplate(4, CaseEditSubmitComponent_div_0_ng_template_4_Template, 2, 5, "ng-template", null, 4, i0__namespace.ɵɵtemplateRefExtractor);
-            i0__namespace.ɵɵtemplate(6, CaseEditSubmitComponent_div_0_ng_template_6_Template, 1, 1, "ng-template", null, 5, i0__namespace.ɵɵtemplateRefExtractor);
-            i0__namespace.ɵɵelement(8, "ccd-case-edit-generic-errors", 6);
-            i0__namespace.ɵɵelementStart(9, "ccd-callback-errors", 7);
-            i0__namespace.ɵɵlistener("callbackErrorsContext", function CaseEditSubmitComponent_div_0_Template_ccd_callback_errors_callbackErrorsContext_9_listener($event) { i0__namespace.ɵɵrestoreView(_r35_1); var ctx_r34 = i0__namespace.ɵɵnextContext(); return ctx_r34.callbackErrorsNotify($event); });
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(10, "form", 8);
-            i0__namespace.ɵɵlistener("submit", function CaseEditSubmitComponent_div_0_Template_form_submit_10_listener() { i0__namespace.ɵɵrestoreView(_r35_1); var ctx_r36 = i0__namespace.ɵɵnextContext(); return ctx_r36.submit(); });
-            i0__namespace.ɵɵtemplate(11, CaseEditSubmitComponent_div_0_ng_container_11_Template, 8, 5, "ng-container", 0);
-            i0__namespace.ɵɵtemplate(12, CaseEditSubmitComponent_div_0_ng_container_12_Template, 4, 1, "ng-container", 0);
-            i0__namespace.ɵɵtemplate(13, CaseEditSubmitComponent_div_0_ng_container_13_Template, 2, 1, "ng-container", 0);
-            i0__namespace.ɵɵelementStart(14, "div", 9);
-            i0__namespace.ɵɵelementStart(15, "button", 10);
-            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_Template_button_click_15_listener() { i0__namespace.ɵɵrestoreView(_r35_1); var ctx_r37 = i0__namespace.ɵɵnextContext(); return ctx_r37.previous(); });
-            i0__namespace.ɵɵtext(16, "Previous");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(17, "button", 11);
-            i0__namespace.ɵɵtext(18);
+            i0__namespace.ɵɵtemplate(4, CaseEditSubmitComponent_div_0_div_4_Template, 1, 0, "div", 3);
+            i0__namespace.ɵɵtemplate(5, CaseEditSubmitComponent_div_0_ng_template_5_Template, 2, 5, "ng-template", null, 4, i0__namespace.ɵɵtemplateRefExtractor);
+            i0__namespace.ɵɵtemplate(7, CaseEditSubmitComponent_div_0_ng_template_7_Template, 1, 1, "ng-template", null, 5, i0__namespace.ɵɵtemplateRefExtractor);
+            i0__namespace.ɵɵelement(9, "ccd-case-edit-generic-errors", 6);
+            i0__namespace.ɵɵelementStart(10, "ccd-callback-errors", 7);
+            i0__namespace.ɵɵlistener("callbackErrorsContext", function CaseEditSubmitComponent_div_0_Template_ccd_callback_errors_callbackErrorsContext_10_listener($event) { i0__namespace.ɵɵrestoreView(_r36_1); var ctx_r35 = i0__namespace.ɵɵnextContext(); return ctx_r35.callbackErrorsNotify($event); });
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(11, "form", 8);
+            i0__namespace.ɵɵlistener("submit", function CaseEditSubmitComponent_div_0_Template_form_submit_11_listener() { i0__namespace.ɵɵrestoreView(_r36_1); var ctx_r37 = i0__namespace.ɵɵnextContext(); return ctx_r37.submit(); });
+            i0__namespace.ɵɵtemplate(12, CaseEditSubmitComponent_div_0_ng_container_12_Template, 8, 5, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(13, CaseEditSubmitComponent_div_0_ng_container_13_Template, 4, 1, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(14, CaseEditSubmitComponent_div_0_ng_container_14_Template, 13, 0, "ng-container", 0);
+            i0__namespace.ɵɵelementStart(15, "div", 9);
+            i0__namespace.ɵɵelementStart(16, "button", 10);
+            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_Template_button_click_16_listener() { i0__namespace.ɵɵrestoreView(_r36_1); var ctx_r38 = i0__namespace.ɵɵnextContext(); return ctx_r38.previous(); });
+            i0__namespace.ɵɵtext(17);
+            i0__namespace.ɵɵpipe(18, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(19, "button", 11);
+            i0__namespace.ɵɵtext(20);
+            i0__namespace.ɵɵpipe(21, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(19, "p", 12);
-            i0__namespace.ɵɵelementStart(20, "a", 13);
-            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_Template_a_click_20_listener() { i0__namespace.ɵɵrestoreView(_r35_1); var ctx_r38 = i0__namespace.ɵɵnextContext(); return ctx_r38.cancel(); });
-            i0__namespace.ɵɵtext(21);
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(22, "p", 12);
+            i0__namespace.ɵɵelementStart(23, "a", 13);
+            i0__namespace.ɵɵlistener("click", function CaseEditSubmitComponent_div_0_Template_a_click_23_listener() { i0__namespace.ɵɵrestoreView(_r36_1); var ctx_r39 = i0__namespace.ɵɵnextContext(); return ctx_r39.cancel(); });
+            i0__namespace.ɵɵtext(24);
+            i0__namespace.ɵɵpipe(25, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var _r3 = i0__namespace.ɵɵreference(5);
-            var _r5 = i0__namespace.ɵɵreference(7);
+            var _r3 = i0__namespace.ɵɵreference(6);
+            var _r5 = i0__namespace.ɵɵreference(8);
             var ctx_r0 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(ctx_r0.eventTrigger.name);
-            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 17, ctx_r0.eventTrigger.name));
+            i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.getCaseTitle())("ngIfThen", _r3)("ngIfElse", _r5);
             i0__namespace.ɵɵadvance(5);
             i0__namespace.ɵɵproperty("error", ctx_r0.caseEdit.error);
@@ -32502,21 +32804,23 @@
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.showEventNotes());
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("disabled", !ctx_r0.hasPrevious() || ctx_r0.caseEdit.isSubmitting);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(18, 19, "Previous"), " ");
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("disabled", ctx_r0.isDisabled);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(ctx_r0.triggerText);
-            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(21, 21, ctx_r0.triggerText), " ");
+            i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵclassProp("disabled", ctx_r0.caseEdit.isSubmitting);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(ctx_r0.getCancelText());
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(25, 23, ctx_r0.getCancelText()), " ");
         }
     }
     function CaseEditSubmitComponent_ccd_case_event_completion_1_Template(rf, ctx) {
         if (rf & 1) {
-            var _r40_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "ccd-case-event-completion", 48);
-            i0__namespace.ɵɵlistener("eventCanBeCompleted", function CaseEditSubmitComponent_ccd_case_event_completion_1_Template_ccd_case_event_completion_eventCanBeCompleted_0_listener($event) { i0__namespace.ɵɵrestoreView(_r40_1); var ctx_r39 = i0__namespace.ɵɵnextContext(); return ctx_r39.onEventCanBeCompleted($event); });
+            var _r41_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "ccd-case-event-completion", 47);
+            i0__namespace.ɵɵlistener("eventCanBeCompleted", function CaseEditSubmitComponent_ccd_case_event_completion_1_Template_ccd_case_event_completion_eventCanBeCompleted_0_listener($event) { i0__namespace.ɵɵrestoreView(_r41_1); var ctx_r40 = i0__namespace.ɵɵnextContext(); return ctx_r40.onEventCanBeCompleted($event); });
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
@@ -32562,7 +32866,7 @@
                 this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isCaseFieldOfType(caseField, ['FlagLauncher']); });
             this.caseEdit.isLinkedCasesSubmission =
                 this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isCaseFieldOfType(caseField, ['ComponentLauncher']); });
-            this.pageTitle = this.caseEdit.isCaseFlagSubmission ? 'Review flag details' : 'Check your answers';
+            this.pageTitle = this.getPageTitle();
         };
         CaseEditSubmitComponent.prototype.ngOnDestroy = function () {
             /* istanbul ignore else */
@@ -32587,6 +32891,17 @@
                 submit: this.caseEdit.submit,
             });
         };
+        CaseEditSubmitComponent.prototype.getPageTitle = function () {
+            var caseFlagField = this.eventTrigger.case_fields.find(function (caseField) { return FieldsUtils.isCaseFieldOfType(caseField, ['FlagLauncher']); });
+            if (caseFlagField) {
+                var isCaseFlagExternalMode = caseFlagField.display_context_parameter === '#ARGUMENT(UPDATE,EXTERNAL)' ||
+                    caseFlagField.display_context_parameter === '#ARGUMENT(CREATE,EXTERNAL)';
+                return isCaseFlagExternalMode
+                    ? CaseEditSubmitTitles.REVIEW_SUPPORT_REQUEST
+                    : CaseEditSubmitTitles.REVIEW_FLAG_DETAILS;
+            }
+            return CaseEditSubmitTitles.CHECK_YOUR_ANSWERS;
+        };
         Object.defineProperty(CaseEditSubmitComponent.prototype, "hasErrors", {
             get: function () {
                 var _a, _b, _c;
@@ -32677,7 +32992,16 @@
             return this.eventTrigger.case_fields.some(function (field) { return field.show_summary_content_option >= 0; });
         };
         CaseEditSubmitComponent.prototype.showEventNotes = function () {
-            return !!this.eventTrigger.show_event_notes;
+            var _a;
+            // Display event notes related controls only if the following conditions are met
+            // 1. show_event_notes flag is set to true
+            // 2. profile is not a solicitor
+            // 3. is not a case flags journey, as it uses a custom check your answers component
+            if (this.eventTrigger.show_event_notes) {
+                return !((_a = this.profile) === null || _a === void 0 ? void 0 : _a.isSolicitor())
+                    && !this.caseEdit.isCaseFlagSubmission;
+            }
+            return false;
         };
         CaseEditSubmitComponent.prototype.getLastPageShown = function () {
             var _this = this;
@@ -32707,9 +33031,6 @@
         CaseEditSubmitComponent.prototype.canShowFieldInCYA = function (field) {
             return field.show_summary_change_option;
         };
-        CaseEditSubmitComponent.prototype.isSolicitor = function () {
-            return this.profile.isSolicitor();
-        };
         CaseEditSubmitComponent.prototype.sortFieldsByShowSummaryContent = function (fields) {
             return this.orderService
                 .sort(fields, CaseEditSubmitComponent.SHOW_SUMMARY_CONTENT_COMPARE_FUNCTION)
@@ -32750,9 +33071,9 @@
         return a.show_summary_content_option - b.show_summary_content_option;
     };
     CaseEditSubmitComponent.ɵfac = function CaseEditSubmitComponent_Factory(t) { return new (t || CaseEditSubmitComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(OrderService), i0__namespace.ɵɵdirectiveInject(ProfileNotifier)); };
-    CaseEditSubmitComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditSubmitComponent, selectors: [["ccd-case-edit-submit"]], decls: 2, vars: 2, consts: [[4, "ngIf"], [3, "eventCompletionParams", "eventCanBeCompleted", 4, "ngIf"], [1, "govuk-heading-l"], [4, "ngIf", "ngIfThen", "ngIfElse"], ["titleBlock", ""], ["idBlock", ""], [3, "error"], [3, "callbackErrorsSubject", "callbackErrorsContext"], [1, "check-your-answers", 3, "formGroup", "submit"], [1, "form-group", "form-group-related"], ["type", "button", 1, "button", "button-secondary", 3, "disabled", "click"], ["type", "submit", 1, "button", 3, "disabled"], [1, "cancel"], ["href", "javascript:void(0)", 3, "click"], [3, "content"], ["class", "heading-h2", 4, "ngIf"], [1, "heading-h2"], ["class", "text-16", 4, "ngIf"], ["aria-describedby", "check your answers table", 1, "form-table"], [4, "ngFor", "ngForOf"], [1, "text-16"], ["ccdLabelSubstitutor", "", 3, "caseField", "hidden", "formGroup", "contextFields"], ["class", "valign-top case-field-label", 4, "ngIf"], [1, "form-cell", "case-field-content"], [3, "formGroup", "topLevelFormGroup", "caseField", "context", "caseFields"], [1, "valign-top", "check-your-answers__change", "case-field-change"], ["href", "javascript:void(0)", 3, "click", 4, "ngIf"], [1, "valign-top", "case-field-label"], ["aria-describedby", "summary fields table", 1, "summary-fields"], [3, "ngSwitch"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields", 4, "ngSwitchCase"], ["class", "compound-field", "ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields", 4, "ngSwitchCase"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields"], ["id", "summary-field-label"], [1, "form-cell"], [3, "formGroup", "caseField"], ["ccdLabelSubstitutor", "", 1, "compound-field", 3, "caseField", "formGroup", "contextFields"], ["colspan", "2"], [3, "formGroup", "caseField", "caseFields"], ["id", "fieldset-event", "formGroupName", "event", 4, "ngIf"], ["id", "fieldset-event", "formGroupName", "event"], [2, "display", "none"], [1, "form-group"], ["for", "field-trigger-summary", 1, "form-label"], [1, "form-hint"], ["type", "text", "id", "field-trigger-summary", "formControlName", "summary", "maxlength", "1024", 1, "form-control", "bottom-30", "width-50"], ["for", "field-trigger-description", 1, "form-label"], ["id", "field-trigger-description", "formControlName", "description", "maxlength", "65536", 1, "form-control", "bottom-30", "width-50"], [3, "eventCompletionParams", "eventCanBeCompleted"]], template: function CaseEditSubmitComponent_Template(rf, ctx) {
+    CaseEditSubmitComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditSubmitComponent, selectors: [["ccd-case-edit-submit"]], decls: 2, vars: 2, consts: [[4, "ngIf"], [3, "eventCompletionParams", "eventCanBeCompleted", 4, "ngIf"], [1, "govuk-heading-l"], [4, "ngIf", "ngIfThen", "ngIfElse"], ["titleBlock", ""], ["idBlock", ""], [3, "error"], [3, "callbackErrorsSubject", "callbackErrorsContext"], [1, "check-your-answers", 3, "formGroup", "submit"], [1, "form-group", "form-group-related"], ["type", "button", 1, "button", "button-secondary", 3, "disabled", "click"], ["type", "submit", 1, "button", 3, "disabled"], [1, "cancel"], ["href", "javascript:void(0)", 3, "click"], [3, "content"], ["class", "heading-h2", 4, "ngIf"], [1, "heading-h2"], ["class", "text-16", 4, "ngIf"], ["aria-describedby", "check your answers table", 1, "form-table"], [4, "ngFor", "ngForOf"], [1, "text-16"], ["ccdLabelSubstitutor", "", 3, "caseField", "hidden", "formGroup", "contextFields"], ["class", "valign-top case-field-label", 4, "ngIf"], [1, "form-cell", "case-field-content"], [3, "formGroup", "topLevelFormGroup", "caseField", "context", "caseFields"], [1, "valign-top", "case-field-label"], [1, "valign-top", "check-your-answers__change", "case-field-change"], ["href", "javascript:void(0)", 3, "click", 4, "ngIf"], ["aria-describedby", "summary fields table", 1, "summary-fields"], [3, "ngSwitch"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields", 4, "ngSwitchCase"], ["class", "compound-field", "ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields", 4, "ngSwitchCase"], ["ccdLabelSubstitutor", "", 3, "caseField", "formGroup", "contextFields"], ["id", "summary-field-label"], [1, "form-cell"], [3, "formGroup", "caseField"], ["ccdLabelSubstitutor", "", 1, "compound-field", 3, "caseField", "formGroup", "contextFields"], ["colspan", "2"], [3, "formGroup", "caseField", "caseFields"], ["id", "fieldset-event", "formGroupName", "event"], [2, "display", "none"], [1, "form-group"], ["for", "field-trigger-summary", 1, "form-label"], [1, "form-hint"], ["type", "text", "id", "field-trigger-summary", "formControlName", "summary", "maxlength", "1024", 1, "form-control", "bottom-30", "width-50"], ["for", "field-trigger-description", 1, "form-label"], ["id", "field-trigger-description", "formControlName", "description", "maxlength", "65536", 1, "form-control", "bottom-30", "width-50"], [3, "eventCompletionParams", "eventCanBeCompleted"]], template: function CaseEditSubmitComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, CaseEditSubmitComponent_div_0_Template, 22, 16, "div", 0);
+                i0__namespace.ɵɵtemplate(0, CaseEditSubmitComponent_div_0_Template, 26, 25, "div", 0);
                 i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_ccd_case_event_completion_1_Template, 1, 1, "ccd-case-event-completion", 1);
             }
             if (rf & 2) {
@@ -33212,7 +33533,7 @@
     i0__namespace.ɵɵsetComponentScope(CaseEditConfirmComponent, [i5__namespace.NgIf, MarkdownComponent, i3__namespace.ɵangular_packages_forms_forms_ba, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective], [i1__namespace.RpxTranslatePipe, CcdCaseTitlePipe, CaseReferencePipe]);
     i0__namespace.ɵɵsetComponentScope(CaseEditPageComponent, [i5__namespace.NgIf, MarkdownComponent, i5__namespace.NgForOf, CaseEditGenericErrorsComponent, CallbackErrorsComponent, i3__namespace.ɵangular_packages_forms_forms_ba, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, CaseEditFormComponent, CaseEventCompletionComponent], [i1__namespace.RpxTranslatePipe, CcdCaseTitlePipe, CaseReferencePipe, i5__namespace.AsyncPipe]);
     i0__namespace.ɵɵsetComponentScope(CaseEditFormComponent, [i5__namespace.NgForOf, ConditionalShowFormDirective, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, LabelSubstitutorDirective, i5__namespace.NgSwitch, i5__namespace.NgSwitchCase, FieldReadComponent, i5__namespace.NgIf, FieldWriteComponent], [IsReadOnlyAndNotCollectionPipe, IsCompoundPipe]);
-    i0__namespace.ɵɵsetComponentScope(CaseEditSubmitComponent, [i5__namespace.NgIf, MarkdownComponent, CaseEditGenericErrorsComponent, CallbackErrorsComponent, i3__namespace.ɵangular_packages_forms_forms_ba, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgForOf, LabelSubstitutorDirective, FieldReadComponent, i5__namespace.NgSwitch, i5__namespace.NgSwitchCase, i3__namespace.FormGroupName, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName, i3__namespace.MaxLengthValidator, CaseEventCompletionComponent], [CcdCaseTitlePipe, CaseReferencePipe, i1__namespace.RpxTranslatePipe, CcdCYAPageLabelFilterPipe, ReadFieldsFilterPipe, CcdPageFieldsPipe, IsCompoundPipe]);
+    i0__namespace.ɵɵsetComponentScope(CaseEditSubmitComponent, [i5__namespace.NgIf, MarkdownComponent, CaseEditGenericErrorsComponent, CallbackErrorsComponent, i3__namespace.ɵangular_packages_forms_forms_ba, i3__namespace.NgControlStatusGroup, i3__namespace.FormGroupDirective, i5__namespace.NgForOf, LabelSubstitutorDirective, FieldReadComponent, i5__namespace.NgSwitch, i5__namespace.NgSwitchCase, i3__namespace.FormGroupName, i3__namespace.DefaultValueAccessor, i3__namespace.NgControlStatus, i3__namespace.FormControlName, i3__namespace.MaxLengthValidator, CaseEventCompletionComponent], [i1__namespace.RpxTranslatePipe, CcdCaseTitlePipe, CaseReferencePipe, CcdCYAPageLabelFilterPipe, ReadFieldsFilterPipe, CcdPageFieldsPipe, IsCompoundPipe]);
     i0__namespace.ɵɵsetComponentScope(CaseCreateComponent, [i5__namespace.NgIf, CaseEditComponent], []);
     i0__namespace.ɵɵsetComponentScope(CaseProgressComponent, [i5__namespace.NgIf, CaseEditComponent], []);