Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
📝 WalkthroughWalkthroughAdds MULTILENDBORROW support and refactors Merkl campaign handling: centralizes campaign-type config, expands/normalizes fetched campaigns into SimplifiedCampaigns, updates types, and tweaks UI rendering and tooltip typings. Changes
Sequence Diagram(s)sequenceDiagram
participant Component as CampaignModal / Rewards UI
participant Query as useMerklCampaignsQuery
participant API as merklApi Utils
participant Server as Merkl API Server
Component->>Query: request campaigns (params)
activate Query
Query->>Server: fetch campaigns for types (MORPHOSUPPLY, MORPHOBORROW, MULTILENDBORROW)
Server-->>Query: raw campaign arrays
alt MULTILENDBORROW present
Query->>API: expandMultiLendBorrowCampaign(campaign)
activate API
API-->>Query: array of SimplifiedCampaigns (one per market)
deactivate API
else other campaign types
Query->>API: simplifyMerklCampaign(campaign)
activate API
API-->>Query: SimplifiedCampaign
deactivate API
end
Query-->>Component: consolidated SimplifiedCampaign list
deactivate Query
Component->>Component: render campaigns using CAMPAIGN_TYPE_CONFIG
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
🧪 Generate unit tests (beta)
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. Comment |
coderabbitai
bot
added
feature request
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In @src/components/shared/tooltip-content.tsx:
- Line 1: The import pulls in the DOM MouseEvent instead of React's event type;
replace the imported MouseEvent usage with React's synthetic event type by
removing or changing the import and using React.MouseEvent (or the more specific
React.MouseEvent<HTMLAnchorElement>) in the type annotations for any onClick
handlers/props in tooltip-content (e.g., update the import line that currently
mentions MouseEvent and adjust any function signatures or prop types that
reference MouseEvent to use React.MouseEvent<HTMLAnchorElement>).
🧹 Nitpick comments (3)
src/hooks/queries/useMerklCampaignsQuery.ts (1)
14-19: Index-based type assignment is fragile.Relies on
Promise.allpreserving order (which it does), but iffetchActiveCampaignsever filters or rejects a type, the index alignment breaks silently.Consider attaching type during fetch or using a more explicit mapping:
Safer approach
-const results = await Promise.all(CAMPAIGN_TYPES_TO_FETCH.map((type) => fetchActiveCampaigns({ type }))); - -const allRawCampaigns = results.flatMap((campaigns, index) => - campaigns.map((campaign) => ({ - ...campaign, - type: CAMPAIGN_TYPES_TO_FETCH[index], - })), -); +const results = await Promise.all( + CAMPAIGN_TYPES_TO_FETCH.map(async (type) => { + const campaigns = await fetchActiveCampaigns({ type }); + return campaigns.map((campaign) => ({ ...campaign, type })); + }), +); + +const allRawCampaigns = results.flat();src/features/market-detail/components/campaign-modal.tsx (1)
24-33: Magic number 42.The slice extracts what appears to be an Ethereum address (0x + 40 hex = 42 chars). Consider a named constant for clarity.
const ETH_ADDRESS_LENGTH = 42;Otherwise, logic is sound.
src/utils/merklApi.ts (1)
127-140: Silent empty result whenmarketsis undefined/empty.If a MULTILENDBORROW campaign should always have markets, returning an empty array silently hides bad data. Consider logging a warning:
if (markets.length === 0) { console.warn(`MULTILENDBORROW campaign ${campaign.campaignId} has no markets`); }Otherwise, logic is correct.
📜 Review details
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (6)
src/components/shared/tooltip-content.tsxsrc/features/market-detail/components/campaign-modal.tsxsrc/features/markets/components/rewards-indicator.tsxsrc/hooks/queries/useMerklCampaignsQuery.tssrc/utils/merklApi.tssrc/utils/merklTypes.ts
🧰 Additional context used
🧠 Learnings (1)
📚 Learning: 2025-12-09T10:06:39.848Z
Learnt from: antoncoding
Repo: antoncoding/monarch PR: 231
File: src/hooks/useDeployMorphoMarketV1Adapter.ts:3-3
Timestamp: 2025-12-09T10:06:39.848Z
Learning: In Wagmi v3, useConnection is the correct hook to obtain the connected wallet address, chainId, and connection status (isConnected). This replaces the useAccount hook from Wagmi v2. In your code under src/hooks, use: const { address, chainId, isConnected } = useConnection() from 'wagmi' to access the connected wallet information.
Applied to files:
src/hooks/queries/useMerklCampaignsQuery.ts
🧬 Code graph analysis (2)
src/utils/merklApi.ts (1)
src/utils/merklTypes.ts (2)
MerklCampaign(94-120)SimplifiedCampaign(133-158)
src/features/market-detail/components/campaign-modal.tsx (2)
src/utils/merklTypes.ts (2)
MerklCampaignType(1-1)SimplifiedCampaign(133-158)src/utils/external.ts (1)
getMerklCampaignURL(57-60)
🔇 Additional comments (13)
src/utils/merklTypes.ts (4)
1-1: LGTM.New campaign type added cleanly.
43-47: LGTM.Type for nested market params is clear and matches usage in
expandMultiLendBorrowCampaign.
81-92: LGTM.Optional
marketsarray andMerklOpportunitytype support the new expansion logic well.
118-119: Good change fromanytounknown.Forces explicit type checks before use.
src/hooks/queries/useMerklCampaignsQuery.ts (1)
22-27: LGTM.Conditional expansion with
flatMaphandles both cases correctly.src/components/shared/tooltip-content.tsx (1)
52-52: LGTM.
whitespace-pre-lineenables multi-line detail strings (like the rewards list using\n).src/features/market-detail/components/campaign-modal.tsx (3)
11-16: LGTM.Clean config-driven approach for campaign type display.
39-39: LGTM.Safe fallback to MORPHOSUPPLY config.
111-111: Good fix.Composite key prevents React key collisions when MULTILENDBORROW expands to multiple rows with the same campaignId.
src/utils/merklApi.ts (3)
71-75: LGTM.Simple and correct active check.
77-95: LGTM.Good extraction of shared fields.
97-125: LGTM.Clean refactor using baseFields. Type-specific handling is clear.
src/features/markets/components/rewards-indicator.tsx (1)
31-31: The borrower condition can't be reached with current campaign fetching.
MORPHOBORROWisn't included inCAMPAIGN_TYPES_TO_FETCH, socampaign.type === 'MORPHOBORROW'will never match. All fetched campaigns will fall through to the'supplier'branch.This is either intentional future-proofing (if
MORPHOBORROWsupport is coming) or dead code. If it's meant to be active, addMORPHOBORROWto the fetch list.
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In @src/hooks/queries/useMerklCampaignsQuery.ts:
- Around line 33-38: The flatMap callback in useMerklCampaignsQuery returns
inconsistent types—expandMultiLendBorrowCampaign returns SimplifiedCampaign[]
while simplifyMerklCampaign returns a single SimplifiedCampaign—so make the
return types consistent by wrapping the simplifyMerklCampaign(...) result in an
array (e.g., return [simplifyMerklCampaign(campaign)]) so flatMap always
receives an array, keeping expandMultiLendBorrowCampaign and
simplifyMerklCampaign usage unchanged.
🧹 Nitpick comments (1)
src/hooks/queries/useMerklCampaignsQuery.ts (1)
53-58: Return type forrefetchis imprecise.React Query's
refetchreturns a Promise, not void. Minor, but could cause issues if callers want to await it.Suggested fix
export type MerklCampaignsQueryReturn = { campaigns: SimplifiedCampaign[]; loading: boolean; error: string | null; - refetch: () => void; + refetch: () => Promise<unknown>; };
📜 Review details
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
src/hooks/queries/useMerklCampaignsQuery.ts
🧰 Additional context used
🧠 Learnings (1)
📚 Learning: 2025-12-09T10:06:39.848Z
Learnt from: antoncoding
Repo: antoncoding/monarch PR: 231
File: src/hooks/useDeployMorphoMarketV1Adapter.ts:3-3
Timestamp: 2025-12-09T10:06:39.848Z
Learning: In Wagmi v3, useConnection is the correct hook to obtain the connected wallet address, chainId, and connection status (isConnected). This replaces the useAccount hook from Wagmi v2. In your code under src/hooks, use: const { address, chainId, isConnected } = useConnection() from 'wagmi' to access the connected wallet information.
Applied to files:
src/hooks/queries/useMerklCampaignsQuery.ts
🔇 Additional comments (2)
src/hooks/queries/useMerklCampaignsQuery.ts (2)
5-6: LGTM - clean constant extraction.Easy to extend when new campaign types are added.
11-22: Good use ofPromise.allSettledfor resilience.Partial failures won't break the whole fetch. Warning logs help with debugging.
1 participant
Summary by CodeRabbit
New Features
Improvements
✏️ Tip: You can customize this high-level summary in your review settings.