Skip to content

Back-merge main into staging - #514

Merged
ch4r10t33r merged 2 commits into
stagingfrom
merge/main-into-staging
Aug 18, 2026
Merged

Back-merge main into staging#514
ch4r10t33r merged 2 commits into
stagingfrom
merge/main-into-staging

Conversation

@ch4r10t33r

Copy link
Copy Markdown
Contributor

Summary

Merges main (the #508 release merge commit) back into staging to resolve the merge conflicts blocking the production release PR #511.

Conflicts in src/providers/AllowedAppsProvider.tsx, its test, and src/apps/pillarx-app/index.tsx were resolved in favor of staging — the resulting tree is byte-identical to current staging (verified with git diff origin/staging HEAD → empty). This PR only adds main's history so GitHub can auto-merge #511.

Merge note: please merge with a merge commit (not squash/rebase), otherwise the shared history is lost and #511 stays conflicted.

ch4r10t33r and others added 2 commits August 11, 2026 10:58
Squashed staging into main for production. Tip includes Perps/Hyperliquid,
Insights, Pulse/MTS fixes, delegated EOA signing hardening, Mobula endpoint
update, landing page refresh, and CI fixes for CircleCI apt + Slack notify.
# Conflicts:
#	src/apps/pillarx-app/index.tsx
#	src/providers/AllowedAppsProvider.tsx
@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Aug 18, 2026

Copy link
Copy Markdown

Deploying x with  Cloudflare Pages  Cloudflare Pages

Latest commit: d22555d
Status: ✅  Deploy successful!
Preview URL: https://c00bd311.x-e62.pages.dev
Branch Preview URL: https://merge-main-into-staging.x-e62.pages.dev

View logs

@coderabbitai

coderabbitai Bot commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

Important

Review available on request

  • 🔍 Trigger review

Reviews should be triggered manually for repositories with fewer than 10 stars. Select Trigger review above or comment @coderabbitai review to review the latest changes. For a full review, comment @coderabbitai full review.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: a3c349db-191d-4daf-a2d4-775bf6d35df0


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying pillarx-debug with  Cloudflare Pages  Cloudflare Pages

Latest commit: d22555d
Status: ✅  Deploy successful!
Preview URL: https://5da0ec02.pillarx-debug.pages.dev
Branch Preview URL: https://merge-main-into-staging.pillarx-debug.pages.dev

View logs

@ch4r10t33r
ch4r10t33r merged commit 1741273 into staging Aug 18, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants