Skip to content

[CP Staging] Revert "Block collect users from adding other direct feeds"#74497

Merged
luacmartins merged 1 commit into
mainfrom
revert-72791-block-any-attempts-to-connect-to-feed-with-collect-limitation
Nov 6, 2025
Merged

[CP Staging] Revert "Block collect users from adding other direct feeds"#74497
luacmartins merged 1 commit into
mainfrom
revert-72791-block-any-attempts-to-connect-to-feed-with-collect-limitation

Conversation

@Beamanator

@Beamanator Beamanator commented Nov 6, 2025

Copy link
Copy Markdown
Contributor

Reverts #72791

Fixed issues

$ #74495
$ #74453
$ #74463

Possibly fixes multiple blockers - discussing in slack here: https://expensify.slack.com/archives/C01GTK53T8Q/p1762450425238249

@github-actions

github-actions Bot commented Nov 6, 2025

Copy link
Copy Markdown
Contributor

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

@codecov

codecov Bot commented Nov 6, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 14 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...s/workspace/companyCards/addNew/SelectBankStep.tsx 0.00% 7 Missing ⚠️
...space/companyCards/BankConnection/index.native.tsx 0.00% 2 Missing ⚠️
...es/workspace/companyCards/BankConnection/index.tsx 0.00% 2 Missing ⚠️
...panyCards/WorkspaceCompanyCardFeedSelectorPage.tsx 0.00% 2 Missing ⚠️
...s/workspace/companyCards/addNew/AddNewCardPage.tsx 0.00% 1 Missing ⚠️
Files with missing lines Coverage Δ
...s/workspace/companyCards/addNew/AddNewCardPage.tsx 0.00% <0.00%> (ø)
...space/companyCards/BankConnection/index.native.tsx 2.50% <0.00%> (+0.17%) ⬆️
...es/workspace/companyCards/BankConnection/index.tsx 0.00% <0.00%> (ø)
...panyCards/WorkspaceCompanyCardFeedSelectorPage.tsx 0.00% <0.00%> (ø)
...s/workspace/companyCards/addNew/SelectBankStep.tsx 0.00% <0.00%> (ø)

... and 7 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions

github-actions Bot commented Nov 6, 2025

Copy link
Copy Markdown
Contributor

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/74497/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/74497/index.html
Android iOS
Desktop 💻 Web 🕸️
❌ FAILED ❌ https://74497.pr-testing.expensify.com
The QR code can't be generated, because the Desktop build failed Web

👀 View the workflow run that generated this build 👀

@Beamanator Beamanator marked this pull request as ready for review November 6, 2025 20:03
@Beamanator Beamanator requested review from a team as code owners November 6, 2025 20:03
@melvin-bot melvin-bot Bot requested review from dukenv0307 and removed request for a team November 6, 2025 20:04
@melvin-bot

melvin-bot Bot commented Nov 6, 2025

Copy link
Copy Markdown

@dukenv0307 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 requested review from JmillsExpensify and removed request for a team November 6, 2025 20:04
@Beamanator Beamanator removed the request for review from dukenv0307 November 6, 2025 20:10
@Beamanator

Copy link
Copy Markdown
Contributor Author

straight revert, no C+ review needed 🙏

@luacmartins luacmartins left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@luacmartins

luacmartins commented Nov 6, 2025

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (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 verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • 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
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • 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 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@luacmartins

Copy link
Copy Markdown
Contributor

Merging. Failed TS check is fixed on main.

@luacmartins luacmartins merged commit c8763a9 into main Nov 6, 2025
27 of 35 checks passed
@luacmartins luacmartins deleted the revert-72791-block-any-attempts-to-connect-to-feed-with-collect-limitation branch November 6, 2025 20:45
@melvin-bot melvin-bot Bot added the Emergency label Nov 6, 2025
@melvin-bot

melvin-bot Bot commented Nov 6, 2025

Copy link
Copy Markdown

@luacmartins 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.

@luacmartins luacmartins changed the title Revert "Block collect users from adding other direct feeds" [CP Staging] Revert "Block collect users from adding other direct feeds" Nov 6, 2025
OSBotify pushed a commit that referenced this pull request Nov 6, 2025
…pts-to-connect-to-feed-with-collect-limitation

Revert "Block collect users from adding other direct feeds"

(cherry picked from commit c8763a9)

(cherry-picked to staging by luacmartins)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Nov 6, 2025
@OSBotify

OSBotify commented Nov 6, 2025

Copy link
Copy Markdown
Contributor

✋ 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

OSBotify commented Nov 6, 2025

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.2.45-6 🚀

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

@OSBotify

OSBotify commented Nov 6, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.45-6 🚀

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

@OSBotify

OSBotify commented Nov 6, 2025

Copy link
Copy Markdown
Contributor

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

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

@OSBotify

OSBotify commented Nov 7, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.46-3 🚀

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

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

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants