Remove data from being sideloaded in the money request header #27286

tgolen · 2023-09-12T19:45:18Z

Details

This PR marks the two methods as deprecated and then removes them from the money request header and instead loads the data using withOnyx()

Fixed Issues

Part of #27262

Tests

Go to a chat with someone
Request money from them and use the "manual" option
Request money from them again and use the "scan" option
From the report, open each request to see the details
Verify that for the "manual" request, the header appears normal and doesn't show anything about distance or scanning
Verify that for the "scan" request, the header shows the receipt is scanning

Verify that no errors appear in the JS console

Offline tests

None really. If you create the requests when you're offline, you can't open them up to view the details until it's synced with the server.

QA Steps

Same as tests

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

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-09-12T20:21:41Z

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

techievivek · 2023-09-14T10:21:00Z

My android setup is broken 😢 I am not sure if I can fill the whole checklist.

techievivek · 2023-09-14T10:21:40Z

Let me try to bring it up. Sorry for the delay.

techievivek · 2023-09-15T03:47:01Z

Before any new conflicts arise, I'm going to bring in a C+ to help with review, since both Android and iOS builds are broken for me: https://expensify.slack.com/archives/C03TQ48KC/p1694747895004179

aimane-chnaif

Also please pull main

aimane-chnaif · 2023-09-15T04:32:47Z

src/components/MoneyRequestHeader.js

