diff options
| -rwxr-xr-x | bun.lockb | bin | 160396 -> 157517 bytes | |||
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | src/locales/en.json | 2 | ||||
| -rw-r--r-- | src/routes/(app)/ecash/[id]/+layout.server.ts | 8 | ||||
| -rw-r--r-- | src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts | 11 | ||||
| -rw-r--r-- | src/routes/(app)/ecash/[id]/[...version]/+layout.svelte (renamed from src/routes/(app)/ecash/[id]/+layout.svelte) | 1 | ||||
| -rw-r--r-- | src/routes/(app)/ecash/[id]/[...version]/+page.server.ts (renamed from src/routes/(app)/ecash/[id]/+page.server.ts) | 0 | ||||
| -rw-r--r-- | src/routes/(app)/ecash/[id]/[...version]/+page.svelte (renamed from src/routes/(app)/ecash/[id]/+page.svelte) | 24 | ||||
| -rw-r--r-- | src/routes/(app)/ecash/[id]/[...version]/swap/+page.server.ts (renamed from src/routes/(app)/ecash/[id]/swap/+page.server.ts) | 0 | ||||
| -rw-r--r-- | src/routes/(app)/ecash/[id]/[...version]/swap/+page.svelte (renamed from src/routes/(app)/ecash/[id]/swap/+page.svelte) | 0 |
10 files changed, 37 insertions, 12 deletions
| Binary files differ diff --git a/package.json b/package.json index d710f239..3213789a 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,6 @@ "dependencies": { "@capacitor/android": "^6.0.0", "@capacitor/cli": "^6.0.0", - "@capacitor/core": "^6.0.0", - "@cashu/cashu-ts": "^1.0.1" + "@capacitor/core": "^6.0.0" } } diff --git a/src/locales/en.json b/src/locales/en.json index 09935e45..ef50a2ae 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -293,6 +293,8 @@ } }, "payments": { + "legacyVersion": "Legacy version", + "newVersion": "New version", "income": "Income", "subtotal": "Subtotal", "expenditure": "Expenditure", diff --git a/src/routes/(app)/ecash/[id]/+layout.server.ts b/src/routes/(app)/ecash/[id]/+layout.server.ts deleted file mode 100644 index 5de15341..00000000 --- a/src/routes/(app)/ecash/[id]/+layout.server.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { get } from "$lib/utils"; - -export async function load({ params }) { - let { id } = params; - let { token, status } = await get(`/cash/${id}`); - let { spent, total, mint, external } = status; - return { id, token, spent, total, mint, external }; -} diff --git a/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts b/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts new file mode 100644 index 00000000..df8a6f83 --- /dev/null +++ b/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts @@ -0,0 +1,11 @@ +import { get } from "$lib/utils"; + +export async function load({ params }) { + let { id, version } = params; + version ||= 4; + version = parseInt(version); + + let { token, status } = await get(`/cash/${id}/${version}`); + let { spent, total, mint, external } = status; + return { id, token, spent, total, mint, external, version }; +} diff --git a/src/routes/(app)/ecash/[id]/+layout.svelte b/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte index d3c95e00..0aa1c405 100644 --- a/src/routes/(app)/ecash/[id]/+layout.svelte +++ b/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte @@ -1,6 +1,5 @@ <script> import AppHeader from "$comp/AppHeader.svelte"; - import { getDecodedToken } from "@cashu/cashu-ts"; import { copy, sats, f, s } from "$lib/utils"; import { t } from "$lib/translations"; import Icon from "$comp/Icon.svelte"; diff --git a/src/routes/(app)/ecash/[id]/+page.server.ts b/src/routes/(app)/ecash/[id]/[...version]/+page.server.ts index 0ed2d1c4..0ed2d1c4 100644 --- a/src/routes/(app)/ecash/[id]/+page.server.ts +++ b/src/routes/(app)/ecash/[id]/[...version]/+page.server.ts diff --git a/src/routes/(app)/ecash/[id]/+page.svelte b/src/routes/(app)/ecash/[id]/[...version]/+page.svelte index 375f168a..db238216 100644 --- a/src/routes/(app)/ecash/[id]/+page.svelte +++ b/src/routes/(app)/ecash/[id]/[...version]/+page.svelte @@ -9,7 +9,7 @@ export let form; let link = $page.url.href; - let { id, total, token, external, spent } = data; + let { id, total, version, token, external, spent } = data; </script> {#if form?.error} @@ -61,4 +61,26 @@ > {token} </button> + + {#if version === 4} + <a data-sveltekit-reload href={`/ecash/${id}/3`} class="contents"> + <button + type="button" + class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full justify-center gap-2" + > + <Icon icon="settings" style="w-8 my-auto" /> + <div class="my-auto">{$t("payments.legacyVersion")}</div> + </button> + </a> + {:else} + <a data-sveltekit-reload href={`/ecash/${id}`} class="contents"> + <button + type="button" + class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full justify-center gap-2" + > + <Icon icon="settings" style="w-8 my-auto" /> + <div class="my-auto">{$t("payments.newVersion")}</div> + </button> + </a> + {/if} </div> diff --git a/src/routes/(app)/ecash/[id]/swap/+page.server.ts b/src/routes/(app)/ecash/[id]/[...version]/swap/+page.server.ts index c8806bf0..c8806bf0 100644 --- a/src/routes/(app)/ecash/[id]/swap/+page.server.ts +++ b/src/routes/(app)/ecash/[id]/[...version]/swap/+page.server.ts diff --git a/src/routes/(app)/ecash/[id]/swap/+page.svelte b/src/routes/(app)/ecash/[id]/[...version]/swap/+page.svelte index 3df9504d..3df9504d 100644 --- a/src/routes/(app)/ecash/[id]/swap/+page.svelte +++ b/src/routes/(app)/ecash/[id]/[...version]/swap/+page.svelte |