From 04df81bc75ad202d74e1b06380ff627288c65bfb Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Thu, 17 Jul 2025 17:49:07 -0500
Subject: [PATCH] Move to settings screen

---
 app/views/notifications/settings/show.html.erb | 12 +++++++++++-
 app/views/users/show.html.erb                  |  7 -------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/views/notifications/settings/show.html.erb b/app/views/notifications/settings/show.html.erb
index 89ee03f45..36288fa89 100644
--- a/app/views/notifications/settings/show.html.erb
+++ b/app/views/notifications/settings/show.html.erb
@@ -12,6 +12,16 @@
   </nav>
 <% end %>
 
-<section class="panel center flex flex-column gap-half margin-block">
+<section class="panel unpad borderless center flex flex-column gap-half margin-block-start">
+  <div class="pad fill-shade margin-block-end-double border-radius border" data-controller="notifications" data-notifications-subscriptions-url-value="<%= user_push_subscriptions_path(Current.user) %>">
+    <span>
+      <button class="btn txt-small" data-action="notifications#attemptToSubscribe">
+        <%= icon_tag "bell" %>
+        <span>Receive push notifications on this device</span>
+      </button>
+    </span>
+  </div>
+
+  <h2 class="txt-medium txt-uppercase divider">Collections</h2>
   <%= render partial: "notifications/settings/collection", collection: @collections, locals: { user: Current.user } %>
 </section>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9ed623baf..5e60d6f9d 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -8,13 +8,6 @@
 
     <div class="header__actions header__actions--end">
       <% if Current.user == @user %>
-        <span data-controller="notifications" data-notifications-subscriptions-url-value="<%= user_push_subscriptions_path(Current.user) %>">
-          <button class="btn" data-action="notifications#attemptToSubscribe">
-            <%= icon_tag "bell" %>
-            <span class="for-screen-reader">Turn on push notifications</span>
-          </button>
-        </span>
-
         <%= link_to edit_user_path(@user), class: "btn flex-item-justify-end" do %>
           <%= icon_tag "pencil" %>
           <span class="for-screen-reader">Edit</span>