Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Track expense/self dm #37165

Merged
merged 43 commits into from
Mar 2, 2024
Merged

Conversation

ishpaul777
Copy link
Contributor

@ishpaul777 ishpaul777 commented Feb 23, 2024

Details

Tasks in Scope:

  • Adding the reportName for this chat 'Your Name (you)'
  • Removing the option to 'Request/Send Money' from the chat
  • Preventing this self-dm from showing up in the participant selectors (except tasks)
  • Disabling the ability to update notification preferences
  • Removing share code / Members page
  • Determining how the details page of the self DM will look

Fixed Issues

$ #36361
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Adding the reportName for this chat 'Your Name (you)'

  • Verify in LHN the name of report is the 'originalDisplayName + (you)
  • verify in report header name of report is the 'originalDisplayName + (you)
  • verify in report details name of report is the 'originalDisplayName + (you)

Removing the option to 'Request/Send Money' from the chat

  • Verify Request/Send/Split money options are not visible in plus options in composer

Preventing this self-dm from showing up in the participant selectors (except tasks)

  • Verify self dm is only visible for task participants selector. ( it might be visible for other flows but that is only because its not a real selfDM and might in user contact list (we dont need modify any logic because in a actual self Dm will not be a user contact)(this will be better tested with actual DM)

Determining how the details page of the self DM will look.

-Verify it should looks same a 1:1 chat details page except all of the option like message/private notes/notification preference/settings/members should be hidden and their deeplinks should show not found page

Offline tests

QA Steps

  • 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: 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 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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.

Screenshots/Videos

Android: Native
Screen.Recording.2024-03-02.at.6.59.28.AM.mov
Android: mWeb Chrome
Screen.Recording.2024-03-02.at.6.46.12.AM.mov
iOS: Native
Screen.Recording.2024-03-02.at.6.30.57.AM.mov
iOS: mWeb Safari
Screen.Recording.2024-03-02.at.6.36.11.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-03-02.at.6.12.36.AM-1.mov
MacOS: Desktop
Screen.Recording.2024-03-02.at.7.03.06.AM-1.mov

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved
src/libs/ReportUtils.ts Outdated Show resolved Hide resolved
@thienlnam
Copy link
Contributor

Thanks for this PR - I did some testing with my account that has a self-DM set up. There's a couple thing I noticed

Screen.Recording.2024-02-26.at.10.08.44.AM.mov
  1. It looks like the reportName doesn't contain (you) after the name
  2. For each comment added, it seems to think there there is another participant added. We may need to also update the addComment flow
  3. Report page & Task seems to work a-okay
  4. Leave button is still in the self-DM

@shubham1206agra shubham1206agra mentioned this pull request Feb 27, 2024
49 tasks
@shubham1206agra
Copy link
Contributor

@ishpaul777 Please fix conflicts and address #37165 (comment).

@ishpaul777
Copy link
Contributor Author

ishpaul777 commented Feb 29, 2024

It looks like the reportName doesn't contain (you) after the name

fixed in 5d7a997

For each comment added, it seems to think there there is another participant added. We may need to also update the addComment flow

still have to investigate can't reproduce it with testing workaround but i am lookin into the addComment logic for better understanding

Leave button is still in the self-DM

fixed in c8ae559

@ishpaul777
Copy link
Contributor Author

@thienlnam do you mind taking a look again 🙇‍♂️

@ishpaul777
Copy link
Contributor Author

Typescript checks failing is unrelated

@@ -1460,6 +1464,7 @@ function getOptions(
const isTaskReport = ReportUtils.isTaskReport(report);
const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
const isSelfDM = ReportUtils.isSelfDM(report);
const accountIDs = report.visibleChatMemberAccountIDs ?? [];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment for reference

@ishpaul777 ishpaul777 marked this pull request as ready for review February 29, 2024 22:59
@ishpaul777 ishpaul777 requested a review from a team as a code owner February 29, 2024 22:59
@melvin-bot melvin-bot bot removed the request for review from a team February 29, 2024 22:59
Copy link
Contributor

@paultsimura paultsimura left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good and tests well.
:shipit:

@melvin-bot melvin-bot bot requested a review from techievivek March 2, 2024 00:23
@paultsimura
Copy link
Contributor

@ishpaul777 please fix lint and we'll be good to go 👍

Copy link
Contributor

@thienlnam thienlnam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀 Thank you!!

@thienlnam thienlnam merged commit cbd13ed into Expensify:main Mar 2, 2024
15 of 16 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 2024

✋ 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
Copy link
Contributor

OSBotify commented Mar 4, 2024

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.4.47-0 🚀

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

@@ -166,7 +169,7 @@ function HeaderView(props) {
),
);

const canJoinOrLeave = isChatThread || isUserCreatedPolicyRoom || canLeaveRoom;
const canJoinOrLeave = isChatThread || !isSelfDM || isUserCreatedPolicyRoom || canLeaveRoom;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this condition caused regression #37709
@ishpaul777 could you please take a look

@OSBotify
Copy link
Contributor

OSBotify commented Mar 6, 2024

🚀 Deployed to production by https://github.com/roryabraham in version: 1.4.47-10 🚀

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

@getusha
Copy link
Contributor

getusha commented Mar 29, 2024

We missed a case to update the LHN message for self DM
#38087

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants