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.

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

Refactor code to improve unread marker logic #18637

Merged
merged 56 commits into from
Aug 17, 2023
Merged

Refactor code to improve unread marker logic #18637

merged 56 commits into from
Aug 17, 2023

Commits on May 7, 2023

  1. Pass client's lastReadTime to server

    @MonilBhavsar
    MonilBhavsar committed May 7, 2023
    Configuration menu
    Copy the full SHA
    1c98457 View commit details
    Browse the repository at this point in the history

  2. Listen for new messages

    @MonilBhavsar
    MonilBhavsar committed May 7, 2023
    Configuration menu
    Copy the full SHA
    5189784 View commit details
    Browse the repository at this point in the history

  3. Mark comments as read

    @MonilBhavsar
    MonilBhavsar committed May 7, 2023
    Configuration menu
    Copy the full SHA
    8895b61 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. Add and update logic to set new marker

    @MonilBhavsar
    MonilBhavsar committed May 8, 2023
    Configuration menu
    Copy the full SHA
    7f13144 View commit details
    Browse the repository at this point in the history

  2. Update more logic and fix active chat case

    @MonilBhavsar
    MonilBhavsar committed May 8, 2023
    Configuration menu
    Copy the full SHA
    87ef4b3 View commit details
    Browse the repository at this point in the history

  3. Pass correct report actions

    @MonilBhavsar
    MonilBhavsar committed May 8, 2023
    Configuration menu
    Copy the full SHA
    3ce360e View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. if reportActions exist, use onyx local data to render the messages

    @gedu
    gedu committed May 9, 2023
    Configuration menu
    Copy the full SHA
    3931f71 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. Merge branch 'main' into monil-fixNewMarkerLine

    @MonilBhavsar
    MonilBhavsar committed May 10, 2023
    Configuration menu
    Copy the full SHA
    05cc1be View commit details
    Browse the repository at this point in the history

  2. Don't set lastReadTime optimistically

    @MonilBhavsar
    MonilBhavsar committed May 10, 2023
    Configuration menu
    Copy the full SHA
    f39a674 View commit details
    Browse the repository at this point in the history

  3. handling the unread line on report list

    @gedu
    gedu committed May 10, 2023
    Configuration menu
    Copy the full SHA
    9a7ef68 View commit details
    Browse the repository at this point in the history

  4. using the reportsActions from onyx

    @gedu
    gedu committed May 10, 2023
    Configuration menu
    Copy the full SHA
    e022a7a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into monil-fixNewMarkerLine 

    # Conflicts:
#	src/libs/actions/Report.js
#	src/pages/home/report/ReportActionsList.js
    @gedu
    gedu committed May 10, 2023
    Configuration menu
    Copy the full SHA
    9132bc2 View commit details
    Browse the repository at this point in the history

  6. style updated

    @gedu
    gedu committed May 10, 2023
    Configuration menu
    Copy the full SHA
    a79ac80 View commit details
    Browse the repository at this point in the history

  7. Some more updates to logic to fix 2 1:1 and switch cases

    @MonilBhavsar
    MonilBhavsar committed May 10, 2023
    Configuration menu
    Copy the full SHA
    15377c7 View commit details
    Browse the repository at this point in the history

  8. Attempt to fix unread marker logic

    @MonilBhavsar
    MonilBhavsar committed May 10, 2023
    Configuration menu
    Copy the full SHA
    279e1a2 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Merge branch 'monil-fixNewMarkerLine' of https://github.com/Expensify… 

    …/App into monil-fixNewMarkerLine

# Conflicts:
#	src/libs/actions/Report.js
    @gedu
    gedu committed May 11, 2023
    Configuration menu
    Copy the full SHA
    bc15e03 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Clean up, and handling unread cases

    @gedu
    gedu committed May 15, 2023
    Configuration menu
    Copy the full SHA
    0843bae View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Merge branch 'main' into monil-fixNewMarkerLine

    @MonilBhavsar
    MonilBhavsar authored May 17, 2023
    Configuration menu
    Copy the full SHA
    e8712d5 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Revert to another approach

    @MonilBhavsar
    MonilBhavsar committed May 19, 2023
    Configuration menu
    Copy the full SHA
    1d899ca View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into monil-fixNewMarkerLine

    @MonilBhavsar
    MonilBhavsar committed May 19, 2023
    Configuration menu
    Copy the full SHA
    52cf638 View commit details
    Browse the repository at this point in the history

  3. Updated marking report as read

    @gedu
    gedu committed May 19, 2023
    Configuration menu
    Copy the full SHA
    41602a4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'monil-fixNewMarkerLine' of github.com:gedu/App into mon… 

    …il-fixNewMarkerLine

