fix: yield improvements - validator handling, disabled states, UI consistency

[gomesalexandre]

Description

Validator Handling Improvements

• Fixed yields like solana-sol-lido-staking (the only one with such issue atm, but could well apply to others) incorrectly showing Figment validator when requiresValidatorSelection: false
• Replaced chain ID based default validator mapping with safer yield ID based mapping (DEFAULT_VALIDATOR_BY_YIELD_ID)
• Added getDefaultValidatorForYield utility function for consistent validator lookup
• Removed dangerous user's highest balance validator fallback (we only support single-validator for multi-validator yields atm) - navigation now only uses predefined defaults:
  • cosmos-atom-native-staking → ShapeShift DAO
  • solana-sol-native-multivalidator-staking → Figment

Disabled Yield States

• Created isYieldDisabled utility function to centralize disabled check logic
• Disabled yields are now filtered from "Other X Yields" section (unless user has balance)
• Fixed filter options shrinking when filters applied by using unfiltered yield data for options

UI Consistency

• Unified balance terminology to "Balance" (removed inconsistent "My Balance", "Your Balance")
• Fixed yield modal close navigating to /yields instead of staying on current yield detail page
• Added provider/validator icons in Earn tab yield selector
• Fixed missing asset icons for yields in DeFi drawer tab (e.g., "Drift CASH Lending")

Code Cleanup

• Removed dead translation keys: learnMore, myBalance, protocol, yourBalance
• Added missing yieldXYZ.manage translation key
• Added unit tests for getDefaultValidatorForYield and yield augmentation functions (65 tests passing)

Risk

Low-Medium risk. Changes affect yield UI display and navigation logic. No on-chain transaction modifications.

What protocols, transaction types, wallets or contract interactions might be affected by this PR?

Yield.xyz integration - display and navigation only, no transaction logic changes.

Testing

Engineering

Validator Display:

1. Navigate to /#/yields/solana-sol-lido-staking?accountId=solana%3A5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp%3AETpdrEkK8n3jPLysUZCNe1LHdM76GSrbHgAtVpCvWYLp
   • Verify it does NOT show Figment validator info
   • Should show Lido provider info instead
2. Navigate to /#/yields/cosmos-atom-native-staking
   • Verify ShapeShift DAO validator is displayed
3. Navigate to /#/yields/solana-sol-native-multivalidator-staking
   • Verify Figment validator is displayed
4. Test other staking yield detail pages - ensure they still look correct

Disabled Yields: (note disabled yield here is the one mentioned above i.e solana-sol-lido-staking, which has enter disabled upstream currently i.e the bug that MbMaria was experiencing)
5. Navigate to yields list - verify disabled yields are filtered out (unless user has balance)
6. Navigate to a yield detail page with "Other X Yields" section - verify disabled yields are not shown
7. Apply filters on yields list - verify filter dropdown options don't shrink

Modal Navigation:
8. Navigate to any yield deets page
9. Click deposit to open modal
10. Close modal - verify you remain on the yield detail page (not redirected to /yields)

DeFi Tab Icons:
11. Open wallet drawer → DeFi tab
12. Verify yield opportunities show their asset icons (e.g., CASH icon for "Drift CASH Lending")

Earn Tab:
13. Navigate to Trade → Earn tab
14. Click yield selector dropdown
15. Verify each yield shows provider/validator icon and name

Balance Terminology:
16. Check various yield pages - balance labels should consistently show "Balance" (not "My Balance" or "Your Balance")

Operations

• 🏁 My feature is behind a flag and doesn't require operations testing (yet)

All changes are within the existing Yield.xyz feature flag scope.

Screenshots (if applicable)

• Validator Display/Disabled yields:

https://jam.dev/c/d91e776f-f8ca-4816-b878-f7f15dd046c2

• Close click

https://jam.dev/c/10a4ceae-a2ac-4038-9919-8e664a92b1de

