Remain draft comment when switching to current chat #41338

nkdengineer · 2024-04-30T14:39:12Z

Details

Remain draft comment when switching to current chat

Fixed Issues

$ #38983
PROPOSAL: #38983 (comment)

Tests

Go to FAB > Start chat
Enter a new user and create chat
Logout and login again
Force offline
Go to FAB > Start chat and enter the user that we created chat above
Enter any text in composer
Go online
Verify that when we switch the current chat, the draft is remained in the current chat

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Go to FAB > Start chat
Enter a new user and create chat
Logout and login again
Force offline
Go to FAB > Start chat and enter the user that we created chat above
Enter any text in composer
Go online
Verify that when we switch the current chat, the draft is remained in the current chat

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-04-30.at.21.02.47.mov

Android: mWeb Chrome

Screen.Recording.2024-04-30.at.21.16.12.mov

iOS: Native

Screen.Recording.2024-04-30.at.21.31.02.mov

iOS: mWeb Safari

Screen.Recording.2024-04-30.at.21.18.47.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-30.at.21.00.52.mov

MacOS: Desktop

Screen.Recording.2024-04-30.at.21.33.38.mov

melvin-bot · 2024-04-30T14:39:31Z

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

Santhosh-Sellavel · 2024-05-01T19:27:58Z

@nkdengineer 17 commits is too much here can we clean that up by making only the final changes in a single commit. Also there's a typo in method naming Callack is used instead of Callback

nkdengineer · 2024-05-02T08:31:19Z

@Santhosh-Sellavel Updated to merge all commits and fix the typo bug.

Santhosh-Sellavel · 2024-05-03T21:18:47Z

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-05-05.at.2.53.15.PM.mov

Android: mWeb Chrome

mwebDraft.mov

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-05-04.at.2.41.01.AM.mov

MacOS: Desktop

Screen.Recording.2024-05-04.at.2.45.25.AM.mov

Note: Unable to capture the exact steps as screen record for iOS platform tests in simulator. So skipped recording.

Santhosh-Sellavel

Also, Resolve conflicts

Santhosh-Sellavel · 2024-05-03T21:27:43Z

src/libs/actions/Report.ts

    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`, prepareDraftComment(comment));
 }

+function saveReportDraftCommentWithCallback(reportID: string, comment: string | null, callback: () => void) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`, prepareDraftComment(comment)).then(callback);
+}
+


Do we need a separate method for callback alone?

Can we add the callback to existing method and by default callback param empty if not passed?

@Santhosh-Sellavel I updated.

Santhosh-Sellavel

LGTM, tests well!

A Small NAB

Santhosh-Sellavel · 2024-05-05T10:31:04Z

src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx

@@ -344,6 +344,20 @@ function ComposerWithSuggestions(
        [],
    );

+    useEffect(() => {
+        const switchToCurrentReport = DeviceEventEmitter.addListener(`switchToCurrentReport_${reportID}`, ({preexistingReportID, callback}) => {


NAB switchToCurrentReport_ can be switchToPreExistingReport_ . Because that's what the event it is right?

Make sense.

Santhosh-Sellavel

LGTM, thanks!

OSBotify · 2024-05-07T15:52:44Z

✋ 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-05-09T02:37:31Z

🚀 Deployed to staging by https://github.com/bondydaa in version: 1.4.72-0 🚀

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

OSBotify · 2024-05-13T08:20:43Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.72-1 🚀

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

aimane-chnaif · 2024-07-01T13:45:25Z

src/libs/actions/Report.ts

@@ -1246,13 +1246,17 @@ function handleReportChanged(report: OnyxEntry<Report>) {
    // In this case, the API will let us know by returning a preexistingReportID.
    // We should clear out the optimistically created report and re-route the user to the preexisting report.
    if (report?.reportID && report.preexistingReportID) {
-        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, null);


This line removal caused regression.
We added back in #43633.

add solution

9321b99

nkdengineer marked this pull request as ready for review April 30, 2024 14:39

nkdengineer requested a review from a team as a code owner April 30, 2024 14:39

melvin-bot bot requested review from Santhosh-Sellavel and removed request for a team April 30, 2024 14:39

nkdengineer mentioned this pull request Apr 30, 2024

[HOLD for payment 2024-05-20] CRITICAL: [$500] When opening a new DM to an existing user, draft message is lost #38983

Closed

nkdengineer added 2 commits May 2, 2024 15:23

Merge branch 'main' into fix/38983

fe52e3c

Add final solution

ec0c3df

nkdengineer force-pushed the fix/38983 branch from 9aa0b98 to ec0c3df Compare May 2, 2024 08:30

Santhosh-Sellavel suggested changes May 3, 2024

View reviewed changes

merge main

e81bef2

Santhosh-Sellavel approved these changes May 5, 2024

View reviewed changes

melvin-bot bot requested a review from bondydaa May 5, 2024 10:31

nkdengineer added 2 commits May 6, 2024 16:16

Merge branch 'main' into fix/38983

53cbf06

rename event

fc7df47

Santhosh-Sellavel approved these changes May 6, 2024

View reviewed changes

bondydaa approved these changes May 7, 2024

View reviewed changes

bondydaa merged commit 55e146a into Expensify:main May 7, 2024
17 checks passed

github-actions bot mentioned this pull request May 9, 2024

Deploy Checklist: New Expensify 2024-05-09 #41874

Closed

37 tasks

bernhardoj mentioned this pull request May 28, 2024

[HOLD for payment 2024-06-28] [$250] Search - Top result shows admin's email address #42692

Closed

6 tasks

aimane-chnaif reviewed Jul 1, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remain draft comment when switching to current chat #41338

Remain draft comment when switching to current chat #41338

nkdengineer commented Apr 30, 2024

melvin-bot bot commented Apr 30, 2024

Santhosh-Sellavel commented May 1, 2024

nkdengineer commented May 2, 2024

Santhosh-Sellavel commented May 3, 2024 •

edited

Loading

Santhosh-Sellavel left a comment

Santhosh-Sellavel May 3, 2024

nkdengineer May 4, 2024

Santhosh-Sellavel left a comment

Santhosh-Sellavel May 5, 2024

nkdengineer May 6, 2024

nkdengineer May 6, 2024

Santhosh-Sellavel left a comment

OSBotify commented May 7, 2024

OSBotify commented May 9, 2024

OSBotify commented May 13, 2024

aimane-chnaif Jul 1, 2024

Remain draft comment when switching to current chat #41338

Remain draft comment when switching to current chat #41338

Conversation

nkdengineer commented Apr 30, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 30, 2024

Santhosh-Sellavel commented May 1, 2024

nkdengineer commented May 2, 2024

Santhosh-Sellavel commented May 3, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

Santhosh-Sellavel May 3, 2024

Choose a reason for hiding this comment

nkdengineer May 4, 2024

Choose a reason for hiding this comment

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

Santhosh-Sellavel May 5, 2024

Choose a reason for hiding this comment

nkdengineer May 6, 2024

Choose a reason for hiding this comment

nkdengineer May 6, 2024

Choose a reason for hiding this comment

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

OSBotify commented May 7, 2024

OSBotify commented May 9, 2024

OSBotify commented May 13, 2024

aimane-chnaif Jul 1, 2024

Choose a reason for hiding this comment

Santhosh-Sellavel commented May 3, 2024 •

edited

Loading