From 040dae8920f454b64cbd2785b8729f68c7db8592 Mon Sep 17 00:00:00 2001
From: Victor Oliva <v.oliva@proton.me>
Date: Fri, 7 Aug 2026 11:45:37 +0200
Subject: [PATCH] fix: use selected runtime types on runtime and viewFn queries
 (#177)

---
 src/codec-components/LookupTypeEdit/LookupTypeEdit.tsx | 7 ++++---
 src/pages/RuntimeCalls/RuntimeCallQuery.tsx            | 7 +++++--
 src/pages/ViewFns/ViewFnQuery.tsx                      | 7 +++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/codec-components/LookupTypeEdit/LookupTypeEdit.tsx b/src/codec-components/LookupTypeEdit/LookupTypeEdit.tsx
index 4421800..a980078 100644
--- a/src/codec-components/LookupTypeEdit/LookupTypeEdit.tsx
+++ b/src/codec-components/LookupTypeEdit/LookupTypeEdit.tsx
@@ -1,4 +1,5 @@
-import { runtimeCtx$ } from "@/state/chains/chain.state"
+import { cn } from "@/lib/utils"
+import { selectedBlock$ } from "@/pages/Storage/BlockPicker"
 import { byteArraysAreEqual } from "@/utils/byteArray"
 import {
   CodecComponentType,
@@ -20,10 +21,10 @@ import { EditCodec } from "../EditCodec"
 import { TreeCodec } from "../EditCodec/Tree"
 import { BinaryDisplay } from "./BinaryDisplay"
 import { FocusPath } from "./FocusPath"
-import { cn } from "@/lib/utils"
 
 const editTypeMetadataProps$ = state(
-  runtimeCtx$.pipe(
+  selectedBlock$.pipe(
+    map(({ ctx }) => ctx),
     map(({ dynamicBuilder, lookup }) => ({
       builder: dynamicBuilder,
       metadata: lookup.metadata,
diff --git a/src/pages/RuntimeCalls/RuntimeCallQuery.tsx b/src/pages/RuntimeCalls/RuntimeCallQuery.tsx
index 7911fd9..d6b3435 100644
--- a/src/pages/RuntimeCalls/RuntimeCallQuery.tsx
+++ b/src/pages/RuntimeCalls/RuntimeCallQuery.tsx
@@ -5,7 +5,7 @@ import {
 import { ActionButton } from "@/components/ActionButton"
 import { ExpandBtn } from "@/components/Expand"
 import { useNavigate } from "@/hashParams"
-import { client$, dynamicBuilder$, lookup$ } from "@/state/chains/chain.state"
+import { client$, dynamicBuilder$ } from "@/state/chains/chain.state"
 import { getTypeComplexity } from "@/utils/shape"
 import { state, useStateObservable, withDefault } from "@react-rxjs/core"
 import { createSignal } from "@react-rxjs/utils"
@@ -141,7 +141,10 @@ const inputValue$ = state(
   (idx: number) => inputValues$.pipe(map((v) => v[idx])),
   null,
 )
-const lookupState$ = state(lookup$, null)
+const lookupState$ = state(
+  selectedBlock$.pipe(map(({ ctx }) => ctx.lookup)),
+  null,
+)
 const RuntimeValueInput: FC<{ idx: number; name: string; type: number }> = ({
   idx,
   type,
diff --git a/src/pages/ViewFns/ViewFnQuery.tsx b/src/pages/ViewFns/ViewFnQuery.tsx
index cd2e760..1a27572 100644
--- a/src/pages/ViewFns/ViewFnQuery.tsx
+++ b/src/pages/ViewFns/ViewFnQuery.tsx
@@ -5,7 +5,7 @@ import {
 import { ActionButton } from "@/components/ActionButton"
 import { ExpandBtn } from "@/components/Expand"
 import { useNavigate } from "@/hashParams"
-import { client$, dynamicBuilder$, lookup$ } from "@/state/chains/chain.state"
+import { client$, dynamicBuilder$ } from "@/state/chains/chain.state"
 import { getTypeComplexity } from "@/utils/shape"
 import { state, useStateObservable, withDefault } from "@react-rxjs/core"
 import { createSignal } from "@react-rxjs/utils"
@@ -138,7 +138,10 @@ const inputValue$ = state(
   (idx: number) => inputValues$.pipe(map((v) => v[idx])),
   null,
 )
-const lookupState$ = state(lookup$, null)
+const lookupState$ = state(
+  selectedBlock$.pipe(map(({ ctx }) => ctx.lookup)),
+  null,
+)
 const RuntimeValueInput: FC<{ idx: number; name: string; type: number }> = ({
   idx,
   type,