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.

Sign up for GitHub

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

Jump to bottom

Introduce "Mark as unread" functionality in Expensify.cash #2433

Merged

marcaaron merged 23 commits into main from alberto-markAsUnread

May 5, 2021

Contributor

Gonals commented Apr 16, 2021 •

edited

Loading

@tgolen @marcaaron @roryabraham, this is the new PR!

Fixed Issues

Fixes https://github.com/Expensify/Expensify/issues/147475

Tests

Log into e.cash and open a conversation with existing messages
On the hover menu of one of the messages, select "mark as unread":

3. The `new` marker should show up over that message and the chat in the LHN should become bolded:

Switch chats. It should remain bolded
Switch back to the original chat. The new marker should be correctly in place and the chat in the LHN should unbold instantly. The new marker should remain in place after that.
Switch out and back in. the marker should be gone.
Do some regression testing to make sure the new marker shows correctly for actual new messages
Test marking a message as unread and receiving new messages afterwards. The new marker should remain in the correct message.
Test marking a message as unread, leaving the chat, and then receiving new messages afterwards. The new marker should remain in the marked message.

Tested On

Testing on mobile soon (I pretty much destroyed my repository, so it is being a pain to get it to work in mobile again)!

Screenshots

Desktop

iOS

Android

Gonals added 4 commits

April 16, 2021 12:11


          allow marking messages as unread

31a2ff6


          update the marker when neeeded

b6b9c4e


          saving testing stuff

e3c61ac


          cleanup

736eddd

Gonals requested a review from a team as a code owner

April 16, 2021 13:25

Gonals requested a review from marcaaron

April 16, 2021 13:25

MelvinBot requested review from nkuoch and removed request for a team

April 16, 2021 13:25

Gonals commented

View reviewed changes

src/libs/actions/Report.js Outdated Show resolved Hide resolved

Gonals commented

View reviewed changes

src/pages/home/report/ReportActionContextMenu.js Show resolved Hide resolved

Gonals commented

View reviewed changes

src/pages/home/report/ReportActionsView.js Show resolved Hide resolved

Gonals self-assigned this

Gonals changed the title ~~[WIP] Introduce "Mark as unread" functionality in Expensify.cash~~ Introduce "Mark as unread" functionality in Expensify.cash

Gonals added 3 commits

April 20, 2021 12:44


          Merge branch 'main' into alberto-markAsUnread

662065b


          move new marker to report

913f73e


          add onyx calls

ff73887

Gonals changed the title ~~Introduce "Mark as unread" functionality in Expensify.cash~~ [WIP] Introduce "Mark as unread" functionality in Expensify.cash


          cleanup

Gonals changed the title ~~[WIP] Introduce "Mark as unread" functionality in Expensify.cash~~ Introduce "Mark as unread" functionality in Expensify.cash

Gonals mentioned this pull request

[HOLD] [WIP] Introduce "Mark as unread" functionality in Expensify.cash #1774

Closed

5 tasks

Gonals requested review from tgolen and roryabraham and removed request for nkuoch

April 20, 2021 14:35

roryabraham requested changes

View reviewed changes

src/libs/actions/Report.js Outdated Show resolved Hide resolved

src/pages/home/report/ReportActionContextMenu.js Outdated Show resolved Hide resolved

src/pages/home/report/ReportActionsView.js Outdated Show resolved Hide resolved

src/pages/home/report/ReportActionContextMenu.js Outdated Show resolved Hide resolved

tgolen requested changes

View reviewed changes

src/pages/home/report/ReportActionContextMenu.js Show resolved Hide resolved

src/pages/home/report/ReportActionContextMenu.js

