Skip to content

feat: merge PR #259 (LLM API) and PR #262 (Xpay) into dev#276

Merged
canisminor1990 merged 5 commits into
devfrom
copilot/merge-pr-262-259-into-dev
Mar 26, 2026
Merged

feat: merge PR #259 (LLM API) and PR #262 (Xpay) into dev#276
canisminor1990 merged 5 commits into
devfrom
copilot/merge-pr-262-259-into-dev

Conversation

Copilot AI commented Mar 26, 2026

Copy link
Copy Markdown
Contributor

Merges two open PRs adding new provider icons into dev, resolving conflicts caused by src/toc.ts being reformatted to JSON-style syntax after both PRs were opened.

Changes

Conflict resolution

Both PRs conflicted on src/toc.ts — dev had migrated keys to quoted JSON format while both PRs still used unquoted JS object notation. Resolution in both cases:

  • Kept the dev (JSON-format) version of toc.ts
  • Inserted each new entry at the correct alphabetical position:
    • LlmApi → between LlamaIndex and LmStudio
    • Xpay → between Xinference and Xuanyuan
  • All other modified files (src/icons.ts, providerEnum.ts, providerConfig.tsx, packages/react-native/src/index.ts) auto-merged cleanly

@sourcery-ai sourcery-ai Bot 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.

Sorry @Copilot, your pull request is larger than the review limit of 150000 diff characters

@canisminor1990 canisminor1990 changed the base branch from master to dev March 26, 2026 08:28
@canisminor1990 canisminor1990 marked this pull request as ready for review March 26, 2026 08:28
@canisminor1990 canisminor1990 merged commit e640f45 into dev Mar 26, 2026
2 of 3 checks passed
@canisminor1990 canisminor1990 deleted the copilot/merge-pr-262-259-into-dev branch March 26, 2026 08:29
@lobehubbot

Copy link
Copy Markdown
Member

❤️ Great PR @Copilot ❤️


The growth of project is inseparable from user feedback and contribution, thanks for your contribution!
项目的成长离不开用户反馈和贡献,感谢您的贡献!

This was referenced Mar 26, 2026

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 17a4f608b9

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

export interface CombineProps extends Omit<RNIconCombineProps, 'Icon' | 'Text'> {
type?: 'color' | 'mono';
}
const Combine = memo<CombineProps>(({ type = 'color', extraStyle, ...rest }) => {

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Default LlmApi RN combine variant to mono

<LlmApi.Combine /> in React Native currently defaults type to 'color', which makes the default rendering use the avatar-style logo instead of the mono mark. This is inconsistent with the web implementation (src/LlmApi/components/Combine.tsx, default 'mono') and with the existing RN Combine components, so consumers that rely on the default variant will get an unexpected branded badge layout and different sizing/spacing behavior without opting in.

Useful? React with 👍 / 👎.

canisminor1990 added a commit that referenced this pull request Mar 26, 2026
* ✨ feat(icons): add Qoder brand icon (#270)

* ✨ feat(icons): add Qoder brand icon

- Add Qoder icon components (Avatar, Color, Mono, Text)
- Add Qoder icon documentation
- Export Qoder icon in icons.ts
- Add Qoder entry in table of contents

	new file:   src/Qoder/components/Avatar.tsx
	new file:   src/Qoder/components/Color.tsx
	new file:   src/Qoder/components/Mono.tsx
	new file:   src/Qoder/components/Text.tsx
	new file:   src/Qoder/index.md
	new file:   src/Qoder/index.ts
	new file:   src/Qoder/style.ts
	modified:   src/icons.ts
	modified:   src/toc.ts

* ✨ feat: add Qoder icon

- Add Qoder icon with Avatar, Color, Mono, and Text variants
- Export Qoder icon from react-native package

* ✨ feat: add Coding Plan provider icons support (#272)

* ✨ feat: add Coding Plan provider support

* ✨ feat: add Coding Plan provider support for React Native

* feat: add Apertis icon (#269)

* feat: add Apertis icon

Add Apertis (apertis.ai) — a unified API platform for 500+ AI models
across 30+ providers. Includes Mono, Text, Avatar, and Combine
components following the standard icon package structure.

Primary color: #0d9488 (Apertis Teal)

* feat: export Apertis icon and add react-native support

Add Apertis to src/icons.ts barrel export and create the full
react-native icon set (Mono, Text, Avatar, Combine) under
packages/react-native/src/icons/Apertis.

* Update Together AI logo (#268)

* wip

* wip

* Revert "wip"

This reverts commit 76dfa33.

* wip

* feat: add AskVerdict AI brand icons (#265)

Add AskVerdict AI (askverdict.ai) — multi-agent AI debate engine.

Components: Mono, Color (gold gradient), Text, Combine, Avatar
Shared SVG paths extracted to paths.ts to prevent divergence.

Brand color: #E8A317 (gold)
Website: https://askverdict.ai

* ✨ feat: add AgentVoice icon (#257)

Co-authored-by: RRyanHoward <ryan@websitellm.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

* feat: merge PR #259 (LLM API) and PR #262 (Xpay) into dev (#276)

* ✨ feat: Add LLM API logo

* ✨ feat: add xpay icon

* fix: set hasBrandColor to true in toc entry

---------

Co-authored-by: Markos Basilio <markosbasilio@MacBook-Pro-Markos.local>
Co-authored-by: xPay <xpaysh@gmail.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

* 💄 style: Fix some icon style

* ✨ feat: Update rn

---------

Co-authored-by: zhi <yantze@126.com>
Co-authored-by: Hardy <yimingmail@yandex.com>
Co-authored-by: Quert <a97041304@gmail.com>
Co-authored-by: Hassan El Mghari <hassan4709@gmail.com>
Co-authored-by: GDS K S <39922405+thegdsks@users.noreply.github.com>
Co-authored-by: Ryan Howard <ryan@agentvoice.com>
Co-authored-by: RRyanHoward <ryan@websitellm.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Markos Basilio <markosbasilio@MacBook-Pro-Markos.local>
Co-authored-by: xPay <xpaysh@gmail.com>
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.

4 participants