[OldDot Rules Migration] Expense report rules #47468

BrtqKr · 2024-08-14T22:52:03Z

Details

Fixed Issues

$ #47014
PROPOSAL:

Tests

Firstly make sure rules are enabled

Go to the workspaces and select one
Go to the workflows -> check if everything is disabled
Go to the rules -> check if bottom three rules are properly locked are redirecting to the more features section
Enable everything in Workflows
Go to the rules -> verify that every switch is unlocked
Go through each section and verify that editing everything works as expected

A couple of things to note regarding features:

Disabling Custom Report Names and enabling them again should result in the reset of the custom name format to the default one, which is {report:type} {report:startdate}
Verify that trying to set Custom report name to the empty string and submitting results in error
Same with auto-payments, but it should reset the value to 100.00
Verify that auto-payments larger than 20k usd are not allowed
Verify that % in random audit does not allow input larger than 100 and allows 0 as an input

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-08-23.at.11.39.31.mov

Android: mWeb Chrome

Screen.Recording.2024-08-23.at.11.50.14.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-08-23.at.11.24.35.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-08-23.at.11.17.07.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-08-23.at.10.23.45.mov

MacOS: Desktop

Screen.Recording.2024-08-23.at.10.29.43.mov

melvin-bot · 2024-08-14T22:52:08Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

BrtqKr · 2024-09-03T09:39:00Z

@BrtqKr The default value should be 100$

it is https://github.com/user-attachments/assets/8016c61a-0144-4da4-86df-fe151b9dabc4

DylanDylann · 2024-09-03T09:40:17Z

src/pages/workspace/rules/ExpenseReportRulesSection.tsx

+            pendingAction: policy?.pendingFields?.shouldShowCustomReportTitleOption,
+            onToggle: (isEnabled: boolean) => PolicyActions.enablePolicyDefaultReportTitle(policyID, isEnabled),
+            subMenuItems: [
+                <OfflineWithFeedback pendingAction={policy?.fieldList?.[CONST.POLICY.FIELD_LIST_TITLE_FIELD_ID].pendingFields?.defaultValue}>


@BrtqKr How about this way?

Suggested change

<OfflineWithFeedback pendingAction={policy?.fieldList?.[CONST.POLICY.FIELD_LIST_TITLE_FIELD_ID].pendingFields?.defaultValue}>

<OfflineWithFeedback pendingAction={(!policy?.pendingFields?.shouldShowCustomReportTitleOption && policy?.fieldList?.[CONST.POLICY.FIELD_LIST_TITLE_FIELD_ID].pendingFields?.defaultValue) ? policy?.fieldList?.[CONST.POLICY.FIELD_LIST_TITLE_FIELD_ID].pendingFields?.defaultValue) : null

}>

might be confusing after some time, but seems to be working as expected, thank you!

@BrtqKr Could you please detail this point? I think we need to discuss about this to avoid regression in the future

might be confusing after some time

BrtqKr · 2024-09-03T11:56:39Z

Just responding to the copy request here - is it always going to be a hard rule of: under 20,000 of whatever the currency is, 20,000 of USD, or will the 20k amount ever change? Making sure I understand fully before giving a copy recommendation, thanks!

@jamesdeanexpensify, as I noted in one of the comments. It's always 20k units, without considering the currency on the front-end, since the currency is always taken from the policy and not used during validation. My main worry was that if you use a currency where the exchange rate isn't close as for example gbp/usd then this limit might be a bit too rigorous, which would negatively affect user experience. I haven't seen any currency-based limits on the front-end tho, so this might possibly end up as a broader topic to discuss.

jamesdeanexpensify · 2024-09-03T17:41:03Z

@BrtqKr let's go with Please enter an amount less than [currency symbol] 20,000

marcaaron · 2024-09-03T18:41:37Z

Please display a clear error message to announce to the user that "it’s not possible to enter an amount over $20k" (Maybe we need a support from @Expensify/design team)