+                              // `ReportActionContextMenuItem` with `successText` and `successIcon` which will fallback to
+                              // the `text` and `icon`
+                              onPress: () => {
+                                  const message = _.last(lodashGet(this.props.reportAction, 'message', null));

Contributor

tgolen Apr 20, 2021

I feel like this should be a class method so that it prevents this constructor from turning into a monolithic block of logic and functions.

Contributor Author

Gonals Apr 21, 2021

I see this is being discussed in the delete comments PR, so I'll wait for the resolution over there

src/pages/home/report/ReportActionContextMenu.js Show resolved Hide resolved

src/pages/home/report/ReportActionContextMenu.js Outdated Show resolved Hide resolved

src/pages/home/report/ReportActionContextMenu.js Outdated Show resolved Hide resolved

src/pages/home/report/ReportActionContextMenu.js Outdated Show resolved Hide resolved

src/pages/home/report/ReportActionContextMenu.js Show resolved Hide resolved

src/pages/home/report/ReportActionsView.js Outdated Show resolved Hide resolved

src/libs/actions/Report.js Outdated Show resolved Hide resolved

marcaaron requested changes

View reviewed changes

src/libs/actions/Report.js Outdated Show resolved Hide resolved

src/libs/actions/Report.js Outdated Show resolved Hide resolved

src/libs/actions/Report.js Outdated Show resolved Hide resolved

src/libs/actions/Report.js Outdated Show resolved Hide resolved

src/libs/actions/Report.js Outdated Show resolved Hide resolved

src/libs/actions/Report.js Show resolved Hide resolved

src/libs/actions/Report.js Outdated Show resolved Hide resolved

Gonals added 2 commits

April 21, 2021 14:52


          remove onMarkUnread fonction and view calls to onyx

a1b57a3


          lint

Contributor Author

Gonals commented Apr 21, 2021

Comments addressed!

marcaaron reviewed

View reviewed changes

src/pages/home/report/ReportActionsView.js Outdated Show resolved Hide resolved

Contributor Author

Gonals commented May 3, 2021

All addressed!

tgolen previously approved these changes

View reviewed changes

Contributor

tgolen left a comment

I think this looks much better and the comments do a good job of explaining the +/- 1s that are left.

marcaaron previously approved these changes

View reviewed changes

Contributor

marcaaron left a comment

Yes changes are looking much better to me thanks @Gonals !!

Contributor Author

Gonals commented May 4, 2021

All yours, @roryabraham

Contributor

marcaaron commented May 4, 2021

Forgot to mention that I came across this in testing. I'm not sure if it's a blocker but if a chat has an unreadActionCount of 0 unread we can see the unread marker above the very first chat message

Also, we should update the test steps to remove the part about waiting for 3 seconds since the change looks to happen instantly now and QA will ask if it's expected or not.

Gonals added 3 commits

May 5, 2021 09:21


          Merge branch 'main' into alberto-markAsUnread

db16757


          Do not display the marker at the top of the report

b098d1c


          add comment

97869a4

Gonals dismissed stale reviews from marcaaron and tgolen via

97869a4

May 5, 2021 08:23

Contributor Author

Gonals commented May 5, 2021

Forgot to mention that I came across this in testing. I'm not sure if it's a blocker but if a chat has an unreadActionCount of 0 unread we can see the unread marker above the very first chat message

Also, we should update the test steps to remove the part about waiting for 3 seconds since the change looks to happen instantly now and QA will ask if it's expected or not.

Ah! Nice catch! Fixed

Contributor Author

Gonals commented May 5, 2021

Made a small fix, so this needs re-approval @marcaaron, @tgolen, @roryabraham

Thanks!

Gonals mentioned this pull request

Mark all actions as read immediately after the chat becomes active/visible #2699

Merged

5 tasks

tgolen previously approved these changes

View reviewed changes

marcaaron requested changes

View reviewed changes

src/pages/home/report/ReportActionsView.js Outdated

+                      // first unread sequence. If there are no unread actions, there's no need to display it.
+                      if (lastReadSequenceNumber > 0) {
+                          setNewMarkerPosition(this.props.reportID, lastReadSequenceNumber + 1);
+                      }

Contributor

marcaaron May 5, 2021

If there are no unread actions, there's no need to display it.

So should we set it to 0 instead of 0 + 1 ?

This change didn't resolve the issue I was seeing.

Contributor Author

Gonals May 5, 2021

You are completely right. Should be fixed now. I moved the +1 upwards so we only add it when != 0


          Only add +1 when needed

0f4c6c8

Gonals dismissed tgolen’s stale review via

0f4c6c8

May 5, 2021 17:01

Contributor Author

Gonals commented May 5, 2021

All comments addressed again!

marcaaron approved these changes

View reviewed changes

roryabraham approved these changes

View reviewed changes

Contributor

roryabraham left a comment

This is looking great!

marcaaron merged commit 5a04fa0 into main

marcaaron deleted the alberto-markAsUnread branch

May 5, 2021 17:28

Contributor Author

Gonals commented May 5, 2021

It... merged 😮 ✨

Contributor

marcaaron commented May 5, 2021

WE 👏 DID 👏 IT 👏

Contributor Author

Gonals commented May 5, 2021

I'm going to cry 🤣

OSBotify mentioned this pull request

Deploy Checklist: Expensify.cash 2021-04-29 #2639

Closed

23 tasks

Contributor

tgolen commented May 5, 2021

Wait, I'm confused about the +1. Can we revert this?

Contributor

tgolen commented May 5, 2021

j/k

Contributor

OSBotify commented May 5, 2021

🚀 Deployed to staging in version: 1.0.37-2🚀

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

Contributor

OSBotify commented May 8, 2021

🚀 Deployed to production in version: 1.0.39-5🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet