Repository navigation
fix(fork): merge upstream 5b2ee39 into patch/voice - #63
Merged
Merged
Conversation
pingdotgg#22570) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22557) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22575) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#22561) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…event-driven (pingdotgg#22565) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ing parent (pingdotgg#22581) Co-authored-by: syberia <n.kuhtin@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#22588) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#22589) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#22591) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#22592) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#22593) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#22599) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#22556) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rts (pingdotgg#22602) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
- apps/mobile/src/widgets/SubscriptionUsage.android.test.ts: took upstream's deletion. The patch only adjusted upstream's layout tests there (dropped the expiry cases and the expiresAt fixture). - apps/mobile/src/widgets/subscriptionUsageSnapshot.test.ts: took upstream's pruned file, dropped its stale expiresAt assertion, and re-added the patch's behavior tests: limits kept past a reset or a malformed check time, provider-wide weekly kept ahead of a model-scoped weekly, and the keepLastLimits suite. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.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
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.
The fork's nightly build fails because this patch conflicts with upstream commit 5b2ee39.
Upstream's test prune (pingdotgg#22557 and pingdotgg#22588) deleted or cut down the widget tests this patch had changed.
apps/mobile/src/widgets/SubscriptionUsage.android.test.ts: upstream deleted it. The patch had only adjusted upstream's layout tests in it, so I accepted the deletion.apps/mobile/src/widgets/subscriptionUsageSnapshot.test.ts: I took upstream's version and re-added the patch's tests for its own behavior. The widget keeps a provider's last limits instead of expiring them, a malformed check time keeps its limits, the provider-wide weekly limit sorts ahead of a tighter model-scoped one, and thekeeping the last widget limitssuite. I dropped the patch's edits to tests upstream deleted, and its rewrite of the appearance test, which mostly checked upstream's theme handling.Verification:
pnpm install --no-frozen-lockfile: done.pnpm run typecheckinapps/mobile,apps/voiceandpackages/contracts: 0 errors.vp test runinapps/mobileforvoiceSessionController,voiceSessionState,voiceStartupAudio,mobile-preferencesandsubscriptionUsageSnapshot: 60 passed.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code