Skip to content

Revert "Merge pull request #90072 from margelo/@chrispader/open-reports-at-last-unread-action-v2"#91949

Draft
aimane-chnaif wants to merge 1 commit into
Expensify:mainfrom
aimane-chnaif:revert-90072
Draft

Revert "Merge pull request #90072 from margelo/@chrispader/open-reports-at-last-unread-action-v2"#91949
aimane-chnaif wants to merge 1 commit into
Expensify:mainfrom
aimane-chnaif:revert-90072

Conversation

@aimane-chnaif
Copy link
Copy Markdown
Contributor

This reverts commit 6126043, reversing changes made to 6153ad2.

Explanation of Change

Fixed Issues

$
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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
  • 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 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 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.ts 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

…pen-reports-at-last-unread-action-v2"

This reverts commit 6126043, reversing
changes made to 6153ad2.
@aimane-chnaif
Copy link
Copy Markdown
Contributor Author

aimane-chnaif commented May 28, 2026

There were many conflicts while reverting #90072

@MelvinBot find and list all PRs (merged on main after #90072) which contributed to conflicts.

@MelvinBot
Copy link
Copy Markdown
Contributor

Here are the 23 PRs merged on main after #90072 that modified overlapping files and would cause conflicts when reverting:

PR Title Author Merged Overlapping Files
#76741 New editing mechanism for small screens Kureev May 12 MoneyRequestReportActionsList, Report/index, ReportScreen, ReportActionsList
#88487 Allow stress testing with API traffic from NewDot tgolen May 14 API/index
#89469 Onboarding: drop cohort gate marcochavezf May 21 Report/index
#89517 Refactor createTransactionThreadReport to use 1 param dukenv0307 May 12 Report/index
#89598 decompose ReportActionsList: 2 adhorodyski May 15 MoneyRequestReportActionsList, ReportActionsView
#89661 Custom report title briefly shows 'Chat Report' abbasifaizan70 May 13 Report/index
#90143 Add "Download as PDF" to Reports page apeyada May 18 Report/index
#90218 Drop FlashList hidden-render workaround VickyStash May 18 ReportActionsList, ReportActionsView, getReportActionsListInitialNumToRender (+ test)
#90317 Remove Onyx.connect() for REPORT_ACTIONS DylanDylann May 20 Report/index
#90323 [CP] Fix Invoice report loading infinitely chrispader May 12 ReportActionsView
#90513 [CP] Revert: New editing mechanism for small screens chrispader May 13 MoneyRequestReportActionsList, Report/index, ReportScreen, ReportActionsList
#90516 Allow editing messages in Composer on narrow screens V2 chrispader May 15 MoneyRequestReportActionsList, Report/index, ReportScreen, ReportActionsList
#90631 PureReportActionItem, reduce prop drilling LukasMod May 25 MoneyRequestReportActionsList, ReportActionsList
#90680 Navigate to report thread in RHP WojtekBoman May 25 Report/index
#90708 Bump eslint-config-expensify to 3.0.2 roryabraham May 14 InvertedFlashList, BaseFlatListWithScrollKey
#90912 [CP] Fix: Allow editing sent messages (Admins only) chrispader May 18 ReportActionsList
#90963 Fix partial skeleton loader after creating expense jakubstec May 20 MoneyRequestReportActionsList
#91048 decompose ReportActionsList: 3 adhorodyski May 20 ReportActionsView
#91092 Smooth Concierge draft streaming inimaga May 21 ReportActionsList
#91108 Fixed VirtualizedList crash in money request reports shubham1206agra May 25 MoneyRequestReportActionsList
#91182 Hide sensitive data from logging staszekscp May 23 API/index
#91730 [CP] Revert "Use freshly computed report totals" allgandalf May 26 Report/index
#91862 Update transaction thread alignment styling VickyStash May 27 ReportActionsList

Most conflict-heavy files:

  • src/libs/actions/Report/index.ts — touched by 10 PRs
  • src/pages/inbox/report/ReportActionsList.tsx — touched by 8 PRs
  • src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx — touched by 6 PRs
  • src/pages/inbox/report/ReportActionsView.tsx — touched by 4 PRs

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.

2 participants