diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/locales/en.json | 8 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/(profile)/+page.svelte | 17 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/accepted/[text]/+page.svelte | 55 | ||||
| -rw-r--r-- | src/routes/(app)/settings/account/+page.svelte | 4 |
4 files changed, 50 insertions, 34 deletions
diff --git a/src/locales/en.json b/src/locales/en.json index 6045b00d..72c3cd41 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -296,6 +296,8 @@ "placeholder": "Enter an address, invoice or username" }, "settings": { + "confirmAutoWithdrawal": "Confirm auto withdrawal settings", + "confirmAutoWithdrawalDesc": "Your auto withdrawals have been disabled. Please double check your destination address before re-enabling them or remove the address to dismiss this message.", "tip": "Default tip", "tipDesc": "Default tip percentage when auto-paying trusted users", "nostr": "Nostr", @@ -308,15 +310,15 @@ "memoPromptPlaceholder": "e.g. Please enter your name for the order", "rememberFor": "Remember for", "import": "Import secret key", - "destination": "Autowithdrawal address", + "destination": "Auto withdrawal address", "destinationDesc": "The address that withdrawals will be sent to", "destinationPlaceholder": "Enter a Bitcoin, Liquid or Lightning address", "reserve": "Reserve amount", "reserveDesc": "The amount to be left in your account after the withdrawal is complete", "shopify": "Shopify", - "threshold": "Autowithdrawal threshold", + "threshold": "Auto withdrawal threshold", "thresholdDesc": "When your balance exceeds this amount, a withdrawal will be triggered", - "autoWithdraw": "Autowithdrawal", + "autoWithdraw": "Auto withdrawal", "autoWithdrawDescription": "Enable withdrawals to an external address when your balance reaches a given threshold", "notifications": "Email notifications", "pushNotifications": "Push notifications", diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte index 31320197..c60c468a 100644 --- a/src/routes/(app)/[username]/(profile)/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/+page.svelte @@ -32,12 +32,27 @@ </script> <div class="space-y-2"> + {#if user?.destination && !user?.autowithdraw} + <div class="rounded-2xl space-y-2 p-4 shadow-lg"> + <h1 class="text-3xl font-bold"> + {$t("user.settings.confirmAutoWithdrawal")} + </h1> + <div> + {$t("user.settings.confirmAutoWithdrawalDesc")} + </div> + + <a href="/settings/account" class="btn"> + <iconify-icon icon="ph:gear-bold" width="32"></iconify-icon> + Settings</a + > + </div> + {/if} {#if user?.fresh} <div class="rounded-2xl space-y-2 p-4 shadow-lg"> <h1 class="text-3xl font-bold">{$t("user.settings.welcome")}</h1> <div> {$t("user.settings.yourUsername")} <b>{user?.username}</b> - {#if $password} + {#if $password} {$t("user.settings.yourPassword")} <b>{$password}</b>{/if} </div> diff --git a/src/routes/(app)/[username]/accepted/[text]/+page.svelte b/src/routes/(app)/[username]/accepted/[text]/+page.svelte index cfd9961f..d96e48e2 100644 --- a/src/routes/(app)/[username]/accepted/[text]/+page.svelte +++ b/src/routes/(app)/[username]/accepted/[text]/+page.svelte @@ -5,45 +5,44 @@ let { data } = $props(); let { nfc, text } = $derived(data); let { username } = $derived(data.subject); - let url = `https://coinos.io/p/${username}`; + let url = `https://coinos.io/p/${username.toLowerCase()}`; </script> <div class="px-2"> <div class="border-8 border-black p-8 max-w-[710px] mx-auto mt-20 space-y-5"> <div class="flex gap-2 mx-auto justify-center"> <img src="/images/bitcoin.png" class="w-16 h-16 my-auto" /> - <h3 class="text-5xl font-bold text-center my-auto">Bitcoin Accepted Here</h3> + <h3 class="text-5xl font-bold text-center my-auto"> + Bitcoin Accepted Here + </h3> </div> <Qr {text} /> - <div class="text-center text-4xl font-bold">coinos.io/{username}</div> + <div class="text-center text-4xl font-bold"> + coinos.io/{username.toLowerCase()} + </div> {#if nfc} <div class="flex w-full justify-center gap-4 mt-10 text-2xl"> - <div class="gap-1"> - <div class="flex items-center gap-2"> - <img - src="/images/tap.png" - class="mx-auto my-auto" - style="width: 120px" - /> - <img src="/images/icon.svg" class="my-auto w-12" /> - <div>Coinos</div> - </div> + <div class="flex gap-1 items-center"> + <img + src="/images/tap.png" + class="mx-auto my-auto" + style="width: 120px" + /> + + <!-- <img src="/images/icon.png" class="mx-auto my-auto w-16" /> --> </div> - <div class="ml-auto gap-1"> - <div class="flex items-center gap-1"> - <iconify-icon - noobserver - icon="ph:lightning-fill" - class="text-yellow-300" - width={48} - ></iconify-icon> - <div>Other</div> - <img - src="/images/tap.png" - class="ml-auto my-auto" - style="width: 120px" - /> - </div> + <div class="flex ml-auto gap-1 items-center"> + <!-- <iconify-icon --> + <!-- noobserver --> + <!-- icon="ph:lightning-fill" --> + <!-- class="text-yellow-300" --> + <!-- width={48} --> + <!-- ></iconify-icon> --> + <img + src="/images/lntap.png" + class="ml-auto my-auto" + style="width: 120px" + /> </div> </div> {/if} diff --git a/src/routes/(app)/settings/account/+page.svelte b/src/routes/(app)/settings/account/+page.svelte index 481c8de7..d8b61170 100644 --- a/src/routes/(app)/settings/account/+page.svelte +++ b/src/routes/(app)/settings/account/+page.svelte @@ -204,7 +204,7 @@ </p> </div> -{#if user.autowithdraw} +<div class:hidden={!user.autowithdraw}> <div class="mb-2"> <label for="display" class="font-bold mb-1 block" >{$t("user.settings.destination")}</label @@ -265,7 +265,7 @@ {$t("user.settings.reserveDesc")} </p> </div> -{/if} +</div> {#if editingThreshold} <div |