# Conflicts:
#	src/libs/actions/Report.js
    @gedu
    gedu committed May 19, 2023
    Configuration menu
    Copy the full SHA
    eea32eb View commit details
    Browse the repository at this point in the history

  5. Fix openReport call

    @MonilBhavsar
    MonilBhavsar committed May 19, 2023
    Configuration menu
    Copy the full SHA
    1cf3101 View commit details
    Browse the repository at this point in the history

  6. Add hook to track active chat

    @MonilBhavsar
    MonilBhavsar committed May 19, 2023
    Configuration menu
    Copy the full SHA
    009063d View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Donot render marker when active on chat

    @MonilBhavsar
    MonilBhavsar committed May 22, 2023
    Configuration menu
    Copy the full SHA
    347538c View commit details
    Browse the repository at this point in the history

  2. Donot render marker line for sender

    @MonilBhavsar
    MonilBhavsar committed May 22, 2023
    Configuration menu
    Copy the full SHA
    9c286f7 View commit details
    Browse the repository at this point in the history

  3. updated to handle marking message as unread

    @gedu
    gedu committed May 22, 2023
    Configuration menu
    Copy the full SHA
    685467e View commit details
    Browse the repository at this point in the history

  4. updated FAB button and handle when the user scroll up unread

    @gedu
    gedu committed May 22, 2023
    Configuration menu
    Copy the full SHA
    1775100 View commit details
    Browse the repository at this point in the history

  5. Pass lastReadTime to server when marking message as read

    @MonilBhavsar
    MonilBhavsar committed May 22, 2023
    Configuration menu
    Copy the full SHA
    287771e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'monil-fixNewMarkerLine' of github.com:gedu/App into mon… 

    …il-geduFixNewMarkerLine
    @MonilBhavsar
    MonilBhavsar committed May 22, 2023
    Configuration menu
    Copy the full SHA
    cc49a2d View commit details
    Browse the repository at this point in the history

  7. Marking read message after skipped by scroll

    @gedu
    gedu committed May 22, 2023
    Configuration menu
    Copy the full SHA
    04ab84f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'monil-fixNewMarkerLine' of github.com:gedu/App into mon… 

    …il-fixNewMarkerLine
    @gedu
    gedu committed May 22, 2023
    Configuration menu
    Copy the full SHA
    f5cfa42 View commit details
    Browse the repository at this point in the history

  9. small clean up

    @gedu
    gedu committed May 22, 2023
    Configuration menu
    Copy the full SHA
    0bb23c5 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Merge branch 'main' into monil-geduFixNewMarkerLine

    @MonilBhavsar
    MonilBhavsar committed May 31, 2023
    Configuration menu
    Copy the full SHA
    fc555c4 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Merge branch 'main' into monil-fixNewMarkerLine 

    # Conflicts:
#	src/libs/actions/Report.js
#	src/pages/home/report/ReportActionsList.js
#	src/pages/home/report/ReportActionsView.js
    @gedu
    gedu committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    a5aebac View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Merge branch 'main' into monil-fixNewMarkerLine 

    # Conflicts:
#	src/pages/home/report/ReportActionsList.js
#	src/pages/home/report/ReportActionsView.js
    @gedu
    gedu committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    eff076f View commit details
    Browse the repository at this point in the history

  2. clean up

    @gedu
    gedu committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    7afcf3c View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Merge branch 'main' into monil-fixNewMarkerLine 

    # Conflicts:
#	src/pages/home/report/ReportActionsList.js
#	src/pages/home/report/ReportActionsView.js
    @gedu
    gedu committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    b9da5e2 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Return early if user is inactive on chat

    @MonilBhavsar
    MonilBhavsar committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    4cb33db View commit details
    Browse the repository at this point in the history

  2. Remove unecessary code

    @MonilBhavsar
    MonilBhavsar committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    668209e View commit details
    Browse the repository at this point in the history

  3. Don't set floating button if marker is null

    @MonilBhavsar
    MonilBhavsar committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    cbb485a View commit details
    Browse the repository at this point in the history

  4. Fixed tests

    @gedu
    gedu committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    1026e4e View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Use accountID and pass correct param

    @MonilBhavsar
    MonilBhavsar committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    0a5b0d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'monil-fixNewMarkerLine' of github.com:gedu/App into mon… 

    …il-geduFixNewMarkerLine
    @MonilBhavsar
    MonilBhavsar committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    78ec995 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. cleaning the userActiveSince value

    @gedu
    gedu committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    619d754 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. fixed comments

    @gedu
    gedu committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    6e248ab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into monil-fixNewMarkerLine 

    # Conflicts:
#	src/pages/home/report/ReportActionsList.js
    @gedu
    gedu committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    36c762b View commit details
    Browse the repository at this point in the history

  3. removed unused var

    @gedu
    gedu committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    d6ebe9e View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. fixed comments

    @gedu
    gedu committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    c86812a View commit details
    Browse the repository at this point in the history

  2. clean ups

    @gedu
    gedu committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    f16ed18 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Merge branch 'main' into monil-fixNewMarkerLine 

    # Conflicts:
#	src/pages/home/report/ReportActionsList.js
    @gedu
    gedu committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    9c84668 View commit details
    Browse the repository at this point in the history

  2. fixed marking unread twice in a row

    @gedu
    gedu committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    827612c View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Merge branch 'main' into monil-fixNewMarkerLine

    @gedu
    gedu committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    a2da574 View commit details
    Browse the repository at this point in the history

  2. removed console logs

    @gedu
    gedu committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    7388fbf View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Merge branch 'main' into monil-geduFixNewMarkerLine

    @MonilBhavsar
    MonilBhavsar committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    f6bd06a View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @MonilBhavsar
    MonilBhavsar committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    5d3edd4 View commit details
    Browse the repository at this point in the history