diff --git a/corporate/tests/test_stripe.py b/corporate/tests/test_stripe.py index d8858c41d6..7ea5a14ebe 100644 --- a/corporate/tests/test_stripe.py +++ b/corporate/tests/test_stripe.py @@ -1789,7 +1789,7 @@ class StripeTest(StripeTestCase): self.assertEqual(message.subject, "Support request for zulip") self.assertEqual(message.reply_to, ["hamlet@zulip.com"]) self.assertEqual(self.email_envelope_from(message), settings.NOREPLY_EMAIL_ADDRESS) - self.assertIn("Zulip Support HttpResponse: "support_url": get_support_url(user.realm), "user_role": user.get_role_name(), } - + # Sent to the server's support team, so this email is not user-facing. send_email( "zerver/emails/support_request", to_emails=[FromAddress.SUPPORT], - from_name="Zulip Support", + from_name="Zulip support request", from_address=FromAddress.tokenized_no_reply_address(), reply_to_email=user.delivery_email, context=email_context, diff --git a/corporate/views/upgrade.py b/corporate/views/upgrade.py index 3ea9cdb473..94a982c27d 100644 --- a/corporate/views/upgrade.py +++ b/corporate/views/upgrade.py @@ -202,10 +202,11 @@ def sponsorship( "paid_users_count": paid_users_count, "paid_users_description": paid_users_description, } + # Sent to the server's support team, so this email is not user-facing. send_email( "zerver/emails/sponsorship_request", to_emails=[FromAddress.SUPPORT], - from_name="Zulip sponsorship", + from_name="Zulip sponsorship request", from_address=FromAddress.tokenized_no_reply_address(), reply_to_email=user.delivery_email, context=context,