diff --git a/backend/grant/email/send.py b/backend/grant/email/send.py index 9202d526..5bfde741 100644 --- a/backend/grant/email/send.py +++ b/backend/grant/email/send.py @@ -1,7 +1,7 @@ import sendgrid from flask import render_template, Markup, current_app +from grant.settings import SENDGRID_API_KEY, SENDGRID_DEFAULT_FROM, SENDGRID_DEFAULT_FROMNAME, UI from sentry_sdk import capture_exception -from grant.settings import SENDGRID_API_KEY, SENDGRID_DEFAULT_FROM, UI from grant.utils.misc import make_url from python_http_client import HTTPError from sendgrid.helpers.mail import Email, Mail, Content @@ -34,8 +34,8 @@ def team_invite_info(email_args): def recover_info(email_args): return { - 'subject': '{} account recovery'.format(UI['NAME']), - 'title': '{} account recovery'.format(UI['NAME']), + 'subject': 'Recover your account', + 'title': 'Recover your account', 'preview': 'Use the link to recover your account.' } @@ -368,7 +368,7 @@ def send_email(to, type, email_args): sg = sendgrid.SendGridAPIClient(apikey=SENDGRID_API_KEY) mail = Mail( - from_email=Email(SENDGRID_DEFAULT_FROM), + from_email=Email(SENDGRID_DEFAULT_FROM, SENDGRID_DEFAULT_FROMNAME), to_email=Email(to), subject=email['info']['subject'], ) diff --git a/backend/grant/settings.py b/backend/grant/settings.py index cabb52eb..9f99d3fb 100644 --- a/backend/grant/settings.py +++ b/backend/grant/settings.py @@ -29,7 +29,8 @@ SQLALCHEMY_TRACK_MODIFICATIONS = False SESSION_COOKIE_DOMAIN = env.str('SESSION_COOKIE_DOMAIN', default=None) SENDGRID_API_KEY = env.str("SENDGRID_API_KEY", default="") -SENDGRID_DEFAULT_FROM = "noreply@zfnd.org" +SENDGRID_DEFAULT_FROM = "noreply@grants.zfnd.org" +SENDGRID_DEFAULT_FROMNAME = "ZF Grants" SENTRY_DSN = env.str("SENTRY_DSN", default=None) SENTRY_RELEASE = env.str("SENTRY_RELEASE", default=None)