• DeFi icons

https://jam.dev/c/539b61da-ad34-4b47-ae32-f0df69eb5631

• Balance Terminology

https://jam.dev/c/607887d1-a225-49ac-b2ac-a2173e3d96f5

---

🤖 Generated with Claude Code

Summary by CodeRabbit

• New Features

  • New translation keys and UI text for disabled deposits/withdrawals and a "Manage" action for yield assets.

• Bug Fixes

  • Disabled yields hidden from lists when balance is zero.
  • Default validator resolution improved — now determined per-yield, yielding more reliable staking flows.

• UI/UX Improvements

  • "Your Balance" renamed to "Balance".
  • Enhanced provider/validator display with avatars, badges, contextual tooltips.
  • Action buttons disabled with explanatory tooltips when unavailable.

• Tests

  • Added tests for yield augmentation and default-validator lookup.

_{✏️ Tip: You can customize this high-level summary in your review settings.}

[coderabbitai]

📝 Walkthrough

Walkthrough

Adds yield-level disable flags and UI; centralizes default validator lookup by yield ID via getDefaultValidatorForYield; introduces isYieldDisabled; filters disabled yields without balance; propagates inputAssetId through yield opportunity flows; updates translations and numerous Yield-related components.

Changes

Cohort / File(s)	Summary
Translations src/assets/translations/en/main.json	Removed legacy balance keys and added defi.depositsDisabled, defi.depositsDisabledDescription, defi.withdrawalsDisabled, defi.withdrawalsDisabledDescription, yieldXYZ.asset.manage, yieldXYZ.manage, plus new yieldXYZ.providerDescriptions entries.
Yield utilities & constants src/lib/yieldxyz/constants.ts, src/lib/yieldxyz/utils.ts, src/lib/yieldxyz/utils.test.ts	Replace chain-id default validator map with yield-id map (DEFAULT_VALIDATOR_BY_YIELD_ID); add getDefaultValidatorForYield() and isYieldDisabled(); export FIGMENT_SOLANA_VALIDATOR_ADDRESS; add tests for default lookup.
Token augmentation & tests src/lib/yieldxyz/augment.ts, src/lib/yieldxyz/augment.test.ts	Compute augmented token once and reuse for fallback inputTokens; add tests validating inputTokens, status flags, and metadata preservation.
Validator selection & UI (earn flows) src/components/MultiHopTrade/components/Earn/*.tsx, src/components/MultiHopTrade/components/Earn/components/YieldSelector.tsx	Swap chain-id constant usage for getDefaultValidatorForYield(yieldId); tighten guards for selectedYield; show provider/validator info and avatar; adjust validator defaults.
Yields pages & forms src/pages/Yields/* (multiple files)	Add deposits/withdrawals disabled UI (alerts, badges, tooltips); disable enter/exit actions based on yield.status; filter yields via isYieldDisabled (hide when zero balance); route to /yields/{id}?validator={addr} when default validator exists.
Opportunities & dashboard src/components/StakingVaults/hooks/useYieldAsOpportunities.ts, src/components/EarnDashboard/components/PositionDetails/StakingPositionsByProvider.tsx	Propagate inputAssetId in aggregated opportunities; skip disabled yields with zero balance; simplify position filtering and conditional icon rendering.
Transaction flow & manager src/pages/Yields/hooks/useYieldTransactionFlow.ts, src/pages/Yields/components/YieldManager.tsx, src/pages/Yields/components/YieldEnterModal.tsx	Use getDefaultValidatorForYield(yieldItem.id) for default validator selection across tx assembly, manager modal routing, and enter modal; remove chain-id constant usage.
Misc view/text updates src/pages/Yields/components/*.tsx, src/pages/Yields/components/YieldViewHelpers.tsx, src/pages/Yields/components/YieldItem.tsx	Rename "Your Balance" → "Balance"; add deposits-disabled alert/badge and badges/tooltips for disabled actions; use isYieldDisabled filtering and getDefaultValidatorForYield consistently.

Sequence Diagram(s)

sequenceDiagram
  participant User
  participant UI as Yields UI
  participant Utils as yieldxyz/utils
  participant Router
  participant Validators as ValidatorService

  User->>UI: Click yield entry
  UI->>Utils: isYieldDisabled(yield)
  Utils-->>UI: true/false
  alt disabled && zero balance
    UI-->>User: show tooltip / prevent navigation
  else
    UI->>Utils: getDefaultValidatorForYield(yieldId)
    Utils-->>UI: maybe-default-validator
    alt default validator exists
      UI->>Router: navigate to /yields/{yieldId}?validator={addr}
    else
      UI->>Validators: fetch validators (if required)
      Validators-->>UI: validators list
      UI->>Router: navigate to /yields/{yieldId}
    end
  end

Loading

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Possibly related PRs

• feat: big batch of yield improvements #11656 — Overlaps default-validator resolution and yield UI changes (constants/utils and Yield components).
• feat: yield.xyz POC #11578 — Related yield.xyz integration edits (augment, utils, constants, translations).
• feat: yield improvements following CR #11729 — Overlaps modifications to Yields UI and components (e.g., YieldPositionCard).

Suggested reviewers

• NeOMakinG
• 0xApotheosis

Poem

🐰 I hop through yields both old and new,
Validators found by ID, tidy and true,
Badges whisper "deposits paused" with charm,
Buttons rest safe, no unintended harm,
A rabbit cheers the code — light paws, bright view ✨

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately summarizes the main changes: validator handling improvements, disabled state handling, and UI consistency updates across the yield components.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch feat_last_yield_bits_fr_this_time_no_cap

---

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

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

Actionable comments posted: 1

🤖 Fix all issues with AI agents

In
`@src/components/EarnDashboard/components/PositionDetails/StakingPositionsByProvider.tsx`:
- Around line 125-129: Remove the unreachable fallback to y.yieldId when mapping
opportunities in StakingPositionsByProvider.tsx: replace uses of y.inputAssetId
?? y.yieldId for assetId and underlyingAssetId with y.inputAssetId directly
(since useYieldAsOpportunities.ts guarantees inputAssetId is present);
alternatively, update the YieldOpportunityDisplay type to make inputAssetId
non-optional so callers and mappers like the map over yieldOpportunities reflect
that contract.

[coderabbitai]

Actionable comments posted: 0

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

src/components/StakingVaults/hooks/useYieldAsOpportunities.ts (1)

73-81: Guard against missing default validator in balances.

If getDefaultValidatorForYield() returns a validator that isn’t present in balancesForYield.byValidator, validatorBalance becomes undefined and the UI shows 0 even when the user has balances on other validators. Add a presence check and fall back to the first available validator in that case.

🔧 Suggested fix

-        const defaultValidatorAddress = getDefaultValidatorForYield(yieldItem.id)
-        const validatorAddresses = Object.keys(balancesForYield.byValidator)
-        const selectedValidatorAddress = defaultValidatorAddress ?? validatorAddresses[0]
+        const defaultValidatorAddress = getDefaultValidatorForYield(yieldItem.id)
+        const validatorAddresses = Object.keys(balancesForYield.byValidator)
+        const selectedValidatorAddress =
+          defaultValidatorAddress &&
+          balancesForYield.byValidator[defaultValidatorAddress]
+            ? defaultValidatorAddress
+            : validatorAddresses[0]

[NeOMakinG]

https://jam.dev/c/de21eb01-d4a9-42e4-87d5-e5731f0094c2

Some protocols doesn't have icons in the filter dropdown

Same in earn tab modal

Other than that the intended fix seems to work well!

[gomesalexandre]

Some protocols doesn't have icons in the filter dropdown

Nice catch @NeOMakinG! Reported this one to Yield (missing in /providers).