I think we might be overthinking this one. This feature is mainly used/enabled when a business bank account is connected for reimbursement. In order to even have "auto-reimbursement" you need a bank account and that bank account in many of our customer cases is going to be locked to USD.

I would guess that it's highly unusual for someone to put a large value like $20,000 USD for auto-reimbursing reports.

So, I think having that error message proposed by @jamesdeanexpensify is fine for now and we shouldn't worry too much about these other currencies.

marcaaron

Changes look great here. I think we are just waiting for someone to confirm the translations.

DylanDylann · 2024-09-05T07:23:28Z

@BrtqKr Bump on #47468 (comment)

and please resolve conflict

…s-section

BrtqKr · 2024-09-05T08:05:11Z

@DylanDylann, swapped the condition
@marcaaron, I think the translations confirmation is the only thing left

DylanDylann · 2024-09-05T08:06:48Z

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

Screen.Recording.2024-09-05.at.17.00.22.mov

Android: mWeb Chrome

Screen.Recording.2024-09-05.at.17.06.29.mov

iOS: Native

Screen.Recording.2024-09-05.at.15.25.38.mov

iOS: mWeb Safari

Screen.Recording.2024-09-05.at.15.22.30.mov

MacOS: Chrome / Safari

Screen.Recording.2024-09-05.at.15.26.18.mov

MacOS: Desktop

Screen.Recording.2024-09-05.at.15.21.21.mov

DylanDylann · 2024-09-05T08:20:24Z

@BrtqKr Lint error

marcaaron

Great work here! Thanks for the changes 🙇

OSBotify · 2024-09-06T19:16:02Z

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

techievivek · 2024-09-10T10:35:22Z

@BrtqKr We have an improvement issue #48868 that seems related to the changes here. Could you please take a look and leave a comment on the issue so I can assign it to you? Thanks!

IuliiaHerets · 2024-09-10T14:10:21Z

This PR is failing for mWeb and Android because of issue #48894

WojtekBoman and others added 19 commits August 8, 2024 15:05

Add ExpenseReportRulesSection

3081420

menu setup

3623d4a

replace items with ToggleSettingOptionRow

3e622bf

add custom report names section content wip

e99bf88

add translations

bff54c3

setup rhp nav

94a0db2

add bullet points, wire up form wip

b07708a

wire up custom name form

2e82822

cleanup custom names, prevent from changing names wip

0d6aa6f

cleanup custom names

4d15101

wire up prevent member created title

66382f0

wire up prevent self approval

6be513d

add remaining routes

2169b17

auto approve reports under amount page wip

132ccbb

wire up auto approval

285cf5e

add percentage form

5797fb1

wire up auto approval audit rate

2e75abd

wire up auto pay

45b46b4

rule lock conditions wip

72c38a4

allroundexperts mentioned this pull request Aug 15, 2024

[$250] [Rules] Connect Rules to upgrade flows #43915

Closed

BrtqKr added 9 commits August 19, 2024 10:38

wire up enablePolicyAutoReimbursementLimit

6f59541

wire up enablePolicyAutoReimbursementLimit, validate wip

daa7c9c

wire up enableAutoApprovalOptions

b188339

wire up auto approve reports under

36160d3

wire up random report audit

7e72524

wire up enable custom report names

21549c6

wire up custom report name

8c8f270

wire up custom report names

269dedd

wire up prevent self approval

34a5c4b

DylanDylann reviewed Sep 3, 2024

View reviewed changes

BrtqKr added 2 commits September 3, 2024 13:41

reivew changes

020b1e3

add conditional pending actions

c71279f

BrtqKr requested a review from DylanDylann September 3, 2024 12:01

marcaaron reviewed Sep 3, 2024

View reviewed changes

change error message

efe9fe6

BrtqKr added 2 commits September 5, 2024 09:59

Merge remote-tracking branch 'origin/main' into brtqkr/expense-report…

2d55ee0

…s-section

