chore: Enable email channel (#1851)

2021-03-04 13:59:59 +05:30
parent 6aed01de0c
commit ca4a766b82
15 changed files with 54 additions and 48 deletions
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -142,11 +142,7 @@ class ConversationReplyMailer < ApplicationMailer
  end

  def current_domain
-    @current_domain ||= begin
-      @account.domain ||
-        ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', false) ||
-        GlobalConfig.get('MAILER_INBOUND_EMAIL_DOMAIN')['MAILER_INBOUND_EMAIL_DOMAIN']
-    end
+    @current_domain ||= @account.inbound_email_domain
  end

  def account_support_email