diff --git a/.env b/.env
index b52ff0ddc21..9905959b3b8 100644
--- a/.env
+++ b/.env
@@ -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
diff --git a/.env.development b/.env.development
index 960524ab908..bcbf9ed72f6 100644
--- a/.env.development
+++ b/.env.development
@@ -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
diff --git a/.env.production b/.env.production
index 26f596e2335..0509e45959f 100644
--- a/.env.production
+++ b/.env.production
@@ -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
diff --git a/src/Routes/RoutesCommon.tsx b/src/Routes/RoutesCommon.tsx
index ab11a8c3a4a..1fb96062dce 100644
--- a/src/Routes/RoutesCommon.tsx
+++ b/src/Routes/RoutesCommon.tsx
@@ -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'
@@ -190,14 +190,22 @@ export const routes: Route[] = [
priority: 5,
hide: true,
},
+ {
+ path: '/yields/*',
+ label: 'navBar.earn',
+ icon: ,
+ 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: ,
- mobileNav: true,
- hideDesktop: true,
main: History,
- priority: 7,
+ hide: true,
},
{
path: '/trade/*',
diff --git a/src/pages/Dashboard/components/DashboardHeader/MobileUserHeader.tsx b/src/pages/Dashboard/components/DashboardHeader/MobileUserHeader.tsx
index 834cb4fd53b..5d91b9d28a7 100644
--- a/src/pages/Dashboard/components/DashboardHeader/MobileUserHeader.tsx
+++ b/src/pages/Dashboard/components/DashboardHeader/MobileUserHeader.tsx
@@ -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'
@@ -14,6 +15,7 @@ import { useAppSelector } from '@/state/store'
const searchIcon =
const qrCodeIcon =
+const historyIcon =
const mobileButtonRowDisplay = { base: 'flex', md: 'none' }
@@ -29,6 +31,7 @@ export const MobileUserHeader = ({
onOpen,
}: MobileUserHeaderPrps) => {
const translate = useTranslate()
+ const navigate = useNavigate()
const {
state: { walletInfo },
@@ -71,6 +74,11 @@ export const MobileUserHeader = ({
onOpen()
}, [onOpen])
+ const handleHistoryClick = useCallback(() => {
+ vibrate('heavy')
+ navigate('/history')
+ }, [navigate])
+
return (
+
)