Skip to content

Conversation

@huult
Copy link
Contributor

@huult huult commented Jan 30, 2026

Explanation of Change

Fixed Issues

$ #80057
PROPOSAL: #80057 (comment)

Tests

Same QA step

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Precondition: Set an account as an approved accountant (isApprovedAccountant: true).

  1. Open the Expensify app.
  2. Go to Workspaces and click “New workspace.”
  3. Verify that you can select a plan type and choose an owner user. If the selected owner user is different from the current user, verify that the “Keep me as an admin” option is visible.
  • 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 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
    • 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
Screen.Recording.2026-02-02.at.11.01.16.mp4
Android: mWeb Chrome
Screen.Recording.2026-02-02.at.11.02.33.mp4
iOS: Native
Screen.Recording.2026-02-02.at.11.07.21.mp4
iOS: mWeb Safari
Screen.Recording.2026-02-02.at.11.08.25.mp4
MacOS: Chrome / Safari
Screen.Recording.2026-02-02.at.10.29.46.mp4

@huult huult requested review from a team as code owners January 30, 2026 13:37
@melvin-bot melvin-bot bot requested review from QichenZhu and trjExpensify and removed request for a team January 30, 2026 13:37
@melvin-bot
Copy link

melvin-bot bot commented Jan 30, 2026

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

@huult huult marked this pull request as draft January 30, 2026 13:38
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: f5a2049726

ℹ️ 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".

