Skip to content

Add Report creation related options to Simplified actions button#60887

Merged
luacmartins merged 12 commits into
Expensify:mainfrom
software-mansion-labs:@szymczak/create-buttons
Apr 29, 2025
Merged

Add Report creation related options to Simplified actions button#60887
luacmartins merged 12 commits into
Expensify:mainfrom
software-mansion-labs:@szymczak/create-buttons

Conversation

@SzymczakJ
Copy link
Copy Markdown
Contributor

@SzymczakJ SzymczakJ commented Apr 25, 2025

Explanation of Change

In the context of simplified report actions, this PR adds "Add expense" primary button for empty reports and a "Add expense" secondary button for Reports that already have the expense and satisfy canAddTransaction check.
It also restricts Create report action in FAB and Workspace chats so that the user cannot create a report, when the chosen policy is pas it's grace period.

Fixed Issues

$ #57656
PROPOSAL:

Tests

Testing Simplified report actions:

  1. Create empty report by using FAB.
  2. Make sure that "Add expense" button is shown.
  3. Make sure that adding expense with "Add expense" button works.
  4. Make sure that after the expense was added to the report, the "Add expense" button switches to "Submit" button and "Add expense" moves to secondary buttons(opened by "More" button).
  5. Make sure that after submitting the report, the "Add expense" is no longer present in secondary buttons.

Test restricts "Create report" action in FAB and Workspace chats.

  1. Go to workspace chat that is past it's grace period.
  2. Try to create report with the composer plus button and make sure that you are redirected to Action restricted screen.
  3. Try to create report by FAB with having a default workspace that is past it's grace period. Make sure that it redirects to "Choose workspace" screen
  4. Make sure that while on "Choose workspace" screen, clicking on a past grace period workspace is also redirecting to "Action restricted" screen

Offline tests

QA Steps

Same as tests

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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari Screenshot 2025-04-25 at 17 33 07 Screenshot 2025-04-25 at 17 33 33
MacOS: Desktop

@SzymczakJ SzymczakJ marked this pull request as ready for review April 25, 2025 14:09
@SzymczakJ SzymczakJ requested a review from a team as a code owner April 25, 2025 14:09
@melvin-bot melvin-bot Bot requested review from getusha and removed request for a team April 25, 2025 14:10
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 25, 2025

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

@jnowakow jnowakow force-pushed the @szymczak/create-buttons branch from 5b15bda to 4ccf3c0 Compare April 28, 2025 12:18
@DylanDylann
Copy link
Copy Markdown
Contributor

@jnowakow please make sure that we only should use canBeMissing is true if the component can render if we miss that field

@DylanDylann
Copy link
Copy Markdown
Contributor

DylanDylann commented Apr 28, 2025

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 tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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.js 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.
  • 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: Native
Android: mWeb Chrome
Screen.Recording.2025-04-29.at.11.53.28.mov
iOS: Native
Screen.Recording.2025-04-29.at.11.52.41.mov
iOS: mWeb Safari
Screen.Recording.2025-04-29.at.11.50.30.mov
MacOS: Chrome / Safari
Screen.Recording.2025-04-29.at.11.45.32.mov
MacOS: Desktop
Screen.Recording.2025-04-29.at.11.48.36.mov

@melvin-bot melvin-bot Bot requested a review from mountiny April 29, 2025 04:54
@DylanDylann
Copy link
Copy Markdown
Contributor

Minor comment: #60887 (comment)

the rest looks fine

@sumo-slonik
Copy link
Copy Markdown
Contributor

Kuba asked me to take care of it, I'll take a look at it today.

@sumo-slonik
Copy link
Copy Markdown
Contributor

I think canBeMissing is already fixed.

@trjExpensify
Copy link
Copy Markdown
Contributor

Inteeeresting. So we need a @mountiny review and merge it here then?

@sumo-slonik
Copy link
Copy Markdown
Contributor

I think so, that we can move forward with this.

@luacmartins luacmartins self-requested a review April 29, 2025 15:15
luacmartins
luacmartins previously approved these changes Apr 29, 2025
Copy link
Copy Markdown
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

@luacmartins luacmartins merged commit c4c889f into Expensify:main Apr 29, 2025
17 checks passed
@OSBotify
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.

@github-actions
Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.1.38-0 🚀

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

@nlemma
Copy link
Copy Markdown

nlemma commented Apr 30, 2025

@SzymczakJ For the second part of the test steps, since this is a beta feature and requires Expensifail accounts, how can we get access to a workspace with its grace period past?

@mountiny
Copy link
Copy Markdown
Contributor

That is fair, maybe @trjExpensify could help qa this by adding some of his email/ private domain to the beta?

@trjExpensify
Copy link
Copy Markdown
Contributor

I have trj.chat on the beta. What do we need? An account with an overdue balance? Sheesh... let me look.

@trjExpensify
Copy link
Copy Markdown
Contributor

Boom, got one. tom+trackguy121@trj.chat

Test restricts "Create report" action in FAB and Workspace chats.

Go to workspace chat that is past it's grace period.
Try to create report with the composer plus button and make sure that you are redirected to Action restricted screen.
Try to create report by FAB with having a default workspace that is past it's grace period. Make sure that it redirects to "Choose workspace" screen
Make sure that while on "Choose workspace" screen, clicking on a past grace period workspace is also redirecting to "Action restricted" screen

2025-05-01_00-16-12.mp4

Looks like it's a pass. Though @SzymczakJ when you're back, I don't see the need to show the choose workspace screen when the user only has the one, so we could go straight to the action restricted screen.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 1, 2025

🚀 Deployed to production by https://github.com/thienlnam in version: 9.1.38-4 🚀

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

@SzymczakJ
Copy link
Copy Markdown
Contributor Author

Looks like it's a pass. Though @SzymczakJ when you're back, I don't see the need to show the choose workspace screen when the user only has the one, so we could go straight to the action restricted screen.

That makes sense. I'll fix it along with fixing #61186 @trjExpensify

shouldShowBrokenConnectionViolation as shouldShowBrokenConnectionViolationTransactionUtils,
} from './TransactionUtils';

function isAddExpenseAction(report: Report, reportTransactions: Transaction[]) {
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.

Coming from: #62958, we should add the condition to check if it's ChatReportArchived

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.

10 participants