Hide contact option if we don't include P2P option #42142

nkdengineer · 2024-05-14T09:45:07Z

Details

Hide contact option if we don't include P2P option

Fixed Issues

$ #40790
PROPOSAL: #40790 (comment)

Tests

Login with an account that doesn't enable P2PDistance
Go FAB > Submit expense > Distance
Select any waypoint and go to participant page
Verify that contact option doesn't appear in participant page

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Login with an account that doesn't enable P2PDistance
Go FAB > Submit expense > Distance
Select any waypoint and go to participant page
Verify that contact option doesn't appear in participant page

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-05-14.at.16.39.55.mov

Android: mWeb Chrome

Screen.Recording.2024-05-14.at.16.33.20.mov

iOS: Native

Screen.Recording.2024-05-14.at.16.40.51.mov

iOS: mWeb Safari

Screen.Recording.2024-05-14.at.16.33.59.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-14.at.16.30.34.mov

MacOS: Desktop

Screen.Recording.2024-05-14.at.16.44.43.mov

melvin-bot · 2024-05-14T09:45:31Z

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

getusha · 2024-05-19T12:21:22Z

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-06-03.at.2.13.46.in.the.afternoon.mov

Android: mWeb Chrome

Screen.Recording.2024-06-03.at.1.05.29.in.the.afternoon.mov

iOS: Native

Screen.Recording.2024-06-03.at.3.34.15.in.the.afternoon.mov

iOS: mWeb Safari

Screen.Recording.2024-06-03.at.1.44.21.in.the.afternoon.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-03.at.1.04.16.in.the.afternoon.mov

MacOS: Desktop

Screen.Recording.2024-06-03.at.2.02.45.in.the.afternoon.mov

getusha · 2024-05-19T12:22:58Z

src/libs/OptionsListUtils.ts

@@ -1827,7 +1827,7 @@ function getOptions(
        return option;
    });

-    const havingLoginPersonalDetails = options.personalDetails.filter((detail) => !!detail?.login && !!detail.accountID && !detail?.isOptimisticPersonalDetail);
+    const havingLoginPersonalDetails = includeP2P ? options.personalDetails.filter((detail) => !!detail?.login && !!detail.accountID && !detail?.isOptimisticPersonalDetail) : [];


based on your comment shouldn't we cleanup includePersonalDetails if it's redundant?

@getusha I updated to cleanup includePersonalDetails.

Nice I like that.

NAB: We could remove the variable havingLoginPersonalDetails since its unnecessary.

getusha · 2024-05-21T18:22:20Z

src/libs/OptionsListUtils.ts

@@ -1917,7 +1915,7 @@ function getOptions(
        }
    }

-    if (includePersonalDetails) {
+    if (includeP2P) {


this condition will not be redundant? we're assigning an empty array above.

@getusha You're right, I updated.

@nkdengineer I am still not sure if we want to keep the code that was under this condition. could you please confirm that?

@getusha The code that was under this condition is used to create personal detail option so it's necessary.

@nkdengineer sorry, i was just confused because the code was supposed to run only under that condition right? removing only the condition didn't make any sense, can you check it again? and lets make sure we test this thoroughly.

const havingLoginPersonalDetails = includeP2P ? options.personalDetails.filter((detail) => !!detail?.login && !!detail.accountID && !detail?.isOptimisticPersonalDetail) : [];

@getusha

We update this to only filter havingLoginPersonalDetails if includeP2P is true

The code under the condition is calculated the personal detail option based on havingLoginPersonalDetails so we need to keep this code. we can remove the condition because we applied the condition at point 1.

Makes sense, thanks

getusha · 2024-05-29T11:38:44Z

@nkdengineer i am not able to see workspaces on distance expense on main could you check this? and if it is intentional?

Screen.Recording.2024-05-28.at.3.01.49.in.the.afternoon.mov

nkdengineer · 2024-05-30T11:47:50Z

@getusha I still see the the workspace option on the latest main.

Screen.Recording.2024-05-30.at.18.46.54.mov

nkdengineer · 2024-06-04T02:29:15Z

@getusha Any update here.

getusha

LGTM & tests well

neil-marcellini

Great work guys, made it very easy for me!

neil-marcellini · 2024-06-05T00:11:10Z

src/libs/OptionsListUtils.ts

@@ -1827,7 +1827,7 @@ function getOptions(
        return option;
    });

-    const havingLoginPersonalDetails = options.personalDetails.filter((detail) => !!detail?.login && !!detail.accountID && !detail?.isOptimisticPersonalDetail);
+    const havingLoginPersonalDetails = includeP2P ? options.personalDetails.filter((detail) => !!detail?.login && !!detail.accountID && !detail?.isOptimisticPersonalDetail) : [];


Nice I like that.

NAB: We could remove the variable havingLoginPersonalDetails since its unnecessary.

OSBotify · 2024-06-05T00:23:34Z

✋ 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 · 2024-06-11T23:31:43Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

Hiden contact option if we don't include P2P option

000ebb3

nkdengineer marked this pull request as ready for review May 14, 2024 09:45

nkdengineer requested a review from a team as a code owner May 14, 2024 09:45

melvin-bot bot requested review from getusha and removed request for a team May 14, 2024 09:45

nkdengineer mentioned this pull request May 14, 2024

[Awaiting checklist] [$250] Distance Request -"Distance" option does not appear in QAB for a gmail account #40790

Closed

6 tasks

getusha reviewed May 19, 2024

View reviewed changes

nkdengineer added 4 commits May 20, 2024 10:19

Merge branch 'main' into fix/40790

995ade0

remove includePersonalDetails

b583557

fix ts

096c212

fix jest test

0ff20ca

getusha reviewed May 21, 2024

View reviewed changes

remove unnecessary condition

ecf8458

Merge branch 'main' into fix/40790

f213328

getusha approved these changes Jun 4, 2024

View reviewed changes

melvin-bot bot requested a review from neil-marcellini June 4, 2024 06:05

neil-marcellini approved these changes Jun 5, 2024

View reviewed changes

neil-marcellini merged commit 4780624 into Expensify:main Jun 5, 2024
17 checks passed

github-actions bot mentioned this pull request Jun 6, 2024

Deploy Checklist: New Expensify 2024-06-06 #43168

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hide contact option if we don't include P2P option #42142

Hide contact option if we don't include P2P option #42142

nkdengineer commented May 14, 2024

melvin-bot bot commented May 14, 2024

getusha commented May 19, 2024 •

edited

Loading

getusha May 19, 2024

nkdengineer May 21, 2024

neil-marcellini Jun 5, 2024

getusha May 21, 2024

nkdengineer May 22, 2024

getusha May 22, 2024

nkdengineer May 23, 2024

getusha May 24, 2024 •

edited

Loading

nkdengineer May 27, 2024

getusha May 27, 2024

getusha commented May 29, 2024

nkdengineer commented May 30, 2024

nkdengineer commented Jun 4, 2024

getusha left a comment

neil-marcellini left a comment

neil-marcellini Jun 5, 2024

OSBotify commented Jun 5, 2024

OSBotify commented Jun 11, 2024

Hide contact option if we don't include P2P option #42142

Hide contact option if we don't include P2P option #42142

Conversation

nkdengineer commented May 14, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 14, 2024

getusha commented May 19, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

getusha May 24, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

getusha commented May 29, 2024

nkdengineer commented May 30, 2024

nkdengineer commented Jun 4, 2024

getusha left a comment

Choose a reason for hiding this comment

neil-marcellini left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OSBotify commented Jun 5, 2024

OSBotify commented Jun 11, 2024

getusha commented May 19, 2024 •

edited

Loading

getusha May 24, 2024 •

edited

Loading