Merge pull request #1152 from oasisprotocol/mz/picker

Do not change runtime to Emerald when switching network
oasisprotocol · Jan 16, 2024 · 403445b · 403445b
2 parents a2ebc54 + f7e5186
commit 403445b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.changelog/1152.bugfix.md b/.changelog/1152.bugfix.md
@@ -0,0 +1 @@
+Do not change runtime to Emerald when switching network
diff --git a/src/app/components/ParaTimePicker/index.tsx b/src/app/components/ParaTimePicker/index.tsx
@@ -91,8 +91,10 @@ const ParaTimePickerContent: FC<ParaTimePickerContentProps> = ({ isOutOfDate, on
     ParaTimePickerTabletStep.ParaTimeDetails,
   )
   const selectNetwork = (newNetwork: Network) => {
+    const enabledLayers = RouteUtils.getEnabledLayersForNetwork(newNetwork)
+    const targetLayer = enabledLayers.includes(selectedLayer) ? selectedLayer : enabledLayers[0]
     setSelectedNetwork(newNetwork)
-    setSelectedLayer(RouteUtils.getEnabledLayersForNetwork(newNetwork)[0])
+    setSelectedLayer(targetLayer)
   }
   const handleConfirm = () => onConfirm(selectedNetwork, selectedLayer)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Do not change runtime to Emerald when switching network