Skip to content

Fix: Change #admins room message when someone joins via link#84159

Merged
iwiznia merged 11 commits intoExpensify:mainfrom
dominictb:fix/change-message-when-user-joins-via-link
Mar 19, 2026
Merged

Fix: Change #admins room message when someone joins via link#84159
iwiznia merged 11 commits intoExpensify:mainfrom
dominictb:fix/change-message-when-user-joins-via-link

Conversation

@dominictb
Copy link
Contributor

@dominictb dominictb commented Mar 4, 2026

Explanation of Change

Problem

With autoJoin enabled (automatically approve join requests from validated users at the same domain). When someone joins a policy via the policy join link, the message in #admins room says the policy owner/admin/inviter added him which is confusing because they did not deliberately made that action.

Solution

We need to update the report action to:

Such scenario is indicated by the didJoinPolicy flag.

Before After
Screenshot 2026-03-05 at 23 43 38 Screenshot 2026-03-05 at 23 52 03

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/604683
PROPOSAL:

Tests

Preconditions:

  • Admin owns a private domain
  • Sign up another account from that same domain, then validate the account by going to Account > Profile > Contact methods > Tap your email > Enter the magic code
  • In OldDot, go to workspace settings > Overview > Enable Pre-approve join requests from validated users at...
Auto join
  1. As admin, go to workspace settings > Overview > More > Share > Copy URL
  2. As another user from the same domain that is not a member of the workspace, go to that URL
  3. As admin, go to #admins room
  4. Verify message says [email] joined via the workspace invite link
  5. Verify message actor is notifications@expensify.com

Non-auto join
  1. As another user from different domain that is not a member of the workspace, go to that URL
  2. As admin, go to #admins room
  3. Press Accept
  4. Verify message says added ... as a member
  5. Verify message actor is the admin

Manual invite
  1. As admin, go to workspace Members page
  2. Invite a new user
  3. Go to #admins room
  4. Verify message says added ... as a member
  5. Verify message actor is the admin
  • Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Same as Tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-03-05.at.23.50.13-compressed.mov

@melvin-bot
Copy link

melvin-bot bot commented Mar 4, 2026

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@dominictb dominictb changed the title Fix: Change #admins room message when someone joins via link [HOLD BE] Fix: Change #admins room message when someone joins via link Mar 5, 2026
@dominictb dominictb changed the title [HOLD BE] Fix: Change #admins room message when someone joins via link Fix: Change #admins room message when someone joins via link Mar 12, 2026
@dominictb dominictb marked this pull request as ready for review March 12, 2026 17:59
@dominictb dominictb requested review from a team as code owners March 12, 2026 17:59
@codecov
Copy link

codecov bot commented Mar 12, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/libs/ReportActionsUtils.ts 54.50% <100.00%> (ø)
... and 48 files with indirect coverage changes

@melvin-bot melvin-bot bot requested review from jayeshmangwani and removed request for a team March 12, 2026 17:59
@melvin-bot
Copy link

melvin-bot bot commented Mar 12, 2026

@jayeshmangwani Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot melvin-bot bot requested review from JmillsExpensify and removed request for a team March 12, 2026 17:59
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ecb8af32a5

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@JmillsExpensify
Copy link
Contributor

I know that's consistent with Classic terminology, but I think it's really awkward framing. @jamesdeanexpensify do you agree? I would much rather have something like joined via the workspace invite link or something a bit more smooth-sounding.

@jamesdeanexpensify
Copy link
Contributor

Love that exact phrasing @JmillsExpensify great call!

@dominictb
Copy link
Contributor Author

@jayeshmangwani Ignore the failed test, it's not related. Ready for your review now

@jayeshmangwani
Copy link
Contributor

Thanks, I’m reviewing this today.

Copy link
Contributor

@JmillsExpensify JmillsExpensify left a comment

Choose a reason for hiding this comment

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

We've updated the language, so all looks good to me!

@jayeshmangwani
Copy link
Contributor

jayeshmangwani commented Mar 17, 2026

@dominictb , I have a question. I used a 10minuted mail to create the private domain and then created another new user with the same domain. However, I’m still getting the prompt: [User] requested to join [Workspace]. Is there any additional setup required to enable auto-join to the workspace when using the invite link?

User account:
Screenshot 2026-03-17 at 12 05 04 PM

Admin account:

Screenshot 2026-03-17 at 12 05 53 PM

Pre-approve join requests from validated users at isfew.com is enabled
Screenshot 2026-03-17 at 12 13 46 PM

@dominictb
Copy link
Contributor Author

dominictb commented Mar 17, 2026

@jayeshmangwani Is the member user validated? If not, go to Account > Profile > Contact methods, tap your email then enter the magic code. I updated Tests to add this precondition too.

@jayeshmangwani
Copy link
Contributor

Thanks for the help , yep, that was the issue. The user wasn’t validated.

@jayeshmangwani
Copy link
Contributor

@dominictb PR looks good. Just to confirm , when we receive the system message joined via the workspace invite link, thats coming from Expensify, that’s the expected result, right?
joined-by-link

@dominictb
Copy link
Contributor Author

@jayeshmangwani yeah as long as the account is notifications@expensify.com (a system actor). The Expensify name might just be a display name that we implement in the frontend.

@jayeshmangwani
Copy link
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Auto-join via the invite link when the user is from the same domain
joined-by-link
Non-auto join when the user accesses the link and an admin approves
requested-by-link

Manual invite by the admin
added-by-admin

Android: mWeb Chrome

Auto-join via the invite link when the user is from the same domain
joined-by-link
Non-auto join when the user accesses the link and an admin approves
requested-by-link
Manual invite by the admin
added-by-admin

iOS: HybridApp

Auto-join via the invite link when the user is from the same domain
joined-by-link
Non-auto join when the user accesses the link and an admin approves
requested-by-link
Manual invite by the admin
added-by-admin

iOS: mWeb Safari

Auto-join via the invite link when the user is from the same domain
joined-by-link

Non-auto join when the user accesses the link and an admin approves
requested-by-link
Manual invite by the admin
added-by-admin

MacOS: Chrome / Safari

Auto-join via the invite link when the user is from the same domain
joined-by-link
Non-auto join when the user accesses the link and an admin approves

requested-by-link **Manual invite by the admin** added-by-admin

@jayeshmangwani
Copy link
Contributor

@dominictb Merging the latest main might fix the failing Tests here.

Copy link
Contributor

@jayeshmangwani jayeshmangwani left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@melvin-bot
Copy link

melvin-bot bot commented Mar 17, 2026

🎯 @jayeshmangwani, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #85536.

@dominictb
Copy link
Contributor Author

@jayeshmangwani All good now

@jayeshmangwani
Copy link
Contributor

@dominictb Looks good on my end too. I’ve approved PR above, but I’m not sure why no internal engineer is assigned to the PR yet.

@dominictb dominictb requested a review from iwiznia March 19, 2026 14:15
@iwiznia iwiznia merged commit 86c316e into Expensify:main Mar 19, 2026
46 of 60 checks passed
@github-actions
Copy link
Contributor

🚧 @iwiznia has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.3.42-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.3.42-3 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants