Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8f7e626
feat: prevent re-access to /earn/confirm after yield transaction comp…
gomesalexandre Jan 26, 2026
c27a523
fix: correct yield routing from /yields/ to /yield/
gomesalexandre Jan 26, 2026
530d6b5
fix: eliminate dead space in yield success step footer
gomesalexandre Jan 26, 2026
e2e5cc4
fix: style fiat zero amount as placeholder in yield modals
gomesalexandre Jan 26, 2026
01fe19b
fix: filter non-default validator positions at data layer
gomesalexandre Jan 26, 2026
36a34a3
fix: show provider row for liquid staking yields
gomesalexandre Jan 26, 2026
bb00234
chore: add PR template rule to CLAUDE.md
gomesalexandre Jan 26, 2026
1df6077
fix: add spinner loading state for legacy positions in DeFi earn
gomesalexandre Jan 27, 2026
5284013
fix: select best actionable yield for asset page CTA
gomesalexandre Jan 27, 2026
c4bb8b8
fix: aggregate yield balances across all accounts in drawer
gomesalexandre Jan 27, 2026
0be3258
refactor: yield domain code improvements
gomesalexandre Jan 27, 2026
04da0f9
feat: improve yield discoverability on mobile
gomesalexandre Jan 27, 2026
b96a399
feat: enable yield feature flags by default
gomesalexandre Jan 27, 2026
5495266
fix: use TbGraph icon for mobile Earn tab
gomesalexandre Jan 27, 2026
4f85d83
fix: restore /history route as hidden route
gomesalexandre Jan 27, 2026
d1be95c
fix: use TbTrendingUp icon for mobile Earn tab
gomesalexandre Jan 27, 2026
2bfc994
Merge branch 'develop' into feat_yield_full_toggle_2
gomesalexandre Jan 28, 2026
042aa6f
Merge remote-tracking branch 'origin/develop' into feat_yield_full_to…
NeOMakinG Feb 10, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@ VITE_FEATURE_NEAR=false
VITE_FEATURE_KATANA=true

# Yield.xyz Feature Flag
VITE_FEATURE_YIELD_XYZ=false
VITE_FEATURE_YIELDS_PAGE=false
VITE_FEATURE_YIELD_XYZ=true
VITE_FEATURE_YIELDS_PAGE=true
VITE_YIELD_XYZ_API_KEY=06903960-e442-4870-81eb-03ff3ad4c035
VITE_FEATURE_YIELD_MULTI_ACCOUNT=false
VITE_FEATURE_YIELD_MULTI_ACCOUNT=true
VITE_TON_NODE_URL=https://toncenter.com/api/v2/jsonRPC
VITE_FEATURE_TON=false
VITE_FEATURE_EARN_TAB=false
3 changes: 0 additions & 3 deletions .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@ VITE_FEATURE_WC_DIRECT_CONNECTION=true
VITE_FEATURE_CETUS_SWAP=true
VITE_FEATURE_NEAR=true
VITE_FEATURE_KATANA=true
VITE_FEATURE_YIELD_XYZ=true
VITE_FEATURE_TON=true
VITE_FEATURE_STONFI_SWAP=true
VITE_FEATURE_YIELDS_PAGE=true
VITE_FEATURE_EARN_TAB=true
VITE_FEATURE_YIELD_MULTI_ACCOUNT=true
2 changes: 0 additions & 2 deletions .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ VITE_FEATURE_THORCHAIN_TCY_ACTIVITY=false

# mixpanel
VITE_MIXPANEL_TOKEN=9d304465fc72224aead9e027e7c24356
VITE_FEATURE_YIELD_XYZ=true
VITE_FEATURE_YIELD_MULTI_ACCOUNT=true
16 changes: 12 additions & 4 deletions src/Routes/RoutesCommon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { TimeIcon } from '@chakra-ui/icons'
import { lazy } from 'react'
import { FaCreditCard, FaFlag } from 'react-icons/fa'
import { RiExchangeFundsLine } from 'react-icons/ri'
import { TbGraph } from 'react-icons/tb'
import { TbGraph, TbTrendingUp } from 'react-icons/tb'

import type { Route } from './helpers'
import { RouteCategory } from './helpers'
Expand Down Expand Up @@ -190,14 +190,22 @@ export const routes: Route[] = [
priority: 5,
hide: true,
},
{
path: '/yields/*',
label: 'navBar.earn',
icon: <TbTrendingUp />,
mobileNav: true,
hideDesktop: true,
main: YieldsPage,
priority: 7,
disable: !getConfig().VITE_FEATURE_YIELD_XYZ || !getConfig().VITE_FEATURE_YIELDS_PAGE,
},
{
path: '/history',
label: 'navBar.history',
icon: <TimeIcon />,
mobileNav: true,
hideDesktop: true,
main: History,
priority: 7,
hide: true,
},
{
path: '/trade/*',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { ChevronDownIcon, SearchIcon } from '@chakra-ui/icons'
import { ChevronDownIcon, SearchIcon, TimeIcon } from '@chakra-ui/icons'
import { Flex, IconButton, Text } from '@chakra-ui/react'
import { useCallback, useLayoutEffect, useMemo } from 'react'
import { FaExpand } from 'react-icons/fa'
import { useTranslate } from 'react-polyglot'
import { useNavigate } from 'react-router-dom'

import { ProfileAvatar } from '../ProfileAvatar/ProfileAvatar'

Expand All @@ -14,6 +15,7 @@ import { useAppSelector } from '@/state/store'

const searchIcon = <SearchIcon />
const qrCodeIcon = <FaExpand />
const historyIcon = <TimeIcon />

const mobileButtonRowDisplay = { base: 'flex', md: 'none' }

Expand All @@ -29,6 +31,7 @@ export const MobileUserHeader = ({
onOpen,
}: MobileUserHeaderPrps) => {
const translate = useTranslate()
const navigate = useNavigate()

const {
state: { walletInfo },
Expand Down Expand Up @@ -71,6 +74,11 @@ export const MobileUserHeader = ({
onOpen()
}, [onOpen])

const handleHistoryClick = useCallback(() => {
vibrate('heavy')
navigate('/history')
}, [navigate])

return (
<Flex
className='mobile-user-header'
Expand Down Expand Up @@ -98,6 +106,12 @@ export const MobileUserHeader = ({
onClick={handleQrCodeClick}
isRound
/>
<IconButton
icon={historyIcon}
aria-label={translate('navBar.history')}
onClick={handleHistoryClick}
isRound
/>
</Flex>
</Flex>
)
Expand Down