fix(app2): move effects

Author: Swepool

app2/src/lib/components/Transfer/index.svelte

@@ -18,83 +18,7 @@ import {
   isComplete as isAptosComplete
 } from "$lib/services/transfer-ucs03-aptos"
 import ChainAsset from "$lib/components/Transfer/ChainAsset/index.svelte"
-import { balancesStore } from "$lib/stores/balances.svelte.ts"
-import { wallets } from "$lib/stores/wallets.svelte.ts"
-import { Effect, Fiber, Option } from "effect"
-import { tokensStore } from "$lib/stores/tokens.svelte.ts"
 
-$effect(() => {
-  transfer.getQuoteToken()
-  transfer.getWethQuoteToken()
- 
-})
-
-$effect(() => {
-  if (Option.isSome(transfer.sourceChain)) {
-    tokensStore.fetchTokens(transfer.sourceChain.value.universal_chain_id)
-  }
-})
-
-// Keep track of current fiber and chain
-let currentFetchFiber = $state<Fiber.RuntimeFiber<void, never> | null>(null)
-let currentChainId = $state<string | null>(null)
-let lastFetchKey = $state("")
-
-$effect(() => {
-  // Get the current source chain
-  const sourceChain = Option.getOrNull(transfer.sourceChain)
-
-  // If the chain changed, interrupt the existing fiber
-  if (sourceChain?.universal_chain_id !== currentChainId) {
-    if (currentFetchFiber) {
-      console.log(`Interrupting fiber for chain: ${currentChainId}`)
-      Effect.runPromise(Fiber.interrupt(currentFetchFiber))
-      currentFetchFiber = null
-    }
-
-    // Update the current chain ID
-    currentChainId = sourceChain?.universal_chain_id || null
-
-    // Reset the lastFetchKey when changing chains
-    lastFetchKey = ""
-  }
-
-  // Exit if no source chain
-  if (!sourceChain) return
-
-  // Check for wallet address
-  const addressOption = wallets.getAddressForChain(sourceChain)
-  if (!Option.isSome(addressOption)) return
-
-  const address = addressOption.value
-
-  // Get tokens data
-  const tokensOption = tokensStore.data.get(sourceChain.universal_chain_id) ?? Option.none()
-
-  // Only proceed if we have tokens
-  if (!Option.isSome(tokensOption)) return
-
-  // Create a unique key for this combination of chain + address
-  const fetchKey = `${sourceChain.universal_chain_id}:${address}`
-
-  // Check if we need to fetch new balances
-  if (fetchKey !== lastFetchKey) {
-    const tokens = tokensOption.value
-    const denoms = tokens.map(token => token.denom)
-
-    // Get the chainKey to access the fiber from balancesStore
-    const chainKey = `${sourceChain.universal_chain_id}:${address}` as const
-
-    // Fetch balances for all tokens
-    balancesStore.fetchBalances(sourceChain, address, denoms)
-
-    // Store the new fiber reference
-    currentFetchFiber = balancesStore.chainFibers.get(chainKey) || null
-
-    // Update the last fetch key
-    lastFetchKey = fetchKey
-  }
-})
 function getStatus(
   state: TransferStateUnion
 ): "empty" | "filling" | "processing" | "failed" | "complete" {

app2/src/routes/transfer/+layout.svelte

@@ -0,0 +1,50 @@
+<script lang="ts">
+import { transfer } from "$lib/components/Transfer/transfer.svelte.ts"
+import { Option } from "effect"
+import { tokensStore } from "$lib/stores/tokens.svelte.ts"
+import { wallets } from "$lib/stores/wallets.svelte.ts"
+import { balancesStore } from "$lib/stores/balances.svelte.ts"
+
+let { children } = $props()
+
+$effect(() => {
+  transfer.getQuoteToken()
+  transfer.getWethQuoteToken()
+})
+
+$effect(() => {
+  if (Option.isSome(transfer.sourceChain)) {
+    tokensStore.fetchTokens(transfer.sourceChain.value.universal_chain_id)
+  }
+})
+
+let lastFetchKey = $state("")
+
+$effect(() => {
+  if (Option.isNone(transfer.sourceChain)) return
+
+  const sourceChain = transfer.sourceChain.value
+
+  const addressOption = wallets.getAddressForChain(sourceChain)
+  if (Option.isNone(addressOption)) return
+
+  const address = addressOption.value
+
+  const tokensOption = tokensStore.data.get(sourceChain.universal_chain_id) ?? Option.none()
+  if (Option.isNone(tokensOption)) return
+
+  const fetchKey = `${sourceChain.universal_chain_id}:${address}`
+
+  if (fetchKey !== lastFetchKey) {
+    const tokens = tokensOption.value
+    const denoms = tokens.map(token => token.denom)
+
+    balancesStore.fetchBalances(sourceChain, address, denoms)
+    lastFetchKey = fetchKey
+  }
+})
+</script>
+
+{@render children()}
+
+