src/App.svelte

@@ -6,7 +6,7 @@
   import SiteCard from './SiteCard.svelte';
   import SiteDeck from './SiteDeck.svelte';
   import InputMask from './InputMask.svelte';
-
+  
   import payways from './payways.js';
   import QR from './QR.svelte';
 
@@ -19,7 +19,7 @@
   import PayFlow from './PayFlow.svelte';
 
   let payway = payways[0];
-
+  
   setTimeout(()=>{
     payway = payways[0];
     accounts[inputId]=null;
@@ -55,30 +55,17 @@
   $: autoMemo = genAutoMemo(payway,
 			    accountComplete && accounts[inputId],
 			    realAmount)
-  let lightningAddress;
-  $: lightningAddress = accountComplete ?
-  genAddress(payway, accounts[inputId], realAmount):""
 
   function lnurlEncode(url) {
     return bech32.encode("LNURL",
 			 bech32.toWords(UTF8.setBytesFromString(url)),2048)
   }
-
+  
   function toHexString(byteArray) {
     return Array.from(byteArray, function(byte) {
       return ('0' + (byte & 0xFF).toString(16)).slice(-2);
     }).join('')
   }
-  function genAddress(payway,account,amount) {
-    if (!account || !payway)
-      return ""
-    const prefix = amount?
-	  ((amount == Math.floor(amount)? ""+amount:
-	    amount.toFixed(2))+payway.currency.toLowerCase()+"-"):""
-    if (account[0]=='+')
-      account=account.slice(1)
-    return prefix + account + "@" + payway.id + ".lnurl-pay.me"
-  }
 
   function genLNURL(payway,account,amount,memo) {
     let params = new URLSearchParams();
@@ -138,7 +125,7 @@
 
     {#key payway}
     <label class="form-label mb-3">{payway.acc}
-      <InputMask
+      <InputMask 
 	unmask
 	bind:value={accounts[inputId]}
 	bind:isComplete={accountComplete}
@@ -176,6 +163,7 @@
       <input bind:value={memo} placeholder="{autoMemo}"
 	     class="form-control"/>
     </label>
+
   </SiteCard>
   <SiteCard>
     {#if lnurl}
@@ -189,56 +177,45 @@
       <div class="form-text mb-2 mt-2">Expecting: {payway.acc.toLowerCase()}</div>
     {/if}
     <div class="d-flex justify-content-center align-items-stretch m-2"
-	 class:invisible={!lnurl}>
+	   class:invisible={!lnurl}>
-      <!-- {#key lnurl} -->
+	<!-- {#key lnurl} -->
-      <a href="lightning:{lnurl}">
+	<a href="lightning:{lnurl}">
-	<QR value={lnurl} size="{230}" />
+	  <QR value={lnurl} size="{230}" />
-      </a>
+	</a>
-      <!-- {/key} -->
+	<!-- {/key} -->
-    </div>
+      </div>
-    <div class="btn-group flex-wrap mt-auto mb-2"
+      
-	 role="group" class:invisible={!lnurl}>
+      <div class="d-flex justify-content-center align-items-stretch"
-      <CTC let:id let:action text={lnurl}>
+	   class:invisible={!lnurl}>
-	<button type="button" class="btn btn-outline-secondary"
+	<p class="form-text">You might want to save image and share it
-		id={id} on:click={action}>Copy</button>
+	as you like. All form data are present in lnurl: don't share what you wanted to hide.</p>
-      </CTC>
+      </div>
-      {#if canShare}
+      
-	<button type="button" class="btn btn-outline-secondary"
+      <div class="btn-group flex-wrap mt-auto mb-2"
-		on:click={()=>{  navigator.share({text:lnurl})}}>Share
+	   role="group" class:invisible={!lnurl}>
-	</button>
+	<CTC let:id let:action text={lnurl}>
-      {/if}
+	  <button type="button" class="btn btn-outline-secondary"
-      <Tipped let:id>
+		  id={id} on:click={action}>Copy</button>
-	<a slot="thing" role="button" class="btn btn-outline-secondary"
+	</CTC>
-	   href="lightning:{lnurl}" {id}>Pay</a>
+	{#if canShare}
-	<div slot="tip">open in your wallet</div>
+	  <button type="button" class="btn btn-outline-secondary"
-      </Tipped>
+		  on:click={()=>{  navigator.share({text:lnurl})}}>Share
-
+	  </button>
-      <Tipped let:id>
+	{/if}
-	<button slot="thing" {id} type="button"
+	<Tipped let:id>
-		class="btn btn-outline-secondary"
+	  <a slot="thing" role="button" class="btn btn-outline-secondary"
-		on:click="{()=>getInvoiceFor=lnurl}">
+	     href="lightning:{lnurl}" {id}>Pay</a>
-	  Invoice</button>
+	  <div slot="tip">open in your wallet</div>
-	<div slot="tip">get an invoice for wallets with no lnurl-pay</div>
+	</Tipped>
-      </Tipped>
-    </div>
-
-    {#if lightningAddress}
-      <CTC let:id let:action force text={lightningAddress}}>
-	<div class="input-group mt-3">
-	  <div class="input-group-prepend">
-	    <span class="input-group-text">
-	      <a href="https://lightningaddress.com/">Lightning address:</a>
-	    </span>
-	  </div>
-	  <div class="user-select-all form-control"
-	       style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
-	       on:click={action} id={id}>{lightningAddress}
-	  </div>
-	</div>
-      </CTC>
-    {/if}
-
 
+	<Tipped let:id>
+	  <button slot="thing" {id} type="button"
+		  class="btn btn-outline-secondary"
+		  on:click="{()=>getInvoiceFor=lnurl}">
+	    Invoice</button>
+	  <div slot="tip">get an invoice for wallets with no lnurl-pay</div>
+	</Tipped>
+      </div>
   </SiteCard>
 </SiteDeck>
 

src/payways.js

@@ -77,7 +77,7 @@ export default [
   {"name":"💳 🇺🇦 UAH ₴ Visa/MC",
    "currency":"UAH",
    "min":10,
-   "max":20000,
+   "max":5000,
    "imask":masks.cc,
    "iid":"cc",
    "acc":"Card number",