Comment on lines 166 to 169
onSubmit({
name: val[INPUT_IDS.NAME],
currency: val[INPUT_IDS.CURRENCY],
planType: val[INPUT_IDS.PLAN_TYPE],

Choose a reason for hiding this comment

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

P1 Badge Propagate selected plan type into workspace creation

The form now captures planType, but none of the submit handlers downstream use it (e.g., createWorkspaceWithPolicyDraftAndNavigateToIt/Policy.createWorkspace still default the policy type to TEAM unless shouldCreateControlPolicy is set). That means a user can pick “Control” here and still end up with a Team workspace, so the new selector has no effect. Consider threading this value through the submit handlers and into the draft/creation helpers so the chosen plan type actually drives the policy type.

Useful? React with 👍 / 👎.

@codecov
Copy link

codecov bot commented Jan 31, 2026

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/ROUTES.ts 12.86% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 75.00% <ø> (ø)
...ages/Travel/WorkspaceConfirmationForTravelPage.tsx 0.00% <ø> (ø)
...c/pages/iou/request/step/IOURequestStepUpgrade.tsx 0.00% <ø> (ø)
src/pages/workspace/WorkspaceConfirmationPage.tsx 0.00% <ø> (ø)
src/types/form/WorkspaceConfirmationForm.tsx 100.00% <ø> (ø)
...gation/AppNavigator/ModalStackNavigators/index.tsx 7.64% <0.00%> (-0.02%) ⬇️
src/libs/actions/App.ts 48.14% <0.00%> (ø)
src/libs/actions/Policy/Policy.ts 36.92% <72.22%> (+0.78%) ⬆️
... and 3 more
... and 8 files with indirect coverage changes

@melvin-bot
Copy link

melvin-bot bot commented Feb 1, 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

@huult
Copy link
Contributor Author

huult commented Feb 2, 2026

Screenshot 2026-02-02 at 11 27 22

@trjExpensify @QichenZhu Because we added the Plan type selector and Owner selection with the “Keep me as an admin” option, the screen is no longer tall enough to show the Save button.

Screenshot 2026-02-02 at 11 27 54

Could we enable scrolling (or auto-scroll to the bottom) on the workspace confirmation page so the Save button is visible?

@huult
Copy link
Contributor Author

huult commented Feb 2, 2026

Screen.Recording.2026-02-02.at.11.29.55.mov

@trjExpensify @QichenZhu We have a case where the user selects a non-existing account as the Owner. Do we show an error for this case?

@huult huult marked this pull request as ready for review February 2, 2026 04:30
const {inputCallbackRef} = useAutoFocusInput();
const scrollViewRef = useRef<RNScrollView>(null);
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
const isApprovedAccountant = !!account?.isApprovedAccountant || true;
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ CONSISTENCY-2 (docs)

The expression \!\!account?.isApprovedAccountant || true will always evaluate to true due to the || true condition. This is a logic bug that defeats the purpose of checking the account status.

Suggested fix:

const isApprovedAccountant = \!\!account?.isApprovedAccountant;

If you need to test this feature while it's in development, consider using a feature flag or environment variable instead of hardcoding true.


Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

const isCorporateIntegration = userReportedIntegration && (CONST.POLICY.CONNECTIONS.CORPORATE as readonly string[]).includes(userReportedIntegration);
const workspaceType = isCorporateFeature || isCorporateIntegration || shouldCreateControlPolicy ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;

const determineWorkspaceType = (): typeof CONST.POLICY.TYPE.TEAM | typeof CONST.POLICY.TYPE.CORPORATE => {
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ PERF-6 (docs)

The determineWorkspaceType helper function is unnecessary. This value can be computed directly without creating a separate function.

Suggested fix:

const workspaceType = type ?? (isCorporateFeature || isCorporateIntegration || shouldCreateControlPolicy ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM);

This approach:

  • Eliminates the helper function
  • Uses the nullish coalescing operator for cleaner logic
  • Computes the value directly during rendering
  • Improves readability

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

@huult
Copy link
Contributor Author

huult commented Feb 5, 2026

I’ll update this tomorrow

@huult
Copy link
Contributor Author

huult commented Feb 6, 2026

Bug: workspace owner is always set to current user when creating workspace in offline mode

Screen.Recording.2026-02-04.at.11.24.56.PM.mov

@QichenZhu I don’t think this is a bug, because you had a workspace with the Control plan, so the default type being Control is correct. 😄

Default the value to Control if the user is a member of any Control workspaces. Else, default to Collect.

@huult
Copy link
Contributor Author

huult commented Feb 6, 2026

Bug: workspace owner is always set to current user when creating workspace in offline mode

Screen.Recording.2026-02-04.at.11.24.56.PM.mov

Screen.Recording.2026-02-06.at.09.32.21.mov

it's done

Copy link
Contributor

@QichenZhu QichenZhu left a comment

Choose a reason for hiding this comment

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

Thanks! It works well overall, but the new components need some cleanup to meet our code standards.

@trjExpensify
Copy link
Contributor

@huult where are you at here?

@huult
Copy link
Contributor Author

huult commented Feb 9, 2026

@trjExpensify Yes, I’ll update it today.

@huult
Copy link
Contributor Author

huult commented Feb 10, 2026

Screen.Recording.2026-02-10.at.11.32.56.mov

@QichenZhu Updated. Could you check again?

@huult
Copy link
Contributor Author

huult commented Feb 10, 2026

@codex review

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: fcd34fa61d

ℹ️ 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".

Comment on lines +253 to +254
{isApprovedAccountant && (
<>

Choose a reason for hiding this comment

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

P1 Badge Restrict owner/type fields to flows that save them

This form now shows planType, owner, and makeMeAdmin for every approved accountant (WorkspaceConfirmationForm), but not every caller persists those values: WorkspaceConfirmationForTravelPage.onSubmit still creates the workspace without forwarding params.owner/params.makeMeAdmin (lines 27-38), and IOURequestStepUpgrade.onWorkspaceConfirmationSubmit forwards owner/admin but omits params.planType (lines 161-175). In those flows an approved accountant can choose a client owner or corporate plan and still end up creating a workspace with fallback values, so the UI selection is silently ignored.

Useful? React with 👍 / 👎.

@trjExpensify
Copy link
Contributor

@QichenZhu this is ready for re-review. Can you do that today, please?

@QichenZhu
Copy link
Contributor

QichenZhu commented Feb 13, 2026

@trjExpensify, we are stuck on the checklist item (review thread): "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." Are we good to skip this check?

@trjExpensify
Copy link
Contributor

Mhm, sounds like the PR is introducing a deprecated backTo param?

@QichenZhu
Copy link
Contributor

Yeah, there are two issues: first is the backTo param, and second is users can't continue the flow after refreshing.

@trjExpensify
Copy link
Contributor

Feel like we need to solve that. @blimpich would you agree?

@huult
Copy link
Contributor Author

huult commented Feb 13, 2026

#81008 (comment) Commented and shared my opinion.

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.

4 participants