Skip to content

Commit 2bf72ff

Browse files
khadnikhadni
authored
Merge branch 'main' into feature/update-heartbeats-add-thala
2 parents 2804b7b + aff2015 commit 2bf72ff

File tree

5 files changed

+58
-51
lines changed

5 files changed

+58
-51
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898
"@rollup/plugin-yaml": "^4.1.2",
9999
"@types/jest": "^29.5.14",
100100
"@types/lodash": "^4.17.20",
101-
"@types/node": "^20.19.10",
101+
"@types/node": "^20.19.11",
102102
"@types/node-fetch": "^2.6.13",
103103
"@types/prismjs": "^1.26.5",
104-
"@types/react": "^19.1.9",
104+
"@types/react": "^19.1.10",
105105
"@types/react-dom": "^19.1.7",
106106
"@types/swagger-ui-dist": "^3.30.6",
107107
"@types/swagger-ui-react": "^5.18.0",
@@ -127,7 +127,7 @@
127127
"solhint-plugin-prettier": "^0.1.0",
128128
"ts-jest": "^29.4.1",
129129
"tsconfig-paths": "^4.2.0",
130-
"tsx": "^4.20.3",
130+
"tsx": "^4.20.4",
131131
"typescript": "^5.9.2",
132132
"vite": "^6.3.5"
133133
},

‎src/features/data/api/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export interface Docs {
2222
isMVR?: boolean
2323
decoding?: DecodingVariable[]
2424
issuer?: string
25+
deliveryChannelCode?: string
2526
}
2627

2728
export interface ChainMetadata {

‎src/features/feeds/components/FeedList.tsx‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -441,20 +441,22 @@ export const FeedList = ({
441441
</button>
442442
)}
443443
</form>
444-
<div className={feedList.checkboxContainer}>
445-
<label className={feedList.detailsLabel}>
446-
<input
447-
type="checkbox"
448-
style="width:15px;height:15px;display:inline;margin-right:8px;"
449-
checked={showOnlyDEXFeeds}
450-
onChange={() => {
451-
setShowOnlyDEXFeeds((old) => !old)
452-
setCurrentPage("1") // Reset to first page when filter changes
453-
}}
454-
/>
455-
Show DEX State Price streams
456-
</label>
457-
</div>
444+
{dataFeedType === "streamsCrypto" && (
445+
<div className={feedList.checkboxContainer}>
446+
<label className={feedList.detailsLabel}>
447+
<input
448+
type="checkbox"
449+
style="width:15px;height:15px;display:inline;margin-right:8px;"
450+
checked={showOnlyDEXFeeds}
451+
onChange={() => {
452+
setShowOnlyDEXFeeds((old) => !old)
453+
setCurrentPage("1") // Reset to first page when filter changes
454+
}}
455+
/>
456+
Show DEX State Price streams
457+
</label>
458+
</div>
459+
)}
458460
</div>
459461
{mainnetFeeds.length ? (
460462
mainnetFeeds.map((network) => (
@@ -520,20 +522,22 @@ export const FeedList = ({
520522
</button>
521523
)}
522524
</form>
523-
<div className={feedList.checkboxContainer}>
524-
<label className={feedList.detailsLabel}>
525-
<input
526-
type="checkbox"
527-
style="width:15px;height:15px;display:inline;margin-right:8px;"
528-
checked={showOnlyDEXFeedsTestnet}
529-
onChange={() => {
530-
setShowOnlyDEXFeedsTestnet((old) => !old)
531-
setTestnetCurrentPage("1") // Reset to first page when filter changes
532-
}}
533-
/>
534-
Show DEX State Price streams
535-
</label>
536-
</div>
525+
{dataFeedType === "streamsCrypto" && (
526+
<div className={feedList.checkboxContainer}>
527+
<label className={feedList.detailsLabel}>
528+
<input
529+
type="checkbox"
530+
style="width:15px;height:15px;display:inline;margin-right:8px;"
531+
checked={showOnlyDEXFeedsTestnet}
532+
onChange={() => {
533+
setShowOnlyDEXFeedsTestnet((old) => !old)
534+
setTestnetCurrentPage("1") // Reset to first page when filter changes
535+
}}
536+
/>
537+
Show DEX State Price streams
538+
</label>
539+
</div>
540+
)}
537541
</div>
538542
{testnetFeeds.length ? (
539543
testnetFeeds.map((network) => (

‎src/features/feeds/components/Tables.tsx‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -978,14 +978,15 @@ export const MainnetTable = ({
978978

979979
if (isSmartData) {
980980
if (showOnlyMVRFeeds) {
981-
return !metadata.docs?.hidden && metadata.docs?.isMVR === true
981+
return !metadata.docs?.hidden && metadata.docs?.isMVR === true && metadata.docs?.deliveryChannelCode !== "DS"
982982
}
983983

984984
return (
985985
!metadata.docs?.hidden &&
986-
(metadata.docs.productType === "Proof of Reserve" ||
987-
metadata.docs.productType === "NAVLink" ||
988-
metadata.docs.productType === "SmartAUM" ||
986+
metadata.docs?.deliveryChannelCode !== "DS" &&
987+
(metadata.docs?.productType === "Proof of Reserve" ||
988+
metadata.docs?.productType === "NAVLink" ||
989+
metadata.docs?.productType === "SmartAUM" ||
989990
metadata.docs?.isMVR === true)
990991
)
991992
}
@@ -1159,15 +1160,16 @@ export const TestnetTable = ({
11591160

11601161
if (isSmartData) {
11611162
if (showOnlyMVRFeeds) {
1162-
return !metadata.docs?.hidden && metadata.docs?.isMVR === true
1163+
return !metadata.docs?.hidden && metadata.docs?.isMVR === true && metadata.docs?.deliveryChannelCode !== "DS"
11631164
}
11641165

11651166
// Otherwise, include all SmartData feeds (MVR, PoR, NAVLink, SmartAUM)
11661167
return (
11671168
!metadata.docs?.hidden &&
1168-
(metadata.docs.productType === "Proof of Reserve" ||
1169-
metadata.docs.productType === "NAVLink" ||
1170-
metadata.docs.productType === "SmartAUM" ||
1169+
metadata.docs?.deliveryChannelCode !== "DS" &&
1170+
(metadata.docs?.productType === "Proof of Reserve" ||
1171+
metadata.docs?.productType === "NAVLink" ||
1172+
metadata.docs?.productType === "SmartAUM" ||
11711173
metadata.docs?.isMVR === true)
11721174
)
11731175
}

0 commit comments

Comments
 (0)