Skip to content

Private#1138

Merged
dskhairnar merged 5 commits into
private-stagingfrom
private
Jul 17, 2026
Merged

Private#1138
dskhairnar merged 5 commits into
private-stagingfrom
private

Conversation

@dskhairnar

Copy link
Copy Markdown
Contributor

No description provided.

@coderabbitai

coderabbitai Bot commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

🗂️ Base branches to auto review (2)
  • develop
  • main

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 7b85b4b3-f308-4321-ac84-4586bac4373d

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch private

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.

Resolve conflicts to clear PR #1138 without merging it, keeping private's
newer Moyasar redirect-URL autopay flow and folding in private-staging's
additions:

- Moyasar autopay: keep private's redirect-flow copy + Connection-based
  typing (MoyasarConnectionDrawer + test + CheckoutPage result states)
- Paddle: keep private-staging's webhook-events import (used by getWebhookEvents)
- IntegrationMappingCard: use common:integrations.setupAutopayMoyasar key;
  drop duplicated useMemo deps
- i18n (ar/en customers + settings): 3-way key-union merge; private's autopay
  strings win on value conflicts (matches the redirect-flow code)

Typecheck, build, ESLint (0 errors), and Moyasar drawer tests (5/5) pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@dskhairnar
dskhairnar merged commit 6f02466 into private-staging Jul 17, 2026
9 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