Skip to content

fixed WS workflows in different modes and showing WS members on creating a workflow#69823

Merged
chuckdries merged 5 commits into
Expensify:mainfrom
mukhrr:fix/68379
Sep 5, 2025
Merged

fixed WS workflows in different modes and showing WS members on creating a workflow#69823
chuckdries merged 5 commits into
Expensify:mainfrom
mukhrr:fix/68379

Conversation

@mukhrr

@mukhrr mukhrr commented Sep 3, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #68379
PROPOSAL: #68379 (comment)

Tests

  1. Add a new workflow to WS in ND
  2. Go to OD and change approval mode from "Advanced" to "Submit and Approve"
  3. Navigate back to ND
  4. Verify you see only default workflow after changing approval mode
  5. Try to create a new workflow
  6. Verify you don't see all members
  7. Disable and re-enable "Add approvals" checkbox
  8. Try to create a new workflow
  9. Verify you see all members now
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test 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

Android: Native
Android_Native.mp4
Android: mWeb Chrome
Android_mWeb.mp4
iOS: Native
Android_Native.mp4
iOS: mWeb Safari
IOS_mWeb.Safari.mp4
MacOS: Chrome / Safari
MacOS_chrome.mp4
MacOS: Desktop
MacOS_Desktop.mp4

@mukhrr mukhrr requested review from a team as code owners September 3, 2025 20:49
@melvin-bot melvin-bot Bot requested review from suneox and removed request for a team September 3, 2025 20:49
@melvin-bot

melvin-bot Bot commented Sep 3, 2025

Copy link
Copy Markdown

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

trjExpensify
trjExpensify previously approved these changes Sep 3, 2025

@trjExpensify trjExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Agree with this fix for backwards compatibility. Toggling the approvalMode in OldDot to Basic should revert to the default workflow only in NewDot. 👍

Comment thread src/libs/WorkflowUtils.ts Outdated
@suneox

suneox commented Sep 4, 2025

Copy link
Copy Markdown
Contributor

Actual Result: You still see added workflow

Regarding members visibility, when creating a new workflow, you will see limited or no members in list to select.

@mukhrr Could you please update the Test/QA steps with more clarity?

- fix: show all WS members when adding a new workflow
@github-actions

github-actions Bot commented Sep 4, 2025

Copy link
Copy Markdown
Contributor

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

Co-authored-by: Cong Pham <ptcong411@gmail.com>
@suneox

suneox commented Sep 4, 2025

Copy link
Copy Markdown
Contributor

@mukhrr Please follow the contributor guidelines to ensure consistency

15. Please never force push when a PR review has already started (because this messes with the PR review history)

@mukhrr

mukhrr commented Sep 4, 2025

Copy link
Copy Markdown
Contributor Author

@mukhrr Please follow the contributor guidelines to ensure consistency

15. Please never force push when a PR review has already started (because this messes with the PR review history)

@suneox Oh thanks for pointing. I rebased and had to force push. Instead, I need to merge main into my branch?

@suneox

suneox commented Sep 4, 2025

Copy link
Copy Markdown
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
    • 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-09-04.at.23.21.44.mp4
Android: mWeb Chrome
Screen.Recording.2025-09-04.at.23.18.40.mp4
iOS: HybridApp
Screen.Recording.2025-09-04.at.22.56.42.mp4
iOS: mWeb Safari
Screen.Recording.2025-09-04.at.22.54.05.mp4
MacOS: Chrome / Safari
Screen.Recording.2025-09-04.at.22.39.42.mp4
MacOS: Desktop
Screen.Recording.2025-09-04.at.22.41.40.mp4

@suneox

suneox commented Sep 4, 2025

Copy link
Copy Markdown
Contributor

@suneox Oh thanks for pointing. I rebased and had to force push. Instead, I need to merge main into my branch?

Yes, please make sure to merge main into your branch after opening a PR in the next time

@mukhrr

mukhrr commented Sep 4, 2025

Copy link
Copy Markdown
Contributor Author

@suneox Oh thanks for pointing. I rebased and had to force push. Instead, I need to merge main into my branch?

Yes, please make sure to merge main into your branch after opening a PR in the next time

Thanks! I have updated Tests/QA parts, btw

@suneox

suneox commented Sep 5, 2025

Copy link
Copy Markdown
Contributor

@mukhrr Please remove the Actual Result from both Test and QA steps to avoid confusion with Expected Result (This pattern for bug report).
For QA, in this case the same test you can just write ‘Same as test steps’. Let’s keep the focus on Test steps just like what you already recorded for verification.

Example: Suppose a PR changes multiple behaviors across different steps and you need to verify them, it would look like this

  • Step 1: Prepare data ...
  • Step 2: Do ST
  • Step 3: Verify .....
  • Step 4: Do ST
  • Step 5: Verify .....

@mukhrr

mukhrr commented Sep 5, 2025

Copy link
Copy Markdown
Contributor Author

@mukhrr Please remove the Actual Result from both Test and QA steps to avoid confusion with Expected Result (This pattern for bug report). For QA, in this case the same test you can just write ‘Same as test steps’. Let’s keep the focus on Test steps just like what you already recorded for verification.

Example: Suppose a PR changes multiple behaviors across different steps and you need to verify them, it would look like this

  • Step 1: Prepare data ...
  • Step 2: Do ST
  • Step 3: Verify .....
  • Step 4: Do ST
  • Step 5: Verify .....

Updated it. Let me know, pls, if it is okay now @suneox

Comment thread src/libs/WorkflowUtils.ts Outdated
mukhrr and others added 2 commits September 5, 2025 09:03
Co-authored-by: Cong Pham <ptcong411@gmail.com>
@mukhrr mukhrr requested a review from suneox September 5, 2025 04:05
@melvin-bot melvin-bot Bot requested a review from chuckdries September 5, 2025 04:37

@chuckdries chuckdries left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Works and code looks good!

@chuckdries chuckdries merged commit 975cce9 into Expensify:main Sep 5, 2025
20 checks passed
@OSBotify

OSBotify commented Sep 5, 2025

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Sep 9, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/chuckdries in version: 9.2.3-0 🚀

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

@jponikarchuk

jponikarchuk commented Sep 9, 2025

Copy link
Copy Markdown

@mukhrr @trjExpensify @suneox Could you please clarify PR step 4 all workflows should be present after changing approval mode from "Advanced Approval" to "Submit and Approve", but they disappear. According to PR's video and this KI workflows should disappear. What is expected behaviour?

@mukhrr

mukhrr commented Sep 9, 2025

Copy link
Copy Markdown
Contributor Author

@jponikarchuk only one workflow should remain after changing approval mode from "Advanced Approval" to "Submit and Approve". It was my mistake. I've updated it now

@trjExpensify

Copy link
Copy Markdown
Contributor

only one workflow should remain after changing approval mode from "Advanced Approval" to "Submit and Approve".

Agreed. 👍

@jponikarchuk

Copy link
Copy Markdown

Thanks @mukhrr

@OSBotify

OSBotify commented Sep 9, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/chuckdries in version: 9.2.5-0 🚀

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

@OSBotify

OSBotify commented Sep 9, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/chuckdries in version: 9.2.8-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 9.2.8-4 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 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