Feat: Editable billable flag #27875

waterim · 2023-09-20T17:24:12Z

Details

This PR is to view and edit a billable toggle on an already created money request.
To create a money request please insert this to App.js with your policyID you are testing:

    window.Onyx.merge(`policy_${YOUR_ID}`, {
        disabledFields: {
            defaultBillable: false,
            reimbursable: false,
        },
        defaultBillable: false,
    });

And you need beta - newDotTags

Fixed Issues

$ #26793
PROPOSAL: #26793 (comment)

Tests

Login to the app
Create a new money request.
Dive into the created requests to edit .
Verify that there is a Billable toggle.
Try to change toggler
After we refresh page, selected toggle should remain.
After we close edit mode and go again, selected toggle should remain.

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

None

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 / Chrome
- iOS / native
- iOS / 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 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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

…-edit

melvin-bot · 2023-09-21T13:13:36Z

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

robertKozik · 2023-09-22T09:34:12Z

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 / Chrome
- iOS / native
- iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

src/libs/TransactionUtils.js

robertKozik

Thanks for quick changes. Approving!

amyevans

Just a few minor requests to code changes, however, could you also include the system message code in this PR as well? It should be a pretty light lift. The spec is:

If billable status is changed post request creation, we’ll add a system message in the request’s thread, so there’s a history of the change and who made it.

If changed to billable, the system message copy is Changed the request to billable (previously non-billable.)

If changed to non-billable, the system message copy is Changed the request to non-billable (previously billable.)

If you're not comfortable with that or have questions let me know! You can take a look at the changes in ReportUtils in https://github.com/Expensify/App/pull/27950/files for an idea of how to do it!

src/components/ReportActionItem/MoneyRequestView.js

src/libs/TransactionUtils.js

…-edit

waterim · 2023-09-25T10:13:13Z

@amyevans Updated all your comments!

amyevans · 2023-09-25T13:29:04Z

Posted in our Slack thread as well, but am not seeing the appropriate system message when testing (offline for now, since backend changes are still pending). Could you take a look?

waterim · 2023-09-25T13:54:30Z

@amyevans
Updated once again:

amyevans · 2023-09-26T00:28:33Z

Ah I see where the disconnect is. The system message should appear on the transaction thread, not the expense report

Screen.Recording.2023-09-26.at.8.23.28.AM.mov

waterim · 2023-09-26T00:32:46Z

@amyevans Ahhh, get it, sorry for this disconnection..
Will change it tomorrow

amyevans · 2023-09-26T00:35:03Z

Thanks!

waterim · 2023-09-26T11:56:17Z

@amyevans Finally found that I was sending wrong reportID, from transaction, but not from report itself, thats why message was appearing in the expense report, now it works fine

amyevans

Thanks! Just one minor update then good to go!

src/libs/ReportUtils.js

waterim · 2023-09-26T17:51:05Z

@amyevans Done!

amyevans

🚀

OSBotify · 2023-09-27T01:34:36Z

✋ 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 · 2023-09-28T19:18:55Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.75-0 🚀

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

kavimuru · 2023-09-29T16:21:19Z

@amyevans @robertKozik is this still behind beta?

amyevans · 2023-09-30T22:14:12Z

@kavimuru yes it's behind beta!

OSBotify · 2023-10-02T17:22:50Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.75-12 🚀

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

OSBotify · 2023-10-02T17:51:28Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.76-0 🚀

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

OSBotify · 2023-10-03T15:52:25Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.76-6 🚀

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

parasharrajat · 2023-11-10T15:56:15Z

src/components/ReportActionItem/MoneyRequestView.js

@@ -225,6 +230,16 @@ function MoneyRequestView({report, betas, parentReport, policyCategories, should
                    />
                </OfflineWithFeedback>
            )}
+            {shouldShowBillable && (
+                <View style={[styles.flexRow, styles.mb4, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8]}>


The padding was inconsistent here. #30821

s77rt · 2023-11-25T13:47:58Z

src/components/ReportActionItem/MoneyRequestView.js

+                    <Switch
+                        accessibilityLabel={translate('common.billable')}
+                        isOn={transactionBillable}
+                        onToggle={(value) => IOU.editMoneyRequest(transaction.transactionID, report.reportID, {billable: value})}


At the time of writing this code. IOU.editMoneyRequest was only used for regular money requests. If we call this function on a distance money request it won't work as expected (regression: #31128). There was another function IOU.updateDistanceRequest that we should have called in that case.

PS: Now IOU.editMoneyRequest is unified to handle both regular and distance money requests.

ikevin127 · 2024-12-19T03:11:55Z

src/components/ReportActionItem/MoneyRequestView.js

@@ -225,6 +230,16 @@ function MoneyRequestView({report, betas, parentReport, policyCategories, should
                    />
                </OfflineWithFeedback>
            )}
+            {shouldShowBillable && (
+                <View style={[styles.flexRow, styles.mb4, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8]}>
+                    <Text color={!transactionBillable ? themeColors.textSupporting : undefined}>{translate('common.billable')}</Text>


The conditional color of the label here led to this issue:

[HOLD for payment 2024-12-25] [$250] Billable-Billable and "members must categorize all expense" on toggle off text color behavior #53460

which was fixed by removing the style completely.

waterim added 7 commits September 20, 2023 18:59

edit billable

0ca5dde

Merge remote-tracking branch 'upstream/main' into feat-26793-billable…

81faf29

…-edit

fix lint

37ade6b

comment change

a9f062c

added verification for billable in disabled fields

228c4f5

distance request

eaa4706

Merge remote-tracking branch 'upstream/main' into feat-26793-billable…

f6351fb

…-edit

waterim marked this pull request as ready for review September 21, 2023 13:13

waterim requested a review from a team as a code owner September 21, 2023 13:13

melvin-bot bot requested review from robertKozik and removed request for a team September 21, 2023 13:13

lint fix

feb52ed

robertKozik reviewed Sep 22, 2023

View reviewed changes

src/libs/TransactionUtils.js Outdated Show resolved Hide resolved

getBillable change to false

bb4509a

robertKozik approved these changes Sep 22, 2023

View reviewed changes

melvin-bot bot requested a review from amyevans September 22, 2023 15:28

amyevans requested changes Sep 25, 2023

View reviewed changes

src/components/ReportActionItem/MoneyRequestView.js Outdated Show resolved Hide resolved

src/libs/TransactionUtils.js Outdated Show resolved Hide resolved

waterim added 2 commits September 25, 2023 12:03

Merge remote-tracking branch 'upstream/main' into feat-26793-billable…

c81e98f

…-edit

system message

805bab2

change system message

e62bffe

system message fix

7195b7c

amyevans reviewed Sep 26, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

toLowerCase translations

8cb78cc

amyevans approved these changes Sep 27, 2023

View reviewed changes

amyevans merged commit 9b7d09e into Expensify:main Sep 27, 2023
11 checks passed

amyevans mentioned this pull request Sep 28, 2023

[HOLD for payment 2023-10-09] [Wave 6: Tags] CRITICAL - Frontend: editing a tag and billable flag #26793

Closed

4 tasks

OSBotify mentioned this pull request Sep 28, 2023

Deploy Checklist: New Expensify 2023-09-28 #28412

Closed

lanitochka17 mentioned this pull request Sep 29, 2023

IOU - No billable toggle shown when editing money request #28516

Closed

6 tasks

OSBotify mentioned this pull request Oct 2, 2023

Deploy Checklist: New Expensify 2023-10-02 #28635

Closed

parasharrajat reviewed Nov 10, 2023

View reviewed changes

parasharrajat mentioned this pull request Nov 10, 2023

[HOLD for payment 2023-11-17] [$500] [Wave 6: Tags] Billable and Tag category are not spaced enough like other sections #30821

Closed

6 tasks

s77rt reviewed Nov 25, 2023

View reviewed changes

s77rt mentioned this pull request Nov 25, 2023

[HOLD for payment 2023-11-30] [$500] Distance - The title 'Distance' changing to 'Merchant' when toggling on Billable #31128

Closed

6 tasks

ikevin127 reviewed Dec 19, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: Editable billable flag #27875

Feat: Editable billable flag #27875

waterim commented Sep 20, 2023

melvin-bot bot commented Sep 21, 2023

robertKozik commented Sep 22, 2023

robertKozik left a comment

amyevans left a comment

waterim commented Sep 25, 2023

amyevans commented Sep 25, 2023

waterim commented Sep 25, 2023

amyevans commented Sep 26, 2023

waterim commented Sep 26, 2023

amyevans commented Sep 26, 2023

waterim commented Sep 26, 2023

amyevans left a comment

waterim commented Sep 26, 2023

amyevans left a comment

OSBotify commented Sep 27, 2023

OSBotify commented Sep 28, 2023

kavimuru commented Sep 29, 2023

amyevans commented Sep 30, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

parasharrajat Nov 10, 2023

s77rt Nov 25, 2023

ikevin127 Dec 19, 2024

Feat: Editable billable flag #27875

Feat: Editable billable flag #27875

Conversation

waterim commented Sep 20, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 21, 2023

robertKozik commented Sep 22, 2023

Reviewer Checklist

Screenshots/Videos

robertKozik left a comment

Choose a reason for hiding this comment

amyevans left a comment

Choose a reason for hiding this comment

waterim commented Sep 25, 2023

amyevans commented Sep 25, 2023

waterim commented Sep 25, 2023

amyevans commented Sep 26, 2023

waterim commented Sep 26, 2023

amyevans commented Sep 26, 2023

waterim commented Sep 26, 2023

amyevans left a comment

Choose a reason for hiding this comment

waterim commented Sep 26, 2023

amyevans left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 27, 2023

OSBotify commented Sep 28, 2023

kavimuru commented Sep 29, 2023

amyevans commented Sep 30, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

parasharrajat Nov 10, 2023

Choose a reason for hiding this comment

s77rt Nov 25, 2023

Choose a reason for hiding this comment

ikevin127 Dec 19, 2024

Choose a reason for hiding this comment