fix: correctly setting up the billable value of IOU #30802

abdel-h66 · 2023-11-02T21:24:03Z

Details

Fixed Issues

$ #30454
PROPOSAL: #30454 (comment)

Tests

Verify that no errors appear in the JS console

As the admin on OD, go to workspace settings
Go to "Expenses" tab and change "Re-bill expenses to clients" to "Default to Billable"
As the employee on ND, go to workspace chat
Initiate a manual money request
Enter the amount and click on "Next"
Click on "Show more"
Verify that you can see the Billable toggle enabled

Offline tests

QA Steps

Verify that no errors appear in the JS console

As the admin on OD, go to workspace settings
Go to "Expenses" tab and change "Re-bill expenses to clients" to "Default to Billable"
As the employee on ND, go to workspace chat
Initiate a manual money request
Enter the amount and click on "Next"
Click on "Show more"
Verify that you can see the Billable toggle enabled

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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

ANDROID-NATIVE.mp4

Android: mWeb Chrome

ANDROID-CHROME.mp4

iOS: Native

IOS-NATIVE.mp4

iOS: mWeb Safari

IOS-SAFARI.mp4

MacOS: Chrome / Safari

MACOS-CHROME.mp4

MacOS: Desktop

DEKSOTP-NATIVE.mp4

melvin-bot · 2023-11-02T21:24:08Z

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

abdel-h66 · 2023-11-02T21:35:08Z

src/pages/iou/steps/MoneyRequestConfirmPage.js

    }, [isOffline, participants, props.iou.billable, props.policy]);

+    const defaultBillable = lodashGet(props.policy, 'defaultBillable', false);


Use this to avoid putting the whole props.policy as a dependency to the useEffect. Unless you have other suggestions :)

I'm OK with it :D

robertKozik · 2023-11-03T11:05:11Z

I'm gonna proceed with reviewing it today

robertKozik · 2023-11-03T18:12:25Z

Hi @abdel-h66 I have trouble with creating suitable workspace chat, can you guide me in this?

abdel-h66 · 2023-11-04T08:24:20Z

I created the workspace that I am using a while back with my free trial. you can try the following |

Go to oldDot
Click settings
Create new Workspace
Pick control and see if this works

The other option would be, me adding you to my workspace, where you will be an admin. And then you invite another user as employee of the workspace. I will need your email for this one.

abdel-h66 · 2023-11-06T15:11:03Z

Any updates on this one @robertKozik

robertKozik · 2023-11-07T20:43:05Z

Sorry I had a problem with the workspaces but I managed to cope with them succesfully. I'm getting back to review this PR 🪨

robertKozik · 2023-11-07T21:07:37Z

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

Android: Native

android.ios.native.mov

Android: mWeb Chrome

android.ios.web.mov

iOS: Native

android.ios.native.mov

iOS: mWeb Safari

android.ios.web.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

robertKozik · 2023-11-07T21:09:04Z

I just saw that we have a problem with the performance test, but I believe that it can be false alarm - I don't think small changes from this PR could affect overall performance

MariaHCD · 2023-11-08T09:41:20Z

The performance test failures might be related: https://expensify.slack.com/archives/C05LX9D6E07/p1699376143402249?thread_ts=1698763822.262249&cid=C05LX9D6E07

@abdel-h66 Can we try merging main?

abdel-h66 · 2023-11-09T18:13:55Z

That's done @MariaHCD

MariaHCD · 2023-11-10T07:35:43Z

Great, that seems to have fixed the failing performance test

melvin-bot · 2023-11-10T07:36:16Z

Congrats, that’s your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It’s an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

OSBotify · 2023-11-10T07:41:55Z

✋ 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-11-10T15:58:57Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 1.3.98-0 🚀

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

OSBotify · 2023-11-14T21:52:24Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.98-5 🚀

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

OSBotify · 2023-11-14T22:12:16Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 1.3.99-0 🚀

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

OSBotify · 2023-11-15T20:55:31Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.99-0 🚀

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

abdel-h66 requested a review from a team as a code owner November 2, 2023 21:24

melvin-bot bot requested review from robertKozik and removed request for a team November 2, 2023 21:24

abdel-h66 force-pushed the 30454-fix-billable branch from 2514107 to 4694f65 Compare November 2, 2023 21:34

abdel-h66 commented Nov 2, 2023

View reviewed changes

robertKozik approved these changes Nov 7, 2023

View reviewed changes

melvin-bot bot requested a review from MariaHCD November 7, 2023 21:08

MariaHCD approved these changes Nov 8, 2023

View reviewed changes

fix: correctly setting up the billable value of IOU

668e0b7

abdel-h66 force-pushed the 30454-fix-billable branch from 4694f65 to 668e0b7 Compare November 9, 2023 17:59

MariaHCD merged commit d4a97bc into Expensify:main Nov 10, 2023
12 checks passed

OSBotify mentioned this pull request Nov 10, 2023

Deploy Checklist: New Expensify 2023-11-10 #31187

Closed

OSBotify mentioned this pull request Nov 14, 2023

Deploy Checklist: New Expensify 2023-11-14 #31324

Closed

melvin-bot bot mentioned this pull request Nov 14, 2023

[HOLD for payment 2023-11-21] [$500] [Wave 6: Tags] Billable toggle is not enabled by default after setting it up for that #30454

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: correctly setting up the billable value of IOU #30802

fix: correctly setting up the billable value of IOU #30802

abdel-h66 commented Nov 2, 2023

melvin-bot bot commented Nov 2, 2023

abdel-h66 Nov 2, 2023

robertKozik Nov 3, 2023

robertKozik commented Nov 3, 2023

robertKozik commented Nov 3, 2023

abdel-h66 commented Nov 4, 2023 •

edited

Loading

abdel-h66 commented Nov 6, 2023

robertKozik commented Nov 7, 2023

robertKozik commented Nov 7, 2023

robertKozik commented Nov 7, 2023

MariaHCD commented Nov 8, 2023 •

edited

Loading

abdel-h66 commented Nov 9, 2023

MariaHCD commented Nov 10, 2023

melvin-bot bot commented Nov 10, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 14, 2023

OSBotify commented Nov 14, 2023

OSBotify commented Nov 15, 2023

		}, [isOffline, participants, props.iou.billable, props.policy]);

		const defaultBillable = lodashGet(props.policy, 'defaultBillable', false);

fix: correctly setting up the billable value of IOU #30802

fix: correctly setting up the billable value of IOU #30802

Conversation

abdel-h66 commented Nov 2, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 2, 2023

abdel-h66 Nov 2, 2023

Choose a reason for hiding this comment

robertKozik Nov 3, 2023

Choose a reason for hiding this comment

robertKozik commented Nov 3, 2023

robertKozik commented Nov 3, 2023

abdel-h66 commented Nov 4, 2023 • edited Loading

abdel-h66 commented Nov 6, 2023

robertKozik commented Nov 7, 2023

robertKozik commented Nov 7, 2023

Reviewer Checklist

Screenshots/Videos

robertKozik commented Nov 7, 2023

MariaHCD commented Nov 8, 2023 • edited Loading

abdel-h66 commented Nov 9, 2023

MariaHCD commented Nov 10, 2023

melvin-bot bot commented Nov 10, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 10, 2023

OSBotify commented Nov 14, 2023

OSBotify commented Nov 14, 2023

OSBotify commented Nov 15, 2023

abdel-h66 commented Nov 4, 2023 •

edited

Loading

MariaHCD commented Nov 8, 2023 •

edited

Loading