swap condition for workflow approvals unavailable

0ef8fb2

run prettier

3f55bd3

DylanDylann approved these changes Sep 5, 2024

View reviewed changes

melvin-bot bot requested a review from marcaaron September 5, 2024 11:24

update translations

442d734

marcaaron approved these changes Sep 6, 2024

View reviewed changes

marcaaron merged commit c1da839 into Expensify:main Sep 6, 2024
15 checks passed

github-actions bot mentioned this pull request Sep 9, 2024

Deploy Checklist: New Expensify 2024-09-09 #48791

Closed

techievivek mentioned this pull request Sep 10, 2024

[OldDot Rules Migration] [Polish] - No error under input field when saving auto-pay amount more than 20k #48868

Open

6 tasks

IuliiaHerets mentioned this pull request Sep 10, 2024

[$250] Rules - After disabling all workflow features and opening rules, page keep loading #48894

Open

6 tasks

lakchote mentioned this pull request Sep 10, 2024

[OldDot Rules Migration] [Polish] - App freezes after updating Custom report name #48879

Open

6 tasks

BrtqKr mentioned this pull request Sep 11, 2024

[OldDot Rules Migration] Tag rules #48325

Merged

52 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[OldDot Rules Migration] Expense report rules #47468

[OldDot Rules Migration] Expense report rules #47468

BrtqKr commented Aug 14, 2024 •

edited

Loading

melvin-bot bot commented Aug 14, 2024

BrtqKr commented Sep 3, 2024

DylanDylann Sep 3, 2024 •

edited

Loading

BrtqKr Sep 3, 2024

DylanDylann Sep 3, 2024

BrtqKr commented Sep 3, 2024

jamesdeanexpensify commented Sep 3, 2024

marcaaron commented Sep 3, 2024

marcaaron left a comment

DylanDylann commented Sep 5, 2024

BrtqKr commented Sep 5, 2024

DylanDylann commented Sep 5, 2024 •

edited

Loading

DylanDylann commented Sep 5, 2024

marcaaron left a comment

OSBotify commented Sep 6, 2024

techievivek commented Sep 10, 2024

IuliiaHerets commented Sep 10, 2024

	<OfflineWithFeedback pendingAction={policy?.fieldList?.[CONST.POLICY.FIELD_LIST_TITLE_FIELD_ID].pendingFields?.defaultValue}>
	<OfflineWithFeedback pendingAction={(!policy?.pendingFields?.shouldShowCustomReportTitleOption && policy?.fieldList?.[CONST.POLICY.FIELD_LIST_TITLE_FIELD_ID].pendingFields?.defaultValue) ? policy?.fieldList?.[CONST.POLICY.FIELD_LIST_TITLE_FIELD_ID].pendingFields?.defaultValue) : null
	}>

[OldDot Rules Migration] Expense report rules #47468

[OldDot Rules Migration] Expense report rules #47468

Conversation

BrtqKr commented Aug 14, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 14, 2024

BrtqKr commented Sep 3, 2024

DylanDylann Sep 3, 2024 • edited Loading

Choose a reason for hiding this comment

BrtqKr Sep 3, 2024

Choose a reason for hiding this comment

DylanDylann Sep 3, 2024

Choose a reason for hiding this comment

BrtqKr commented Sep 3, 2024

jamesdeanexpensify commented Sep 3, 2024

marcaaron commented Sep 3, 2024

marcaaron left a comment

Choose a reason for hiding this comment

DylanDylann commented Sep 5, 2024

BrtqKr commented Sep 5, 2024

DylanDylann commented Sep 5, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

DylanDylann commented Sep 5, 2024

marcaaron left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 6, 2024

techievivek commented Sep 10, 2024

IuliiaHerets commented Sep 10, 2024

BrtqKr commented Aug 14, 2024 •

edited

Loading

DylanDylann Sep 3, 2024 •

edited

Loading

DylanDylann commented Sep 5, 2024 •

edited

Loading