Skip to content

Conversation

@tiagoevanp
Copy link
Contributor

@tiagoevanp tiagoevanp commented Aug 21, 2025

Proposed changes (including videos or screenshots)

This PR fixes an issue with the welcome email resend functionality, ensuring that no unresolved placeholders (e.g., [name], [email]) are left in the email content. When a welcome email is resent, all placeholders are now properly replaced or removed.

Previously, resending the welcome email could result in messages containing raw placeholders, leading to confusing or unprofessional communication with users.

Issue(s)

Steps to test or reproduce

  • Trigger the welcome email flow by creating a new user.

  • Resend the welcome email from the admin panel.

  • Verify that the email contains no literal placeholders (all variables should be correctly filled in or omitted).

Further comments

SUP-838

@dionisio-bot
Copy link
Contributor

dionisio-bot bot commented Aug 21, 2025

Looks like this PR is not ready to merge, because of the following issues:

  • This PR is targeting the wrong base branch. It should target 7.11.0, but it targets 7.10.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

@changeset-bot
Copy link

changeset-bot bot commented Aug 21, 2025

🦋 Changeset detected

Latest commit: 2091885

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 39 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/http-router Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/models Patch
@rocket.chat/network-broker Patch
@rocket.chat/omni-core-ee Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip Patch
@rocket.chat/instance-status Patch
@rocket.chat/omni-core Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@codecov
Copy link

codecov bot commented Aug 21, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 66.14%. Comparing base (4f1e315) to head (2091885).
⚠️ Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #36772   +/-   ##
========================================
  Coverage    66.13%   66.14%           
========================================
  Files         3303     3303           
  Lines       110994   110994           
  Branches     21047    21050    +3     
========================================
+ Hits         73410    73417    +7     
+ Misses       34911    34904    -7     
  Partials      2673     2673           
Flag Coverage Δ
e2e 57.31% <ø> (+0.02%) ⬆️
unit 71.49% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@tiagoevanp tiagoevanp marked this pull request as ready for review August 22, 2025 14:19
@tiagoevanp tiagoevanp requested a review from a team as a code owner August 22, 2025 14:19
@tiagoevanp tiagoevanp requested a review from abhinavkrin August 27, 2025 03:03
Copy link
Member

@dougfabris dougfabris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about adding tests for these errors you introduced for the users.sendWelcomeEmail route

@dougfabris dougfabris added this to the 7.11.0 milestone Aug 27, 2025
@tiagoevanp
Copy link
Contributor Author

What do you think about adding tests for these errors you introduced for the users.sendWelcomeEmail route

We already had an API test for it

Copy link
Member

@dougfabris dougfabris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

Copy link
Member

@abhinavkrin abhinavkrin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@tiagoevanp tiagoevanp added the stat: QA assured Means it has been tested and approved by a company insider label Aug 28, 2025
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Aug 28, 2025
@kodiakhq kodiakhq bot merged commit 92e30b4 into develop Aug 28, 2025
48 checks passed
@kodiakhq kodiakhq bot deleted the fix/welcome-email-placeholders branch August 28, 2025 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants