From 80a6ffc55eb9adb04cf576eb00586864942ac694 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Tue, 2 Dec 2025 08:41:00 -0500
Subject: [PATCH 1/2] Add an expiration note to emails and the magic link page.

ref: https://app.fizzy.do/5986089/cards/3211
---
 .../mailers/magic_link_mailer/sign_in_instructions.html.erb     | 2 ++
 .../mailers/magic_link_mailer/sign_in_instructions.text.erb     | 2 ++
 app/views/sessions/magic_links/show.html.erb                    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb b/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb
index 40303c39e..6d941492e 100644
--- a/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb
+++ b/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb
@@ -9,6 +9,8 @@
 
 <strong class="txt-large"><%= @magic_link.code %></strong>
 
+<p>This code is good for <%= distance_of_time_in_words(MagicLink::EXPIRATION_TIME) %>.</p>
+
 <p class="footer">Need help? <%= mail_to "support@fizzy.do", "Send us an email"%>.
 </p>
 
diff --git a/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb b/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb
index b21f00509..bc879a323 100644
--- a/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb
+++ b/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb
@@ -5,3 +5,5 @@ Please enter this 6-character verification code on the Fizzy sign-up page to cre
 <% end %>
 
 <%= @magic_link.code %>
+
+This code is good for <%= distance_of_time_in_words(MagicLink::EXPIRATION_TIME) %>.
diff --git a/app/views/sessions/magic_links/show.html.erb b/app/views/sessions/magic_links/show.html.erb
index 4edffc406..3a543639c 100644
--- a/app/views/sessions/magic_links/show.html.erb
+++ b/app/views/sessions/magic_links/show.html.erb
@@ -12,6 +12,8 @@
         autocomplete: "one-time-code", maxlength: "6", placeholder: "••••••", value: params[:code],
         data: { magic_link_target: "input", action: "keydown.enter->magic-link#submit paste->magic-link#paste" } %>
   <% end %>
+
+  <p class="txt-small">The code is good for <%= distance_of_time_in_words(MagicLink::EXPIRATION_TIME) %>.</p>
 </div>
 
 <% if Rails.env.development? %>

From 8c1d3c6c42f6269602089b38b4dda17a057895f9 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 2 Dec 2025 09:08:57 -0600
Subject: [PATCH 2/2] Copy edits

---
 .../mailers/magic_link_mailer/sign_in_instructions.html.erb     | 2 +-
 .../mailers/magic_link_mailer/sign_in_instructions.text.erb     | 2 +-
 app/views/sessions/magic_links/show.html.erb                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb b/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb
index 6d941492e..e81fd1d63 100644
--- a/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb
+++ b/app/views/mailers/magic_link_mailer/sign_in_instructions.html.erb
@@ -9,7 +9,7 @@
 
 <strong class="txt-large"><%= @magic_link.code %></strong>
 
-<p>This code is good for <%= distance_of_time_in_words(MagicLink::EXPIRATION_TIME) %>.</p>
+<p>This code will work for <%= distance_of_time_in_words(MagicLink::EXPIRATION_TIME) %>.</p>
 
 <p class="footer">Need help? <%= mail_to "support@fizzy.do", "Send us an email"%>.
 </p>
diff --git a/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb b/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb
index bc879a323..3c157d2a0 100644
--- a/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb
+++ b/app/views/mailers/magic_link_mailer/sign_in_instructions.text.erb
@@ -6,4 +6,4 @@ Please enter this 6-character verification code on the Fizzy sign-up page to cre
 
 <%= @magic_link.code %>
 
-This code is good for <%= distance_of_time_in_words(MagicLink::EXPIRATION_TIME) %>.
+This code will work for <%= distance_of_time_in_words(MagicLink::EXPIRATION_TIME) %>.
diff --git a/app/views/sessions/magic_links/show.html.erb b/app/views/sessions/magic_links/show.html.erb
index 3a543639c..affa97b8a 100644
--- a/app/views/sessions/magic_links/show.html.erb
+++ b/app/views/sessions/magic_links/show.html.erb
@@ -13,7 +13,7 @@
         data: { magic_link_target: "input", action: "keydown.enter->magic-link#submit paste->magic-link#paste" } %>
   <% end %>
 
-  <p class="txt-small">The code is good for <%= distance_of_time_in_words(MagicLink::EXPIRATION_TIME) %>.</p>
+  <p class="txt-small">The code you receive will work for <%= distance_of_time_in_words(MagicLink::EXPIRATION_TIME) %>.</p>
 </div>
 
 <% if Rails.env.development? %>