Compare commits

..

2 Commits

Author SHA1 Message Date
8663e85c5c App: show lightning address
Some formatting fixes also sneaked in.
2021-09-24 05:28:10 +03:00
ae70ec80b1 Payways: UA card max to 20000 uah 2021-09-09 19:18:52 +03:00
2 changed files with 67 additions and 44 deletions

@ -55,6 +55,9 @@
$: autoMemo = genAutoMemo(payway, $: autoMemo = genAutoMemo(payway,
accountComplete && accounts[inputId], accountComplete && accounts[inputId],
realAmount) realAmount)
let lightningAddress;
$: lightningAddress = accountComplete ?
genAddress(payway, accounts[inputId], realAmount):""
function lnurlEncode(url) { function lnurlEncode(url) {
return bech32.encode("LNURL", return bech32.encode("LNURL",
@ -66,6 +69,16 @@
return ('0' + (byte & 0xFF).toString(16)).slice(-2); return ('0' + (byte & 0xFF).toString(16)).slice(-2);
}).join('') }).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) { function genLNURL(payway,account,amount,memo) {
let params = new URLSearchParams(); let params = new URLSearchParams();
@ -163,7 +176,6 @@
<input bind:value={memo} placeholder="{autoMemo}" <input bind:value={memo} placeholder="{autoMemo}"
class="form-control"/> class="form-control"/>
</label> </label>
</SiteCard> </SiteCard>
<SiteCard> <SiteCard>
{#if lnurl} {#if lnurl}
@ -177,45 +189,56 @@
<div class="form-text mb-2 mt-2">Expecting: {payway.acc.toLowerCase()}</div> <div class="form-text mb-2 mt-2">Expecting: {payway.acc.toLowerCase()}</div>
{/if} {/if}
<div class="d-flex justify-content-center align-items-stretch m-2" <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}>
<CTC let:id let:action text={lnurl}>
<button type="button" class="btn btn-outline-secondary"
id={id} on:click={action}>Copy</button>
</CTC>
{#if canShare}
<button type="button" class="btn btn-outline-secondary"
on:click={()=>{ navigator.share({text:lnurl})}}>Share
</button>
{/if}
<Tipped let:id>
<a slot="thing" role="button" class="btn btn-outline-secondary"
href="lightning:{lnurl}" {id}>Pay</a>
<div slot="tip">open in your wallet</div>
</Tipped>
<div class="d-flex justify-content-center align-items-stretch" <Tipped let:id>
class:invisible={!lnurl}> <button slot="thing" {id} type="button"
<p class="form-text">You might want to save image and share it class="btn btn-outline-secondary"
as you like. All form data are present in lnurl: don't share what you wanted to hide.</p> on:click="{()=>getInvoiceFor=lnurl}">
</div> Invoice</button>
<div slot="tip">get an invoice for wallets with no lnurl-pay</div>
</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}
<div class="btn-group flex-wrap mt-auto mb-2"
role="group" class:invisible={!lnurl}>
<CTC let:id let:action text={lnurl}>
<button type="button" class="btn btn-outline-secondary"
id={id} on:click={action}>Copy</button>
</CTC>
{#if canShare}
<button type="button" class="btn btn-outline-secondary"
on:click={()=>{ navigator.share({text:lnurl})}}>Share
</button>
{/if}
<Tipped let:id>
<a slot="thing" role="button" class="btn btn-outline-secondary"
href="lightning:{lnurl}" {id}>Pay</a>
<div slot="tip">open in your wallet</div>
</Tipped>
<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> </SiteCard>
</SiteDeck> </SiteDeck>

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