From cf6380a2a645aa82cb7fc9b8126e084aecce69c5 Mon Sep 17 00:00:00 2001
From: userAdityaa <aditya.chaudhary1558@gmail.com>
Date: Tue, 9 Jun 2026 11:29:18 +0530
Subject: [PATCH] fix: replace zap slider with common amount pills

---
 src/app/components/Zap.svelte        | 56 ++++++++--------------------
 src/app/components/ZapInvoice.svelte | 56 ++++++++--------------------
 2 files changed, 32 insertions(+), 80 deletions(-)

diff --git a/src/app/components/Zap.svelte b/src/app/components/Zap.svelte
index 56aa79a2..6559a6c0 100644
--- a/src/app/components/Zap.svelte
+++ b/src/app/components/Zap.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import cx from "classnames"
   import type {NativeEmoji} from "emoji-picker-element/shared"
   import {signer, deriveZapperForPubkey} from "@welshman/app"
   import {load} from "@welshman/net"
@@ -30,31 +31,15 @@
 
   const {url, pubkey, eventId}: Props = $props()
 
-  const minPos = 1
-  const maxPos = 1000
-  const minVal = 21
-  const maxVal = 1000000
+  const zapAmounts = [21, 100, 1000, 10000]
   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 +82,9 @@
     }
   }
 
-  let pos = $state(minPos)
-  let amount = $state(minVal)
+  let amount = $state(zapAmounts[0])
   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 +118,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}>
diff --git a/src/app/components/ZapInvoice.svelte b/src/app/components/ZapInvoice.svelte
index f11f71c0..52b75231 100644
--- a/src/app/components/ZapInvoice.svelte
+++ b/src/app/components/ZapInvoice.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import {onDestroy} from "svelte"
+  import cx from "classnames"
   import type {NativeEmoji} from "emoji-picker-element/shared"
   import {signer, deriveZapperForPubkey} from "@welshman/app"
   import {request} from "@welshman/net"
@@ -34,31 +35,15 @@
 
   const {url, pubkey, eventId}: Props = $props()
 
-  const minPos = 1
-  const maxPos = 1000
-  const minVal = 21
-  const maxVal = 1000000
+  const zapAmounts = [21, 100, 1000, 10000]
   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 +105,7 @@
     }
   }
 
-  let pos = $state(minPos)
-  let amount = $state(minVal)
+  let amount = $state(zapAmounts[0])
   let content = $state("⚡️")
   let loading = $state(false)
   let invoice = $state<string>()
@@ -130,17 +114,6 @@
   onDestroy(() => {
     paymentController?.abort()
   })
-
-  $effect(() => {
-    amount = posToAmount(pos)
-  })
-
-  $effect(() => {
-    const newPos = amountToPos(amount)
-    if (newPos !== pos) {
-      pos = newPos
-    }
-  })
 </script>
 
 <Modal>
@@ -189,12 +162,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}>