From cc41a4222152aaaa4bb3cc109b989191f77514ed Mon Sep 17 00:00:00 2001
From: "Stanko K.R." <stanko@stanko.io>
Date: Thu, 20 Nov 2025 10:33:42 +0100
Subject: [PATCH] Fix missing avatars in notification bundle emails

---
 app/mailers/magic_link_mailer.rb                          | 5 -----
 app/models/notification/bundle.rb                         | 8 +++++---
 ...magic_link_preview.rb => magic_link_mailer_preview.rb} | 2 +-
 .../previews/notification/bundle_mailer_preview.rb        | 5 +++--
 test/mailers/previews/user_mailer_preview.rb              | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename test/mailers/previews/{magic_link_preview.rb => magic_link_mailer_preview.rb} (80%)

diff --git a/app/mailers/magic_link_mailer.rb b/app/mailers/magic_link_mailer.rb
index f23cc4fbf..1008acfcf 100644
--- a/app/mailers/magic_link_mailer.rb
+++ b/app/mailers/magic_link_mailer.rb
@@ -5,9 +5,4 @@ class MagicLinkMailer < ApplicationMailer
 
     mail to: @identity.email_address, subject: "Your Fizzy verification code"
   end
-
-  private
-    def default_url_options
-      Rails.application.config.action_mailer.default_url_options
-    end
 end
diff --git a/app/models/notification/bundle.rb b/app/models/notification/bundle.rb
index a4d87e72d..e6f63acaa 100644
--- a/app/models/notification/bundle.rb
+++ b/app/models/notification/bundle.rb
@@ -38,11 +38,13 @@ class Notification::Bundle < ApplicationRecord
 
   def deliver
     user.in_time_zone do
-      processing!
+      Current.with_account(user.account) do
+        processing!
 
-      Notification::BundleMailer.notification(self).deliver if deliverable?
+        Notification::BundleMailer.notification(self).deliver if deliverable?
 
-      delivered!
+        delivered!
+      end
     end
   end
 
diff --git a/test/mailers/previews/magic_link_preview.rb b/test/mailers/previews/magic_link_mailer_preview.rb
similarity index 80%
rename from test/mailers/previews/magic_link_preview.rb
rename to test/mailers/previews/magic_link_mailer_preview.rb
index 88e087e5e..387de9507 100644
--- a/test/mailers/previews/magic_link_preview.rb
+++ b/test/mailers/previews/magic_link_mailer_preview.rb
@@ -1,4 +1,4 @@
-class MagicLinkPreview < ActionMailer::Preview
+class MagicLinkMailerPreview < ActionMailer::Preview
   def magic_link
     identity = Identity.new email_address: "test@example.com"
     magic_link = MagicLink.new(identity: identity)
diff --git a/test/mailers/previews/notification/bundle_mailer_preview.rb b/test/mailers/previews/notification/bundle_mailer_preview.rb
index d1af823e0..4bd9c101c 100644
--- a/test/mailers/previews/notification/bundle_mailer_preview.rb
+++ b/test/mailers/previews/notification/bundle_mailer_preview.rb
@@ -1,6 +1,7 @@
 class Notification::BundleMailerPreview < ActionMailer::Preview
   def notification
-    ApplicationRecord.current_tenant = "897362094"
-    Notification::BundleMailer.notification Notification::Bundle.take!
+    bundle = Notification::Bundle.all.sample
+
+    Notification::BundleMailer.notification bundle
   end
 end
diff --git a/test/mailers/previews/user_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb
index b9c601916..bc32d7e3c 100644
--- a/test/mailers/previews/user_mailer_preview.rb
+++ b/test/mailers/previews/user_mailer_preview.rb
@@ -1,7 +1,7 @@
 class UserMailerPreview < ActionMailer::Preview
   def email_change_confirmation
     new_email_address = "new.email@example.com"
-    user = User.all.sample
+    user = User.active.sample
     token = user.send(:generate_email_address_change_token, to: new_email_address)
 
     UserMailer.email_change_confirmation(