From b4a178b45c397b5c3abe07351485620e21096549 Mon Sep 17 00:00:00 2001
From: James Morris <moreofmorris@users.noreply.github.com>
Date: Fri, 21 Oct 2022 15:07:41 +0100
Subject: [PATCH] Moved the newsletter settings option for audience feedback
 based on feedback

refs https://github.com/TryGhost/Team/issues/2124
---
 .../modals/newsletters/edit/settings.hbs      | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/ghost/admin/app/components/modals/newsletters/edit/settings.hbs b/ghost/admin/app/components/modals/newsletters/edit/settings.hbs
index 4efcf9d12b..72a0df9f6e 100644
--- a/ghost/admin/app/components/modals/newsletters/edit/settings.hbs
+++ b/ghost/admin/app/components/modals/newsletters/edit/settings.hbs
@@ -114,22 +114,10 @@
                                 </div>
                             </div>
                         </GhFormGroup>
-                    </div>
-                </div>
-            {{/liquid-if}}
-        {{/let}}
 
-        {{#if (feature "audienceFeedback")}}
-            {{#let (eq @openSection "audienceFeedback") as |isOpen|}}
-                <button class="modal-fullsettings-tab {{if isOpen "active"}}" type="button" {{on "click" (fn @toggleSection "audienceFeedback")}} data-test-nav-toggle="general.audienceFeedback">
-                    {{svg-jar "newsletter-analytics"}} Newsletter analytics
-                    <span class="gh-nav-button-expand">{{svg-jar (if isOpen "arrow-up-stroke" "arrow-down-stroke")}}</span>
-                </button>
-                {{#liquid-if isOpen}}
-                    <div class="modal-fullsettings-tab-expanded">
-                        <div class="gh-stack">
+                        {{#if (feature "audienceFeedback")}}
                             <GhFormGroup @classNames="gh-stack-item gh-setting">
-                                <label for="capture-feedback" class="modal-fullsettings-title" data-test-toggle="feedbackEnabled">Capture feedback on your content</label>
+                                <label for="capture-feedback" class="modal-fullsettings-title" data-test-toggle="feedbackEnabled">Ask your readers for feedback</label>
                                 <div class="for-switch small">
                                     <div class="container">
                                         <input
@@ -142,10 +130,11 @@
                                     </div>
                                 </div>
                             </GhFormGroup>
-                        </div>
-                  </div>
-                {{/liquid-if}}
-            {{/let}}
-        {{/if}}
+                        {{/if}}
+                    </div>
+                </div>
+            {{/liquid-if}}
+        {{/let}}
+
     </div>
 </fieldset>