fix: replace zap slider with common amount pills
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
<script lang="ts">
|
||||
import cx from "classnames"
|
||||
import {first} from "@welshman/lib"
|
||||
import type {NativeEmoji} from "emoji-picker-element/shared"
|
||||
import {signer, deriveZapperForPubkey} from "@welshman/app"
|
||||
import {load} from "@welshman/net"
|
||||
@@ -20,6 +22,7 @@
|
||||
import {errorMessage} from "@lib/util"
|
||||
import ProfileLink from "@app/components/ProfileLink.svelte"
|
||||
import {payInvoice} from "@app/lightning"
|
||||
import {zapAmounts} from "@app/settings"
|
||||
import {pushToast} from "@app/toast"
|
||||
|
||||
type Props = {
|
||||
@@ -30,31 +33,14 @@
|
||||
|
||||
const {url, pubkey, eventId}: Props = $props()
|
||||
|
||||
const minPos = 1
|
||||
const maxPos = 1000
|
||||
const minVal = 21
|
||||
const maxVal = 1000000
|
||||
const zapperStore = deriveZapperForPubkey(pubkey)
|
||||
|
||||
const posToAmount = (pos: number) => {
|
||||
const normalizedPos = (pos - minPos) / (maxPos - minPos)
|
||||
const logMin = Math.log(minVal)
|
||||
const logMax = Math.log(maxVal)
|
||||
const logValue = logMin + normalizedPos * (logMax - logMin)
|
||||
return Math.round(Math.exp(logValue))
|
||||
}
|
||||
|
||||
const amountToPos = (amount: number) => {
|
||||
const clampedAmount = Math.max(minVal, Math.min(maxVal, amount))
|
||||
const logMin = Math.log(minVal)
|
||||
const logMax = Math.log(maxVal)
|
||||
const logValue = Math.log(clampedAmount)
|
||||
const normalizedPos = (logValue - logMin) / (logMax - logMin)
|
||||
return Math.round(minPos + normalizedPos * (maxPos - minPos))
|
||||
}
|
||||
|
||||
const back = () => history.back()
|
||||
|
||||
const selectAmount = (preset: number) => {
|
||||
amount = preset
|
||||
}
|
||||
|
||||
const onEmoji = (emoji: NativeEmoji) => {
|
||||
content = emoji.unicode
|
||||
}
|
||||
@@ -97,21 +83,9 @@
|
||||
}
|
||||
}
|
||||
|
||||
let pos = $state(minPos)
|
||||
let amount = $state(minVal)
|
||||
let amount = $state<number>(first($zapAmounts) ?? 21)
|
||||
let content = $state("⚡️")
|
||||
let loading = $state(false)
|
||||
|
||||
$effect(() => {
|
||||
amount = posToAmount(pos)
|
||||
})
|
||||
|
||||
$effect(() => {
|
||||
const newPos = amountToPos(amount)
|
||||
if (newPos !== pos) {
|
||||
pos = newPos
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<Modal>
|
||||
@@ -145,12 +119,15 @@
|
||||
</div>
|
||||
{/snippet}
|
||||
</FieldInline>
|
||||
<input
|
||||
class="range range-primary -mt-2"
|
||||
type="range"
|
||||
min={minPos}
|
||||
max={maxPos}
|
||||
bind:value={pos} />
|
||||
<div class="flex flex-wrap justify-end gap-2">
|
||||
{#each $zapAmounts as preset}
|
||||
<Button
|
||||
class={cx("btn btn-sm rounded-full", preset === amount ? "btn-primary" : "btn-neutral")}
|
||||
onclick={() => selectAmount(preset)}>
|
||||
{preset}
|
||||
</Button>
|
||||
{/each}
|
||||
</div>
|
||||
</ModalBody>
|
||||
<ModalFooter>
|
||||
<Button class="btn btn-link" onclick={back}>
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<script lang="ts">
|
||||
import {onDestroy} from "svelte"
|
||||
import cx from "classnames"
|
||||
import {first} from "@welshman/lib"
|
||||
import type {NativeEmoji} from "emoji-picker-element/shared"
|
||||
import {signer, deriveZapperForPubkey} from "@welshman/app"
|
||||
import {request} from "@welshman/net"
|
||||
@@ -24,6 +26,7 @@
|
||||
import QRCode from "@app/components/QRCode.svelte"
|
||||
import WalletConnect from "@app/components/WalletConnect.svelte"
|
||||
import {pushModal} from "@app/modal"
|
||||
import {zapAmounts} from "@app/settings"
|
||||
import {clip, pushToast} from "@app/toast"
|
||||
|
||||
type Props = {
|
||||
@@ -34,31 +37,14 @@
|
||||
|
||||
const {url, pubkey, eventId}: Props = $props()
|
||||
|
||||
const minPos = 1
|
||||
const maxPos = 1000
|
||||
const minVal = 21
|
||||
const maxVal = 1000000
|
||||
const zapperStore = deriveZapperForPubkey(pubkey)
|
||||
|
||||
const posToAmount = (pos: number) => {
|
||||
const normalizedPos = (pos - minPos) / (maxPos - minPos)
|
||||
const logMin = Math.log(minVal)
|
||||
const logMax = Math.log(maxVal)
|
||||
const logValue = logMin + normalizedPos * (logMax - logMin)
|
||||
return Math.round(Math.exp(logValue))
|
||||
}
|
||||
|
||||
const amountToPos = (amount: number) => {
|
||||
const clampedAmount = Math.max(minVal, Math.min(maxVal, amount))
|
||||
const logMin = Math.log(minVal)
|
||||
const logMax = Math.log(maxVal)
|
||||
const logValue = Math.log(clampedAmount)
|
||||
const normalizedPos = (logValue - logMin) / (logMax - logMin)
|
||||
return Math.round(minPos + normalizedPos * (maxPos - minPos))
|
||||
}
|
||||
|
||||
const back = () => history.back()
|
||||
|
||||
const selectAmount = (preset: number) => {
|
||||
amount = preset
|
||||
}
|
||||
|
||||
const onEmoji = (emoji: NativeEmoji) => {
|
||||
content = emoji.unicode
|
||||
}
|
||||
@@ -120,8 +106,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
let pos = $state(minPos)
|
||||
let amount = $state(minVal)
|
||||
let amount = $state<number>(first($zapAmounts) ?? 21)
|
||||
let content = $state("⚡️")
|
||||
let loading = $state(false)
|
||||
let invoice = $state<string>()
|
||||
@@ -130,17 +115,6 @@
|
||||
onDestroy(() => {
|
||||
paymentController?.abort()
|
||||
})
|
||||
|
||||
$effect(() => {
|
||||
amount = posToAmount(pos)
|
||||
})
|
||||
|
||||
$effect(() => {
|
||||
const newPos = amountToPos(amount)
|
||||
if (newPos !== pos) {
|
||||
pos = newPos
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<Modal>
|
||||
@@ -189,12 +163,15 @@
|
||||
</div>
|
||||
{/snippet}
|
||||
</FieldInline>
|
||||
<input
|
||||
class="range range-primary -mt-2"
|
||||
type="range"
|
||||
min={minPos}
|
||||
max={maxPos}
|
||||
bind:value={pos} />
|
||||
<div class="flex flex-wrap justify-end gap-2">
|
||||
{#each $zapAmounts as preset}
|
||||
<Button
|
||||
class={cx("btn btn-sm rounded-full", preset === amount ? "btn-primary" : "btn-neutral")}
|
||||
onclick={() => selectAmount(preset)}>
|
||||
{preset}
|
||||
</Button>
|
||||
{/each}
|
||||
</div>
|
||||
<p class="card2 card-sm bg-alt text-center flex justify-between items-center">
|
||||
Want to zap directly?
|
||||
<Button class="btn btn-neutral btn-sm" onclick={connectWallet}>
|
||||
|
||||
@@ -37,6 +37,7 @@ export type SettingsValues = {
|
||||
send_delay: number
|
||||
font_size: number
|
||||
alerts: SpaceNotificationSettings[]
|
||||
zap_amounts: number[]
|
||||
}
|
||||
|
||||
export type Settings = {
|
||||
@@ -54,6 +55,7 @@ export const defaultSettings: SettingsValues = {
|
||||
send_delay: 0,
|
||||
font_size: 1.1,
|
||||
alerts: [],
|
||||
zap_amounts: [21, 210, 2100, 21000],
|
||||
}
|
||||
|
||||
export const settingsByPubkey = deriveItemsByKey({
|
||||
@@ -80,6 +82,8 @@ export const loadUserSettings = makeUserLoader(loadSettings)
|
||||
|
||||
export const userSettingsValues = derived(userSettings, $s => $s?.values || defaultSettings)
|
||||
|
||||
export const zapAmounts = derived(userSettingsValues, $settings => $settings.zap_amounts)
|
||||
|
||||
export const getSettings = getter(userSettingsValues)
|
||||
|
||||
export const getSetting = <T>(key: keyof Settings["values"]) => getSettings()[key] as T
|
||||
|
||||
Reference in New Issue
Block a user