[No QA]: Create a list of restricted login by DylanDylann · Pull Request #62079 · Expensify/App

DylanDylann · 2025-05-15T07:34:37Z

Explanation of Change

Fixed Issues

$ https://expensify.slack.com/archives/C08H9A65QNP/p1746783167005779
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

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
- MacOS: Desktop
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 verified there are no new alerts related to the canBeMissing param for useOnyx
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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 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

Screen.Recording.2025-05-15.at.14.30.42.mov

melvin-bot · 2025-05-15T07:35:08Z

@marcochavezf 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]

DylanDylann · 2025-05-15T07:35:31Z

cc @grgia

grgia · 2025-05-16T15:13:30Z

    }: GetOptionsConfig = {},
 ): Options {
-    const userHasReportWithManagerMcTest = Object.values(options.reports).some((report) => isManagerMcTestReport(report));
+    const restrictedLogins = getRestrictedLogins(config, options, canShowManagerMcTest);


Not sure if we should pass down canShowManagerMcTest for this method

its a bit misleading to pass it as true and then still have it end up as false

canShowManagerMcTest is a flag to mark whether ManagerMcTest should be displayed or not in that place. For example, we only expect that ManagerMcTest displays on screen 1, then in screen 1 we will pass canShowManagerMcTest is true. But it doesn't mean that if canShowManagerMcTest is true, we will always display the ManagerMcTest option, we still need to check other conditions. Note that It is "canShow" not "shouldShow"

grgia · 2025-05-16T15:14:20Z

+function getRestrictedLogins(config: GetOptionsConfig, options: OptionList, canShowManagerMcTest: boolean): Record<string, boolean> {
+    const userHasReportWithManagerMcTest = Object.values(options.reports).some((report) => isManagerMcTestReport(report));
+    return {
+        [CONST.EMAIL.MANAGER_MCTEST]:
+            !canShowManagerMcTest ||
+            (getIsUserSubmittedExpenseOrScannedReceipt() && !userHasReportWithManagerMcTest) ||
+            !Permissions.canUseManagerMcTest(config.betas) ||
+            isUserInvitedToWorkspace(),
+    };
+}
+


Im wondering about other logins, like concierge or notifications, etc. that are also omitted

concierge, notifications,.. already been handled in the excludedLogin param

DylanDylann · 2025-05-19T06:57:29Z

@grgia Let me summarize that we already implemented in the codebase first

App/src/libs/OptionsListUtils.ts

Lines 1695 to 1700 in c4d89f0

    
           function getValidOptions( 
        
               options: OptionList, 
        
               { 
        
                   excludeLogins = {}, 
        
                   includeSelectedOptions = false, 
        
                   includeRecentReports = true,

The getValidOptions function is used to get an option list for many other places. This function receives excludeLogins as a parameter, which includes options that should be excluded from the result for that usage

For example, let's see one place that is using getValidOptions function

App/src/pages/workspace/WorkspaceInvitePage.tsx

Lines 78 to 91 in c4d89f0

    
           const excludedUsers = useMemo(() => { 
        
               const ineligibleInvites = getIneligibleInvitees(policy?.employeeList); 
        
               return ineligibleInvites.reduce((acc, login) => { 
        
                   acc[login] = true; 
        
                   return acc; 
        
               }, {} as Record<string, boolean>); 
        
           }, [policy?.employeeList]); 
        
           const defaultOptions = useMemo(() => { 
        
               if (!areOptionsInitialized) { 
        
                   return {recentReports: [], personalDetails: [], userToInvite: null, currentUserOption: null}; 
        
               } 
        
               const inviteOptions = getMemberInviteOptions(options.personalDetails, betas ?? [], excludedUsers, true);

When using getValidOptions function we already passed excludeLogins that includes all ineligible options for that list specifically (here, excludeLogins is got by getIneligibleInvitees function)

In the case of MANAGER_MCTEST, this option isn't always excluded from getValidOptions function, we only exclude it if it satisfies the condition. So at this time, we even don't need to filter out these options on getValidOptions itself anymore. because when triggering getValidOptions we have already included it in the excludeLogins param.

I want to confirm again your requirement: you want to move all logic to filter our excluded option to getValidOptions function itself and remove the excludeLogins param, right?

grgia · 2025-06-03T15:10:09Z

I want to confirm again your requirement: you want to move all logic to filter our excluded option to getValidOptions function itself and remove the excludeLogins param, right?

I don't think we need to remove the excludeLogins param necessarily. There are probably cases where we exclude more than th restricted accounts.

Ideally we want to create a LIST of restricted accounts like Manager McTest that we can add to as needed and will always be omitted from these places

DylanDylann · 2025-06-04T07:42:58Z

@grgia I replied to your comments. Back to you

grgia

thanks for the updates @DylanDylann. Minor request

DylanDylann · 2025-06-05T03:13:36Z

@grgia Back to you

DylanDylann · 2025-06-05T15:38:24Z

@grgia Do we need a C+ to review?

grgia · 2025-06-06T11:35:16Z

@DylanDylann yea let's have a C+ review

dukenv0307 · 2025-06-06T12:15:24Z

Hi, I can help review based on this comment here: https://expensify.slack.com/archives/C02NK2DQWUX/p1749212047995279

dukenv0307 · 2025-06-06T12:32:09Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

Screen.Recording.2025-06-06.at.19.30.07.mov

Android: mWeb Chrome

Screen.Recording.2025-06-06.at.19.27.14.mov

iOS: HybridApp

Screen.Recording.2025-06-06.at.19.29.34.mov

iOS: mWeb Safari

Screen.Recording.2025-06-06.at.19.25.59.mov

MacOS: Chrome / Safari

Screen.Recording.2025-06-06.at.19.24.15.mov

MacOS: Desktop

Screen.Recording.2025-06-06.at.19.30.49.mov

melvin-bot · 2025-06-06T12:32:33Z

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

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

dukenv0307 · 2025-06-06T12:32:48Z

Code looks good and tests well

OSBotify · 2025-06-06T14:30:54Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-06-09T16:54:24Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.1.63-0 🚀

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

github-actions · 2025-06-10T22:40:37Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.1.63-6 🚀

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

create-a-list-of-restricted-login

e363c52

DylanDylann requested a review from a team as a code owner May 15, 2025 07:34

melvin-bot Bot requested review from marcochavezf and removed request for a team May 15, 2025 07:35

grgia self-requested a review May 15, 2025 09:45

grgia reviewed May 16, 2025

View reviewed changes

DylanDylann force-pushed the create-a-list-restricted-account branch 3 times, most recently from de53403 to e363c52 Compare June 4, 2025 05:17

DylanDylann added 2 commits June 4, 2025 12:18

merge main

5da640d

main

8972175

grgia reviewed Jun 4, 2025

View reviewed changes

Comment thread src/libs/OptionsListUtils.ts

grgia requested changes Jun 4, 2025

View reviewed changes

DylanDylann added 2 commits June 4, 2025 23:21

add description

a22ddc5

add description

e9ab41d

grgia approved these changes Jun 5, 2025

View reviewed changes

dukenv0307 approved these changes Jun 6, 2025

View reviewed changes

melvin-bot Bot mentioned this pull request Jun 6, 2025

[Payment due 2025-06-17] [$250] Payment issue for E/App PR#62079 #63647

Closed

marcochavezf approved these changes Jun 6, 2025

View reviewed changes

marcochavezf merged commit e3d48ad into Expensify:main Jun 6, 2025

github-actions Bot mentioned this pull request Jun 9, 2025

Deploy Checklist: New Expensify 2025-06-09 #63762

Closed

77 tasks

Uh oh!

Conversation

DylanDylann commented May 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 15, 2025

Uh oh!

DylanDylann commented May 15, 2025

Uh oh!

grgia May 16, 2025

Choose a reason for hiding this comment

Uh oh!

grgia May 16, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

grgia May 16, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented May 19, 2025

Uh oh!

grgia commented Jun 3, 2025

Uh oh!

DylanDylann commented Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Jun 5, 2025

Uh oh!

DylanDylann commented Jun 5, 2025

Uh oh!

grgia commented Jun 6, 2025

Uh oh!

dukenv0307 commented Jun 6, 2025

Uh oh!

dukenv0307 commented Jun 6, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jun 6, 2025

Uh oh!

dukenv0307 commented Jun 6, 2025

Uh oh!

OSBotify commented Jun 6, 2025

Uh oh!

github-actions Bot commented Jun 9, 2025

Uh oh!

github-actions Bot commented Jun 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

DylanDylann commented May 15, 2025 •

edited

Loading

DylanDylann commented Jun 4, 2025 •

edited

Loading