-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Fix: (Redo) Copying the messages and marking a message in between as unread generates 'new' in the text #18684
Fix: (Redo) Copying the messages and marking a message in between as unread generates 'new' in the text #18684
Conversation
@Beamanator @fedirjh One of you needs to 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] |
cc @Victor-Nyagudi you need to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Test good , left some suggestions
Reviewer Checklist
Screenshots/VideosWebScreen.Recording.2023-05-10.at.1.53.37.AM.movDesktopScreen.Recording.2023-05-10.at.1.52.27.AM.mov |
This was suggested by fedirjh. Thank you,
I've merged this PR with I also ran Let me know if you need anything else. cc: @Beamanator @fedirjh |
Umm @Victor-Nyagudi this looks very scary, can you make sure your branch is up to date with ![]() Also looks like there's another conflict |
@Beamanator At the time of posting my comment, my branch was up to date with I figured this is what would happen since running I see there are currently some commits already as we speak, so I'll pull those. |
The only changes I can see from my side that I believe caused the conflict is in Thanks for pointing that out. I'll pull from |
Here's what I've done so far to give you some context on how I arrived here.
Did I do something wrong in between? I'd love to hear some feedback before proceeding any further. |
@Victor-Nyagudi I believe you shouldn't do this :
Could you please revert theses changes ? Here is a helpful guide: https://www.atlassian.com/git/tutorials/merging-vs-rebasing |
This reverts commit e9a38a0.
Wow. I've learned so much about Git in the past hour or so. Thank you, @fedirjh. I've reverted the change. What could be causing the merge conflict, though? It wasn't there on my last PR. |
@Victor-Nyagudi I am happy that helped you.
Could you please try to pull main again ? |
Sure, @fedirjh. Just to be clear, here are the steps I'm going to perform.
Does all this sound good?
Based on what you said here, I shouldn't push these changes to this PR's branch i.e. |
By the way, @fedirjh and @Beamanator, I'm truly sorry for these hiccups we're experiencing. I take blame for them, and I've set aside the next 3 or so uninterrupted hours (more if needed) to work together with you guys to get this PR merged. I understand you two are busy with reviewing proposals and other internal stuff, so I'd like to get things across the line to free you up to focus on more pressing issues. If you're not as free during this time, it's absolutely fine. I just want you know that this PR is now my top priority, and I'll be responding in a more timely manner. |
@Victor-Nyagudi As I see , your branch is still behind the main 170 commits behind Expensify:main. Try to rebase your branch on top of main and then push ![]() |
I was going to I'm more confident doing so after reading what you just shared. Please stand by. |
@fedirjh There are still conflicts with some other files such as These are files I didn't touch but I believe were modified by Expensify's engineers/other contributors. |
I'm currently discussing this with the person who announced the Prettier PR merge in Slack. Here's the link if you want to follow the conversation, @fedirjh. |
As of this comment, my branch is up to date with Over to you, @Beamanator and @fedirjh. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Victor-Nyagudi thanks so much for all your work getting this PR on track, with all the changes merged & everything 🙏
And sorry but I have one question, can we quickly discuss before we move forward with this solution?
Over to you gentlemen, @Beamanator & @fedirjh. LGTM (I'm going to take a wild guess this acronym stands for "Let's Get This Merged") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🚀
Suggested by fedirjh. Thanks for catching that. Co-authored-by: Fedi Rajhi <[email protected]>
There was a problem hiding this 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 , Over to you @Beamanator
correct @Victor-Nyagudi ! 💪 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great,
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great,
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by https://github.com/Beamanator in version: 1.3.14-0 🚀
|
on step 5 when I copy messages the appeared after past with emoji reaction. Is it OK? 18684.Desktop.mp4 |
@mvtglobally That's a separate issue being handled here #18343 , it’s reproducible on production as well, It happens when you select text from bottom to top , check out explanation here #18343 (comment) Screen.Recording.2023-05-16.at.11.48.11.PM.mov |
🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.14-14 🚀
|
Details
This is a redo of my original pull request that caused a regression but was reverted as soon as it was discovered.
This time, I've added the
styles.userSelectNone
style toUnreadActionIndicator
so users are visually aware it's not copied to the clipboard and then removed this element alone from the copied contents insideSelectionScraper
.We agreed this is the best way forward considering there's still much to do in handling all issues of copying and pasting in addition to another copying bug found in browsers.
It's worth noting there's another currently open issue where copying messages with one unread message in between generates
<_a Icon>
in the text, however, this is still happening in staging even after my PR was reverted, so I suspect another PR may have caused it - not sure which one, though.That being said, I didn't see this behavior in my current PR, so this PR might address that too.
Fixed Issues
$ #17838
$ #18228 (comment)
Tests
New
that's to the right of the green line is not highlightedNew
is not part of pasted contentread
Preferences
and thenLanguage
. Change the language to Spanish.Offline tests
Same as above but go offline after logging in i.e. step 1 (or force offline in staging).
QA Steps
Same as Tests.
Additional steps
4.5
.New
text is not highlighted nor pasted in composer.+
sign in the composer and chooseRequest Money
.Send Money
option. The green button at the bottom will have different text e.g.I'll settle up elsewhere
, but that's fine.Request Money
chat, mark the deleted chat as unread, and then do steps 2 & 3.+
sign in the composer and selectAdd attachment
.New
word to the right of the green line (if you can) and perform steps 2 & 3.PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodWaiting for Copy
label for a copy review on the original GH to get the correct copy.STYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Web
Chrome Spanish

Chrome English

Safari Spanish

Safari English

Mobile Web - Chrome
Mobile Web - Safari
Desktop
English

Spanish

iOS
Android