diff options
| author | Adam Soltys <[email protected]> | 2023-03-24 21:49:32 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2023-03-24 21:49:32 -0700 |
| commit | 6484736e1a69ff1d29143d0c79f6a6de3898289f (patch) | |
| tree | 3a7fdd4422381113dc6564b0cc2d28840b538178 /src | |
| parent | 095b3cf78004305ba25d2fa358d9362d5ca84b62 (diff) | |
| download | coinos-ui-6484736e1a69ff1d29143d0c79f6a6de3898289f.tar.gz coinos-ui-6484736e1a69ff1d29143d0c79f6a6de3898289f.zip | |
show tip percent
Diffstat (limited to 'src')
| -rw-r--r-- | src/routes/(app)/[username]/(profile)/+layout.svelte | 42 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/payments/[...page]/+page.svelte | 11 | ||||
| -rw-r--r-- | src/routes/(app)/payment/[id]/+page.svelte | 3 |
3 files changed, 22 insertions, 34 deletions
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index bbb2379e..d807e75b 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -116,6 +116,22 @@ </div> {/if} + {#if !subject.anon && subject.username !== user?.username} + <div class="w-full flex"> + <a + href={user ? `/send/${subject.username}` : `/${subject.username}/receive`} + class="mx-auto" + > + <button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"> + <div class="mx-auto flex"> + <Icon icon="send" style="mr-2" /> + <div class="mt-1">{$t('user.pay')}</div> + </div> + </button> + </a> + </div> + {/if} + <div class="w-full flex"> <a href={`/${subject.username}/messages`} class="mx-auto"> <button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"> @@ -126,32 +142,6 @@ </button> </a> </div> - - <div class="w-full flex"> - <a href={`/${subject.username}/request`} class="mx-auto"> - <button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"> - <div class="mx-auto flex"> - <Icon icon="numpad" style="mr-2 my-auto" /> - <div class="mt-1 my-auto">{$t('payments.requestAnInvoice')}</div> - </div> - </button> - </a> - </div> - {/if} - {#if !subject.anon && subject.username !== user?.username} - <div class="w-full flex"> - <a - href={user ? `/send/${subject.username}` : `/${subject.username}/receive`} - class="mx-auto" - > - <button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"> - <div class="mx-auto flex"> - <Icon icon="send" style="mr-2" /> - <div class="mt-1">{$t('user.pay')}</div> - </div> - </button> - </a> - </div> {/if} </div> </div> diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte index c9cc5c40..7756bd34 100644 --- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte +++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte @@ -148,19 +148,16 @@ <div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4"> <div class="whitespace-nowrap my-auto"> <div class="font-bold" class:text-red-800={p.amount < 0}> - {f((Math.abs(p.amount) + (p.tip || 0)) * (p.rate / sats), p.currency)} + {f((Math.abs(p.amount)) * (p.rate / sats), p.currency)} {#if p.tip} - <span class="text-xs text-secondary"> - {f(Math.abs(p.amount) * (p.rate / sats), p.currency)} + {f( - p.tip * (p.rate / sats), - p.currency - )} + <span class="text-sm text-secondary"> + +{Math.round(p.tip/Math.abs(p.amount) * 100)}% </span> {/if} </div> <div class="text-secondary"> - {sat(p.amount + (p.tip || 0))} + {sat(Math.abs(p.amount) + (p.tip || 0))} </div> </div> diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte index d3cc0b1b..8168208d 100644 --- a/src/routes/(app)/payment/[id]/+page.svelte +++ b/src/routes/(app)/payment/[id]/+page.svelte @@ -57,8 +57,9 @@ <span class="text-lg text-secondary">Tip</span> <div> {f(fiat(tip, rate), currency)} +({Math.round((tip * 100) / Math.abs(a))}%) <span class="text-secondary text-lg"> - ⚡️{s(tip)} + ⚡️{s(tip)} </span> </div> </div> |