From 93420e064eb2a54b966e9b874ff6c62d4efcd70b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 19 Oct 2023 09:15:14 -0300 Subject: justify balance --- packages/demobank-ui/src/pages/BankFrame.tsx | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'packages/demobank-ui') diff --git a/packages/demobank-ui/src/pages/BankFrame.tsx b/packages/demobank-ui/src/pages/BankFrame.tsx index acd994fee..96ce9c317 100644 --- a/packages/demobank-ui/src/pages/BankFrame.tsx +++ b/packages/demobank-ui/src/pages/BankFrame.tsx @@ -14,7 +14,7 @@ GNU Taler; see the file COPYING. If not, see */ -import { Amounts, TalerError, TranslatedString, parsePaytoUri } from "@gnu-taler/taler-util"; +import { Amounts, TalerError, TranslatedString, parsePaytoUri, stringifyPaytoUri } from "@gnu-taler/taler-util"; import { notifyError, notifyException, useNotifications, useTranslationContext } from "@gnu-taler/web-util/browser"; import { ComponentChildren, Fragment, VNode, h } from "preact"; import { useEffect, useErrorBoundary, useState } from "preact/hooks"; @@ -237,9 +237,7 @@ export function BankFrame({

-
-

-
+

@@ -342,27 +340,28 @@ function Footer() { ); } -function WelcomeAccount({ account }: { account: string }): VNode { +function WelcomeAccount({ account: accountName }: { account: string }): VNode { const { i18n } = useTranslationContext(); - const result = useAccountDetails(account); + const result = useAccountDetails(accountName); if (!result) { return } if (result instanceof TalerError) { return
} - if (result.type === "fail") return
- const payto = parsePaytoUri(result.body.payto_uri) - if (!payto) return
+ const payto = result.type === "fail" ? undefined : parsePaytoUri(result.body.payto_uri) + const info = !payto || !payto.isKnown ? undefined + : payto.targetType === "iban" ? { account: payto.iban, uri: stringifyPaytoUri(payto) } + : payto.targetType === "x-taler-bank" ? { account: payto.account, uri: stringifyPaytoUri(payto) } + : undefined; - const accountNumber = !payto.isKnown ? undefined : payto.targetType === "iban" ? payto.iban : payto.targetType === "x-taler-bank" ? payto.account : undefined; return - Welcome, {account} {accountNumber !== undefined ? - - ({accountNumber} result.body.payto_uri} />) - + Welcome, {accountName} {info !== undefined ? + + ({info.account} info.uri} />) + : }! -- cgit v1.2.3