Merge pull request #276 from chain4travel/fix-dac-error

chore: Remove setTimeout from feature checks in PlatformSwitcher, Rou… 7b6156c …tesSuite, and LandingPage; add error handling in checkFeature
chain4travel · Nov 28, 2024 · 1babfee · 1babfee
2 parents eac0db4 + 6fa5d23
commit 1babfee
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/src/components/PlatformSwitcher.tsx b/src/components/PlatformSwitcher.tsx
@@ -32,13 +32,17 @@ export default function PlatformSwitcher() {
 
     useEffect(() => {
         checkFeature()
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [activeNetwork])
 
     const checkFeature = async () => {
-        const phases = await getUpgradePhases()
-        const enabled = await isFeatureEnabled('DACFeature', activeNetwork?.url, phases)
-
-        setFeatureEnabled(enabled)
+        try {
+            const phases = await getUpgradePhases()
+            const enabled = await isFeatureEnabled('DACFeature', activeNetwork?.url, phases)
+            setFeatureEnabled(enabled)
+        } catch (error) {
+            setFeatureEnabled(false)
+        }
     }
 
     return (

diff --git a/src/layout/RoutesSuite.tsx b/src/layout/RoutesSuite.tsx
@@ -82,14 +82,18 @@ export default function RoutesSuite() {
 
     useEffect(() => {
         checkFeature()
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [activeNetwork])
 
     const checkFeature = async () => {
-        const phases = await getUpgradePhases()
-        const enabled = await isFeatureEnabled('DACFeature', activeNetwork?.url, phases)
-        setFeatureEnabled(enabled)
+        try {
+            const phases = await getUpgradePhases()
+            const enabled = await isFeatureEnabled('DACFeature', activeNetwork?.url, phases)
+            setFeatureEnabled(enabled)
+        } catch (error) {
+            setFeatureEnabled(false)
+        }
     }
-
     return (
         <>
             <Routes>

diff --git a/src/views/landing/LandingPage.tsx b/src/views/landing/LandingPage.tsx
@@ -21,12 +21,17 @@ export default function LandingPage() {
 
     useEffect(() => {
         checkFeature()
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [activeNetwork])
 
     const checkFeature = async () => {
-        const phases = await getUpgradePhases()
-        const enabled = await isFeatureEnabled('DACFeature', activeNetwork?.url, phases)
-        setFeatureEnabled(enabled)
+        try {
+            const phases = await getUpgradePhases()
+            const enabled = await isFeatureEnabled('DACFeature', activeNetwork?.url, phases)
+            setFeatureEnabled(enabled)
+        } catch (error) {
+            setFeatureEnabled(false)
+        }
     }
 
     const handleWidgetClick = app => {