Skip to content

[No QA] Revert #90915, #91750 and #90365 (composer refactor + enable-notifications banner)#92134

Closed
mountiny wants to merge 3 commits into
mainfrom
vit-revert91750
Closed

[No QA] Revert #90915, #91750 and #90365 (composer refactor + enable-notifications banner)#92134
mountiny wants to merge 3 commits into
mainfrom
vit-revert91750

Conversation

@mountiny
Copy link
Copy Markdown
Contributor

@mountiny mountiny commented May 30, 2026 •
edited
Loading

Explanation of Change

This PR reverts three related changes to restore the report composer to its last-known-good state:

The revert of #90365 is the actual fix for #92038. That PR wrapped the composer in an extra <View> inside the happy-path footer. styles.chatFooterFullCompose sets height: '100%' on the outer container, but the new inner wrapper had no height/flex, so when the composer was expanded it could not fill the container and collapsed to the top. Removing the banner restores the composer as a direct child of the full-size footer container.

#90915/#91750 are reverted together so the ReportActionCompose API is fully restored to its pre-#90915 state (the ComposerSwipeable helper and the isEditOnly prop instead of the ReportActionCompose.EditOnly sub-component).

Notes on conflict resolution:

Fixed Issues

$ #92038
PROPOSAL:

Tests

  1. Open a chat report, verify the composer renders and you can send a message
  2. In the composer, enter multiline text until the expand button appears, then click the expand button
    • Verify the whole compose box expands to fill the area (it does NOT jump/collapse to the top, and the send button stays visible)
  3. In an "Admins only" room as a non-admin, edit a sent message on a narrow screen and verify the edit composer mounts above the banner
  • Verify that no errors appear in the JS console

Offline tests

Same as tests.

QA Steps

Same as tests.

  • 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

mountiny added 2 commits May 30, 2026 09:48
@mountiny
Revert "Merge pull request #91750 from Expensify/cmartins-fixCrashOnM…
2dd1ec3 
…ain"

This reverts commit b6572e3, reversing
changes made to 9573a6c.
@mountiny
Revert "Merge pull request #90915 from margelo/@chrispader/refactor/c…
5b499cf 
…ompositional-edit-only-report-action-compose"

This reverts commit 6a3c808, reversing
changes made to e09715e.
@mountiny mountiny requested review from a team as code owners May 30, 2026 08:15
@melvin-bot melvin-bot Bot requested review from Beamanator and heyjennahay and removed request for a team May 30, 2026 08:15
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 30, 2026

@Beamanator 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]

@melvin-bot melvin-bot Bot removed the request for review from a team May 30, 2026 08:15
mountiny
mountiny commented May 30, 2026
View reviewed changes
Comment thread src/pages/inbox/report/ReportFooter.tsx Outdated
<SwipeableView onSwipeDown={Keyboard.dismiss}>
<ReportActionCompose reportID={reportIDFromRoute} />
</SwipeableView>
<ComposerSwipeable reportID={reportIDFromRoute} />
Copy link
Copy Markdown
Contributor Author

@mountiny mountiny May 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is where the conflict was

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 30, 2026

🚧 @mountiny has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 30, 2026

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #92134.

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5b499cf9837-9c3a9db-e59282b3654baecb4c5d5afee5d97043b01b0d4a/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5b499cf-9c3a9db-8988975917cf0a879b7e5cea0870b61731956cd0/index.html
Android iOS
Web 🕸️
https://92134.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@mountiny
Revert "Merge pull request #90365 from Expensify/jpersaud/concierge-e…
545befe 
…nable-notifications-banner"

This reverts commit 021bcf3, reversing
changes made to e2ca830.
@mountiny
Copy link
Copy Markdown
Contributor Author

mountiny commented May 30, 2026

This was misleading, these PRs are not causing the blocker it was #90365

@mountiny mountiny closed this May 30, 2026
@mountiny mountiny changed the title [No QA] Revert #90915 and #91750 (compositional ReportActionCompose refactor) [No QA] Revert #90915, #91750 and #90365 (composer refactor + enable-notifications banner) May 30, 2026
@oqildev oqildev mentioned this pull request Jun 1, 2026
Open
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@heyjennahay heyjennahay Awaiting requested review from heyjennahay

@Beamanator Beamanator Awaiting requested review from Beamanator

Assignees

@MelvinBot MelvinBot

@mountiny mountiny

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mountiny @MelvinBot