@@ -34,7 +35,9 @@ const propTypes = {
    /** Personal details so we can get the ones for the report participants */
    personalDetails: PropTypes.objectOf(participantPropTypes).isRequired,

-    /** Onyx Props */
+    ...windowDimensionsPropTypes,


As this is function component, let's use useWindowDimensions hook

aimane-chnaif · 2023-09-15T04:36:22Z

src/components/MoneyRequestHeader.js

@@ -140,8 +144,7 @@ export default compose(
            canEvict: false,
        },
        transaction: {
-            key: ({report, parentReportActions}) =>
-                `${ONYXKEYS.COLLECTION.TRANSACTION}${lodashGet(parentReportActions, [report.parentReportActionID, 'originalMessage', 'IOUTransactionID'], '')}`,
+            key: ({parentReportAction}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${lodashGet(parentReportAction, 'originalMessage.IOUTransactionID', 0)}`,


Good catch! parentReportActions -> parentReportAction
Seems like fixing regression from #25498

Yes! I spotted that and wanted to fix it here.

aimane-chnaif · 2023-09-15T04:39:33Z

Lint is failing

tgolen · 2023-09-15T18:56:08Z

I have fixed the lint issues, used the dimension hook, and retested it. Can you please have another look? Thanks!

aimane-chnaif · 2023-09-18T13:56:10Z

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

web.mov

Mobile Web - Chrome

Mobile Web - Safari

msafari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

aimane-chnaif

LGTM 🎉

Confirmed this also fixes scanning view hidden on header which happens on current main

melvin-bot · 2023-09-18T14:01:20Z

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

melvin-bot · 2023-09-18T14:01:26Z

🎯 @aimane-chnaif, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #27676.

tgolen · 2023-09-18T22:39:07Z

@arosiclair can you please review and merge this? There is already a reviewer checklist filled out, so you can skip that (I'm not sure why Melvin requested you to fill one out).

arosiclair

Code LGTM but I don't actually see any of those sideloading get functions being removed from MoneyRequestHeader in these changes 🤔

tgolen · 2023-09-19T02:46:23Z

but I don't actually see any of those sideloading get functions being removed from MoneyRequestHeader in these changes

So, the funny part about it is that someone already updated this component while my PR was open to remove those methods :D I promise they were there when I started! 😂

arosiclair · 2023-09-19T03:49:18Z

Oh makes sense haha. Good to merge then 👍

OSBotify · 2023-09-19T03:55:18Z

✋ 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-20T08:45:42Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 1.3.72-0 🚀

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

thienlnam · 2023-09-21T03:17:26Z

@tgolen Looks like QA was unable to verify due to #27893, can you confirm if this is expected or not?

tgolen · 2023-09-21T05:48:32Z

I just checked on main and I am able to select both expenses separately and they are not combined. In other words, I can't reproduce #27893

However, for the purposes of this testing, as long as you see this scanning header, then that's really all that matters.

An alternative way to test this would be to do a manual request to User A and a scan request to User B, and check each of the headers. It doesn't matter if the transactions are in the same report or not.

OSBotify · 2023-09-22T13:27:37Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.72-11 🚀

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

tgolen added 3 commits September 12, 2023 12:41

Mark methods as deprecated

0102215

Fetch objects using withOnyx

4a9d6f6

Merge branch 'main' into tgolen-remove-sideloading0

a662d31

tgolen self-assigned this Sep 12, 2023

Fix some issues with props loading

96f46d3

tgolen marked this pull request as ready for review September 12, 2023 20:21

tgolen requested a review from a team as a code owner September 12, 2023 20:21

melvin-bot bot requested review from techievivek and removed request for a team September 12, 2023 20:21

tgolen added 4 commits September 12, 2023 14:22

Remove optional chaining

db642ba

Make lint warning go away

0f2cfbf

Try to fix props dependency

3b14e96

Remove references to props

361c107

tgolen and others added 2 commits September 14, 2023 10:33

Merge branch 'main' into tgolen-remove-sideloading0

9aececd

Merge branch 'main' into tgolen-remove-sideloading0

286adad

techievivek requested a review from aimane-chnaif September 15, 2023 03:49

aimane-chnaif reviewed Sep 15, 2023

View reviewed changes

tgolen added 2 commits September 15, 2023 12:36

Merge branch 'main' into tgolen-remove-sideloading0

fdcc04b

Fix lint and use hook for dimensions

981f293

aimane-chnaif approved these changes Sep 18, 2023

View reviewed changes

melvin-bot bot requested a review from arosiclair September 18, 2023 14:01

melvin-bot bot mentioned this pull request Sep 18, 2023

Payment issue for E/App PR#27286 #27676

Closed

arosiclair approved these changes Sep 19, 2023

View reviewed changes

arosiclair merged commit ff3935f into main Sep 19, 2023
12 checks passed

arosiclair deleted the tgolen-remove-sideloading0 branch September 19, 2023 03:50

OSBotify mentioned this pull request Sep 20, 2023

Deploy Checklist: New Expensify 2023-09-20 #27837

Closed

lanitochka17 mentioned this pull request Sep 20, 2023

IOU- Money request amount and Scan request are shown combined #27893

Closed

6 tasks

VickyStash mentioned this pull request Sep 22, 2023

[No QA] [TS migration] Migrate 'TransactionUtils.js' lib to TypeScript #28005

Merged

59 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove data from being sideloaded in the money request header #27286

Remove data from being sideloaded in the money request header #27286

tgolen commented Sep 12, 2023 •

edited

Loading

melvin-bot bot commented Sep 12, 2023

techievivek commented Sep 14, 2023

techievivek commented Sep 14, 2023

techievivek commented Sep 15, 2023

aimane-chnaif left a comment

aimane-chnaif Sep 15, 2023

aimane-chnaif Sep 15, 2023

tgolen Sep 15, 2023

aimane-chnaif commented Sep 15, 2023

tgolen commented Sep 15, 2023

aimane-chnaif commented Sep 18, 2023

aimane-chnaif left a comment

melvin-bot bot commented Sep 18, 2023

melvin-bot bot commented Sep 18, 2023

tgolen commented Sep 18, 2023

arosiclair left a comment

tgolen commented Sep 19, 2023

arosiclair commented Sep 19, 2023

OSBotify commented Sep 19, 2023

OSBotify commented Sep 20, 2023

thienlnam commented Sep 21, 2023

tgolen commented Sep 21, 2023 •

edited

Loading

OSBotify commented Sep 22, 2023

Remove data from being sideloaded in the money request header #27286

Remove data from being sideloaded in the money request header #27286

Conversation

tgolen commented Sep 12, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 12, 2023

techievivek commented Sep 14, 2023

techievivek commented Sep 14, 2023

techievivek commented Sep 15, 2023

aimane-chnaif left a comment

Choose a reason for hiding this comment

aimane-chnaif Sep 15, 2023

Choose a reason for hiding this comment

aimane-chnaif Sep 15, 2023

Choose a reason for hiding this comment

tgolen Sep 15, 2023

Choose a reason for hiding this comment

aimane-chnaif commented Sep 15, 2023

tgolen commented Sep 15, 2023

aimane-chnaif commented Sep 18, 2023

Reviewer Checklist

Screenshots/Videos

aimane-chnaif left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Sep 18, 2023

melvin-bot bot commented Sep 18, 2023

tgolen commented Sep 18, 2023

arosiclair left a comment

Choose a reason for hiding this comment

tgolen commented Sep 19, 2023

arosiclair commented Sep 19, 2023

OSBotify commented Sep 19, 2023

OSBotify commented Sep 20, 2023

thienlnam commented Sep 21, 2023

tgolen commented Sep 21, 2023 • edited Loading

OSBotify commented Sep 22, 2023

tgolen commented Sep 12, 2023 •

edited

Loading

tgolen commented Sep 21, 2023 •

edited

Loading