Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transfer improvements #4072

Merged
merged 23 commits into from
Mar 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 116 additions & 33 deletions app2/src/lib/components/Transfer/Amount.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,120 @@
import Input from "$lib/components/ui/Input.svelte"
import { transfer } from "$lib/components/Transfer/transfer.svelte.ts"
import { Option } from "effect"
import { formatUnits } from "viem"
import Skeleton from "$lib/components/ui/Skeleton.svelte"
import { wallets } from "$lib/stores/wallets.svelte.ts"

let chainWallet = $derived.by(() => {
if (Option.isSome(transfer.sourceChain)) {
return wallets.getAddressForChain(transfer.sourceChain.value)
}
return Option.none()
})

function allDataReadyForBalance() {
return (
Option.isSome(transfer.sourceChain) &&
Option.isSome(transfer.baseToken) &&
Option.isSome(transfer.baseTokenBalance) &&
Option.isSome(transfer.baseTokenBalance.value.balance)
)
}

let displayBalance = $derived.by(() => {
if (
Option.isSome(transfer.sourceChain) &&
Option.isSome(transfer.baseToken) &&
Option.isSome(transfer.baseTokenBalance)
) {
const bal = transfer.baseTokenBalance.value.balance
if (Option.isSome(bal)) {
const baseToken = transfer.baseToken.value
const decimals = baseToken.representations[0]?.decimals ?? 0
const raw = bal.value
return formatUnits(BigInt(raw), decimals)
}
}
return "" // Not loaded yet
})

function setMaxAmount() {
if (Option.isNone(transfer.baseToken)) return
if (Option.isNone(transfer.baseTokenBalance)) return
if (Option.isNone(transfer.baseTokenBalance.value.balance)) return

const baseToken = transfer.baseToken.value
const decimals = baseToken.representations[0]?.decimals ?? 0

const rawBalance = transfer.baseTokenBalance.value.balance.value
const formattedAmount = formatUnits(BigInt(rawBalance), decimals)

transfer.raw.amount = formattedAmount

const inputElement = document.getElementById("amount") as HTMLInputElement
if (inputElement) {
inputElement.value = formattedAmount
inputElement.dispatchEvent(new Event("input", { bubbles: true }))
}
}
</script>
<Input id="amount"
label="amount"
type="text"
required={true}
disabled={!transfer.raw.asset}
autocorrect="off"
placeholder="0.00"
spellcheck="false"
autocomplete="off"
inputmode="decimal"
data-field="amount"
autocapitalize="none"
pattern="^[0-9]*[.]?[0-9]*$"
value={transfer.raw.amount}
oninput={(event) => {
const input = event.currentTarget;
const value = input.value;
const maxDecimals = Option.isSome(transfer.baseToken)
? (transfer.baseToken.value.representations[0]?.decimals ?? 0)
: 0;

if (value === '' || (/^\d*\.?\d*$/.test(value) &&
(value.includes('.')
? value.split('.')[1].length <= maxDecimals
: true)
)) {
transfer.raw.updateField('amount', event);
} else {
input.value = transfer.raw.amount;
}
}}
class="text-center"
/>

<!-- AMOUNT INPUT -->
<Input
id="amount"
label="amount"
type="text"
required
disabled={!transfer.raw.asset}
autocorrect="off"
placeholder="0.00"
spellcheck="false"
autocomplete="off"
inputmode="decimal"
data-field="amount"
autocapitalize="none"
pattern="^[0-9]*[.]?[0-9]*$"
value={transfer.raw.amount}
oninput={(event) => {
const input = event.currentTarget
const value = input.value

const maxDecimals = Option.isSome(transfer.baseToken)
? transfer.baseToken.value.representations[0]?.decimals ?? 0
: 0

if (
value === '' ||
(
/^\d*\.?\d*$/.test(value) &&
(!value.includes('.') || value.split('.')[1].length <= maxDecimals)
)
) {
transfer.raw.updateField('amount', event)
} else {
input.value = transfer.raw.amount
}
}}
class="text-center"
/>

<div class="flex w-full justify-between text-xs">
<p>
BALANCE:
{#if Option.isSome(chainWallet)}
{#if !transfer.raw.source || !transfer.raw.asset}
0
{:else if !allDataReadyForBalance()}
<Skeleton class="h-3 w-16 inline-block"/>
{:else}
{displayBalance}
{/if}
{/if}
</p>
<button
class="cursor-pointer hover:underline"
onclick={setMaxAmount}
>
USE MAX
</button>
</div>
128 changes: 0 additions & 128 deletions app2/src/lib/components/Transfer/Assets.svelte

This file was deleted.

82 changes: 0 additions & 82 deletions app2/src/lib/components/Transfer/Chain.svelte

This file was deleted.

Loading