Skip to content

Revert "Consolidate ConfirmModal instances into a global component v2"#70688

Merged
Valforte merged 1 commit intomainfrom
revert-70111-ft/single-ConfirmModal-instance
Sep 17, 2025
Merged

Revert "Consolidate ConfirmModal instances into a global component v2"#70688
Valforte merged 1 commit intomainfrom
revert-70111-ft/single-ConfirmModal-instance

Conversation

@neil-marcellini
Copy link
Contributor

@neil-marcellini neil-marcellini commented Sep 16, 2025 •
edited by Beamanator
Loading

@neil-marcellini
Copy link
Contributor Author

neil-marcellini commented Sep 16, 2025

I kicked off a build for iOS here Build and deploy apps for testing

@github-actions
Copy link
Contributor

github-actions bot commented Sep 16, 2025

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

@github-actions
Copy link
Contributor

github-actions bot commented Sep 16, 2025

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

Android 🤖 iOS 🍎
⏩ SKIPPED ⏩ https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/70688/index.html
The build for Android was skipped iOS
Desktop 💻 Web 🕸️
⏩ SKIPPED ⏩ ⏩ SKIPPED ⏩
The build for Desktop was skipped The build for Web was skipped

👀 View the workflow run that generated this build 👀

@neil-marcellini
Copy link
Contributor Author

neil-marcellini commented Sep 16, 2025

Unfortunately, this revert alone is not enough to fix the problem.

ScreenRecording_09-16-2025.14-17-28_1.MP4

@Beamanator Beamanator reopened this Sep 17, 2025
@Beamanator
Copy link
Contributor

Beamanator commented Sep 17, 2025

Looks like this revert is still needed - see https://expensify.slack.com/archives/C01GTK53T8Q/p1758123524511609. I'll update the OP with blockers the revert fixes

@Beamanator Beamanator self-assigned this Sep 17, 2025
@Beamanator Beamanator marked this pull request as ready for review September 17, 2025 15:45
@Beamanator Beamanator requested a review from a team as a code owner September 17, 2025 15:45
@melvin-bot melvin-bot bot requested a review from dangrous September 17, 2025 15:45
@melvin-bot
Copy link

melvin-bot bot commented Sep 17, 2025

@dangrous 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 September 17, 2025 15:45
deetergp
deetergp approved these changes Sep 17, 2025
View reviewed changes
Copy link
Contributor

@deetergp deetergp left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@Valforte Valforte merged commit 39eec29 into main Sep 17, 2025
23 of 28 checks passed
@Valforte Valforte deleted the revert-70111-ft/single-ConfirmModal-instance branch September 17, 2025 15:46
@melvin-bot
Copy link

melvin-bot bot commented Sep 17, 2025

@Valforte looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@melvin-bot melvin-bot bot added the Emergency label Sep 17, 2025
@Valforte
Copy link
Contributor

Valforte commented Sep 17, 2025

Not emergency, straight revert

OSBotify pushed a commit that referenced this pull request Sep 17, 2025
@Valforte @OSBotify
Merge pull request #70688 from Expensify/revert-70111-ft/single-Confi…
9f9d345 
…rmModal-instance

Revert "Consolidate ConfirmModal instances into a global component v2"

(cherry picked from commit 39eec29)

(cherry-picked to staging by Beamanator)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Sep 17, 2025
@OSBotify OSBotify mentioned this pull request Sep 17, 2025
Closed
91 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Sep 17, 2025

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

OSBotify commented Sep 17, 2025

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.2.15-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@trjExpensify trjExpensify mentioned this pull request Sep 17, 2025
Closed
8 tasks
@OSBotify
Copy link
Contributor

OSBotify commented Sep 19, 2025

🚀 Deployed to production by https://github.com/Beamanator in version: 9.2.15-15 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Sep 19, 2025

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.2.16-0 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

OSBotify commented Sep 23, 2025

🚀 Deployed to production by https://github.com/roryabraham in version: 9.2.16-14 🚀

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

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

Reviewers

@deetergp deetergp deetergp approved these changes

@Valforte Valforte Valforte approved these changes

@dangrous dangrous Awaiting requested review from dangrous

Assignees

@Beamanator Beamanator

@neil-marcellini neil-marcellini

Labels

CP Staging marks PRs that have been CP'd to staging Ready To Build

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@neil-marcellini @Beamanator @Valforte @OSBotify @deetergp