Feature/1291 concurrent cancel - #1340
Merged
Merged
Conversation
Contributor
Author
|
@blurbeast review and merge |
meem08
force-pushed
the
feature/1291-concurrent-cancel
branch
from
September 1, 2026 15:10
6274066 to
48ddc45
Compare
…anch - Restore ci.yml, package.json, and package-lock.json to match main: keep the changes job, the frontend rollup native binding step, and a lockfile in sync so npm ci and the frontend lint environment match main. - Fix the concurrent-cancel integration test: run it inside the describe block with persistent mocks and assert the actual controller behavior (each request performs its own on-chain cancel). - Restore the preserve-manual-memoization suppression and the getAllByText assertion in the stream details page/test to match main. Generated with Codebuff 🤖 Co-Authored-By: Codebuff <noreply@codebuff.com>
… only) The main merge re-introduced the same breakage as before: package.json became invalid JSON (duplicate mysql2 override missing a comma, which broke npm ci / npm audit in every job), the lockfile was churned by a local npm install, and stream-details-content.tsx got a duplicate liveClaimable const. Restore all three to match main so the PR's only change is the concurrent-cancel integration test (LabsCrypt#1291). Generated with Codebuff 🤖 Co-Authored-By: Codebuff <noreply@codebuff.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Type of Change
Related Issues
Closes #1291
Changes Made
Testing
Test Coverage
Test Steps
Breaking Changes
Breaking Changes:
Migration Guide:
Screenshots/Demo
Checklist
Additional Notes