Skip to content

Commit 5806f30

Browse files
aelmanaaaelmanaa
authored
Merge branch 'main' into dependabot/npm_and_yarn/linting-tools-254fb3313c
2 parents 9cf2414 + 69dbb85 commit 5806f30

File tree

7 files changed

+232
-60
lines changed

7 files changed

+232
-60
lines changed

‎.github/scripts/data/baseline.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"timestamp": "2025-11-02T21:03:02Z",
2+
"timestamp": "2025-11-09T21:03:38Z",
33
"knownIds": [
44
"aptos-apt-usd",
55
"aptos-btc-usd",
@@ -523,6 +523,7 @@
523523
"arbitrum-syrup-usd-refprice-mainnet-production",
524524
"arbitrum-syrupusdc-usdc-exchange-rate",
525525
"arbitrum-syrupusdc-usdc-exrate-mainnet-production",
526+
"arbitrum-syrupusdt-usd-exchange-rate",
526527
"arbitrum-tao-usd",
527528
"arbitrum-tao-usd-premium-prod-v03",
528529
"arbitrum-tbtc-btc",
@@ -744,6 +745,7 @@
744745
"avalanche-susde-usde-exchange-rate",
745746
"avalanche-sushi-usd",
746747
"avalanche-syrupusdc-usdc-exchange-rate",
748+
"avalanche-syrupusdt-usd-exchange-rate",
747749
"avalanche-try-usd",
748750
"avalanche-tusd-usd",
749751
"avalanche-uni-usd",
@@ -1172,6 +1174,7 @@
11721174
"ethereum-comp-eth",
11731175
"ethereum-comp-usd",
11741176
"ethereum-comp-usd-shared-svr",
1177+
"ethereum-crdt-nav",
11751178
"ethereum-crv-eth",
11761179
"ethereum-crv-usd",
11771180
"ethereum-crvusd-usd",
@@ -1484,6 +1487,8 @@
14841487
"linea-real-gdp-percentage",
14851488
"linea-rseth-eth",
14861489
"linea-rsweth-eth-exchange-rate",
1490+
"linea-savbtc-avbtc-exchange-rate",
1491+
"linea-savusd-avusd-exchange-rate",
14871492
"linea-ultraeths-eth-exchange-rate",
14881493
"linea-usd1-usd",
14891494
"linea-usdc-usd",
@@ -1716,13 +1721,16 @@
17161721
"plasma-rlp-usd",
17171722
"plasma-savusd-avusd-exchange-rate",
17181723
"plasma-splusd-plusd-exchange-rate",
1724+
"plasma-susdai-usd",
17191725
"plasma-susdai-usdai",
17201726
"plasma-susde-usd",
17211727
"plasma-susde-usde",
1728+
"plasma-susdf-usdf-exchange-rate",
17221729
"plasma-syrupusdt-usdt",
17231730
"plasma-usdai-usd",
17241731
"plasma-usdc-usd",
17251732
"plasma-usde-usd",
1733+
"plasma-usdf-usd",
17261734
"plasma-usds-usd",
17271735
"plasma-usdt-usd",
17281736
"plasma-usdt0-usd",
@@ -2085,6 +2093,7 @@
20852093
"xlayer-eth-usd",
20862094
"xlayer-ezeth-eth",
20872095
"xlayer-ezeth-eth-exchange-rate",
2096+
"xlayer-gho-usd",
20882097
"xlayer-link-usd",
20892098
"xlayer-okb-usd",
20902099
"xlayer-susde-usd",

‎package-lock.json‎

Lines changed: 40 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"@solana/wallet-adapter-react-ui": "^0.9.39",
8484
"@solana/wallet-adapter-solflare": "^0.6.32",
8585
"@solana/wallet-adapter-trust": "^0.1.17",
86-
"@supabase/supabase-js": "^2.78.0",
86+
"@supabase/supabase-js": "^2.80.0",
8787
"astro": "^5.15.4",
8888
"bignumber.js": "^9.3.1",
8989
"bs58": "^6.0.0",

‎public/changelog.json‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,98 @@
351351
"title": "Cross-chain token (CCT) standard: Added support for new tokens",
352352
"topic": "CCIP"
353353
},
354+
{
355+
"category": "integration",
356+
"date": "2025-11-09",
357+
"description": "New SmartData Feeds available:",
358+
"relatedNetworks": ["ethereum"],
359+
"relatedTokens": [
360+
{
361+
"assetName": "CRDT NAV (WisdomTree Private Credit and Alternative Income Digital Fund)",
362+
"baseAsset": "CRDT",
363+
"network": "ethereum",
364+
"productTypeCode": "NAV",
365+
"url": "https://data.chain.link/feeds/ethereum/mainnet/crdt-nav",
366+
"iconUrl": "https://d2f70xi62kby8n.cloudfront.net/tokens/crdt.webp"
367+
}
368+
],
369+
"title": "Added support to SmartData",
370+
"topic": "SmartData"
371+
},
372+
{
373+
"category": "integration",
374+
"date": "2025-11-09",
375+
"description": "New Data Feeds available:",
376+
"relatedNetworks": ["linea", "plasma", "xlayer", "avalanche", "arbitrum"],
377+
"relatedTokens": [
378+
{
379+
"assetName": "Avant Staked BTC",
380+
"baseAsset": "savBTC",
381+
"quoteAsset": "avBTC",
382+
"network": "linea",
383+
"url": "https://data.chain.link/feeds/linea/mainnet/savbtc-avbtc-exchange-rate",
384+
"iconUrl": "https://d2f70xi62kby8n.cloudfront.net/tokens/savbtc.webp"
385+
},
386+
{
387+
"assetName": "Avant Staked USD",
388+
"baseAsset": "savUSD",
389+
"quoteAsset": "avUSD",
390+
"network": "linea",
391+
"url": "https://data.chain.link/feeds/linea/mainnet/savusd-avusd-exchange-rate",
392+
"iconUrl": "https://d2f70xi62kby8n.cloudfront.net/tokens/savusd.webp"
393+
},
394+
{
395+
"assetName": "Falcon USD",
396+
"baseAsset": "USDf",
397+
"quoteAsset": "USD",
398+
"network": "plasma",
399+
"url": "https://data.chain.link/feeds/plasma/mainnet/usdf-usd",
400+
"iconUrl": "https://d2f70xi62kby8n.cloudfront.net/tokens/usdf.webp"
401+
},
402+
{
403+
"assetName": "GHO",
404+
"baseAsset": "GHO",
405+
"quoteAsset": "GHO",
406+
"network": "xlayer",
407+
"url": "https://data.chain.link/feeds/xlayer/xlayer/gho-usd",
408+
"iconUrl": "https://d2f70xi62kby8n.cloudfront.net/tokens/gho.webp"
409+
},
410+
{
411+
"assetName": "Staked Falcon USD",
412+
"baseAsset": "sUSDf",
413+
"quoteAsset": "USDf",
414+
"network": "plasma",
415+
"url": "https://data.chain.link/feeds/plasma/mainnet/susdf-usdf-exchange-rate",
416+
"iconUrl": "https://d2f70xi62kby8n.cloudfront.net/tokens/susdf.webp"
417+
},
418+
{
419+
"assetName": "Staked USDai",
420+
"baseAsset": "SUSDAI",
421+
"quoteAsset": "USD",
422+
"network": "plasma",
423+
"url": "https://data.chain.link/feeds/plasma/plasma/susdai-usd",
424+
"iconUrl": "https://d2f70xi62kby8n.cloudfront.net/tokens/susdai.webp"
425+
},
426+
{
427+
"assetName": "SYRUPUSDT / USD Exchange Rate",
428+
"baseAsset": "SYRUPUSDT",
429+
"quoteAsset": "USD",
430+
"network": "avalanche",
431+
"url": "https://data.chain.link/feeds/avalanche/mainnet/syrupusdt-usd-exchange-rate",
432+
"iconUrl": "https://d2f70xi62kby8n.cloudfront.net/tokens/syrupusdt.webp"
433+
},
434+
{
435+
"assetName": "syrupUSDT-USD Exchange Rate",
436+
"baseAsset": "syrupUSDT",
437+
"quoteAsset": "USD",
438+
"network": "arbitrum",
439+
"url": "https://data.chain.link/feeds/arbitrum/mainnet/syrupusdt-usd-exchange-rate",
440+
"iconUrl": "https://d2f70xi62kby8n.cloudfront.net/tokens/syrupusdt.webp"
441+
}
442+
],
443+
"title": "Added support to Data Feeds",
444+
"topic": "Data Feeds"
445+
},
354446
{
355447
"category": "release",
356448
"date": "2025-11-04",

‎src/components/DocsNavigation/DocsNavigationMobile/SubProductContent.tsx‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useEffect, useRef } from "react"
22
import { useStore } from "@nanostores/react"
33
import { selectedLanguage } from "~/lib/languageStore.js"
44
import { selectedChainType } from "~/stores/chainType.js"
5-
import { applyChainTypeFilter } from "~/utils/chainType.js"
65
import { BackArrowIcon } from "./BackArrowIcon.js"
76
import { Page } from "../../Header/Nav/config.js"
87
import styles from "./subProductContent.module.css"
@@ -84,9 +83,25 @@ export const SubProductContent = ({ subProducts, onSubproductClick, currentPath
8483
const currentLang = useStore(selectedLanguage)
8584
const currentChain = useStore(selectedChainType)
8685

87-
// Apply chain type filtering using shared utility (same as desktop sidebar)
86+
// Apply unified chain type filtering that respects both language AND chain filters
8887
useEffect(() => {
89-
applyChainTypeFilter(currentChain)
88+
const sidebarItems = document.querySelectorAll<HTMLElement>("[data-chain-types]")
89+
90+
sidebarItems.forEach((item) => {
91+
const chainTypesAttr = item.getAttribute("data-chain-types")
92+
93+
let chainVisible = true
94+
if (chainTypesAttr === "universal" || !chainTypesAttr) {
95+
chainVisible = true // Always show universal/legacy content
96+
} else {
97+
const itemChains = chainTypesAttr.split(",")
98+
chainVisible = itemChains.includes(currentChain)
99+
}
100+
101+
// Don't overwrite language filtering - only hide if chain doesn't match
102+
// Language filtering is already handled in renderPages function above
103+
item.style.display = chainVisible ? "" : "none"
104+
})
90105
}, [currentChain])
91106

92107
if (!subProducts) {

‎src/components/LeftSidebar/LeftSidebar.astro‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,14 @@ const sidebarSections = getSidebarSections(section)
161161

162162
<script>
163163
import { selectedChainType } from "~/stores/chainType"
164-
import { applyChainTypeFilter } from "~/utils/chainType.js"
165164

166165
/**
167166
* Filters sidebar items based on selected chain type
168-
* Uses shared utility function for consistency with mobile drawer
167+
* Triggers the unified filter in RecursiveSidebar that respects BOTH chain type AND language
169168
*/
170169
function filterSidebarByChainType() {
171-
applyChainTypeFilter(selectedChainType.get())
170+
// trigger a languageChanged event to run the unified filter
171+
window.dispatchEvent(new CustomEvent("languageChanged"))
172172
}
173173

174174
// Run on initial load

0 commit comments

Comments
 (0)