From 1396b736e3866c6afc30f23d4c56d75e99059675 Mon Sep 17 00:00:00 2001
From: Riccardo Graziosi <31478034+riggraz@users.noreply.github.com>
Date: Thu, 23 May 2024 23:00:03 +0200
Subject: [PATCH] Fix tenant welcome email delivery (#354)

---
 app/controllers/tenants_controller.rb  | 2 +-
 app/views/layouts/application.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/tenants_controller.rb b/app/controllers/tenants_controller.rb
index c1cd2732..2308b70b 100644
--- a/app/controllers/tenants_controller.rb
+++ b/app/controllers/tenants_controller.rb
@@ -56,7 +56,7 @@ class TenantsController < ApplicationController
 
       if is_o_auth_login
         CreateStripeCustomer.new().run
-        TenantMailer.trial_start(tenant: @tenant).deliver_later
+        TenantMailer.trial_start(tenant: @tenant).deliver_now # deliver_later doesn't work here
       end
 
       logger.info { "New tenant registration: #{Current.tenant.inspect}" }
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index bf4224c0..a87c837c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -22,7 +22,7 @@
       <%= render 'layouts/no_active_subscription_banner' %>
     <% end %>
 
-    <% if Rails.application.multi_tenancy? && request.subdomain == "feedback" %>
+    <% if Rails.application.multi_tenancy? && @tenant && @tenant.subdomain == "feedback" %>
       <%= render 'layouts/promo_banner' %>
     <% end %>