Skip to content

Commit d9bbdd0

Browse files
committed
fix(app2): cleanup approval page
1 parent fb1136c commit d9bbdd0

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

app2/src/lib/components/Transfer/pages/ApprovalPage.svelte

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import Button from "$lib/components/ui/Button.svelte"
33
import TokenComponent from "$lib/components/model/TokenComponent.svelte"
4-
import { Effect, Match, Option } from "effect"
4+
import { Effect, Match, Option, Array, Struct } from "effect"
55
import { lockedTransferStore } from "../locked-transfer.svelte.ts"
66
import { ApprovalRequired } from "../transfer-step.ts"
77
import { createViemPublicClient } from "@unionlabs/sdk/evm"
@@ -20,6 +20,7 @@ import {
2020
} from "$lib/components/Transfer/state/cosmos.ts"
2121
import { getWalletClient } from "$lib/services/evm/clients.ts"
2222
import Label from "$lib/components/ui/Label.svelte"
23+
import { is } from "../transfer-step.ts"
2324
2425
type Props = {
2526
stepIndex: number
@@ -32,18 +33,15 @@ const { stepIndex, onBack, onApprove, actionButtonText }: Props = $props()
3233
3334
const lts = lockedTransferStore.get()
3435
35-
// Get the step data from the locked transfer store
36-
const step: Option.Option<ReturnType<typeof ApprovalRequired>> = $derived.by(() => {
37-
if (Option.isNone(lts)) return Option.none()
38-
39-
const steps = lts.value.steps
40-
if (stepIndex < 0 || stepIndex >= steps.length) return Option.none()
41-
42-
const step = steps[stepIndex]
43-
return step._tag === "ApprovalRequired" ? Option.some(step) : Option.none()
44-
})
36+
const step = $derived(
37+
lts.pipe(
38+
Option.map(Struct.get("steps")),
39+
Option.flatMap(Array.get(stepIndex)),
40+
Option.filter(is("ApprovalRequired"))
41+
)
42+
)
4543
46-
const sourceChain = $derived(lts.pipe(Option.map(ltss => ltss.sourceChain)))
44+
const sourceChain = $derived(lts.pipe(Option.map(Struct.get("sourceChain"))))
4745
4846
let ets = $state<TransactionSubmissionEvm>(TransactionSubmissionEvm.Filling())
4947
let cts = $state<TransactionSubmissionCosmos>(TransactionSubmissionCosmos.Filling())

0 commit comments

Comments
 (0)