[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] branch master updated: justify balance
From: |
gnunet |
Subject: |
[taler-wallet-core] branch master updated: justify balance |
Date: |
Thu, 19 Oct 2023 14:15:20 +0200 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository wallet-core.
The following commit(s) were added to refs/heads/master by this push:
new 93420e064 justify balance
93420e064 is described below
commit 93420e064eb2a54b966e9b874ff6c62d4efcd70b
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Thu Oct 19 09:15:14 2023 -0300
justify balance
---
packages/demobank-ui/src/pages/BankFrame.tsx | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
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 <http://www.gnu.org/licenses/>
*/
-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({
<div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
<div class=" flex flex-wrap items-center justify-between
sm:flex-nowrap">
<h3 class="text-2xl font-bold tracking-tight
text-white"><WelcomeAccount account={account} /></h3>
- <div>
- <h3 class="text-2xl font-bold tracking-tight
text-white"><AccountBalance account={account} /></h3>
- </div>
+ <h3 class="text-2xl font-bold tracking-tight
text-white"><AccountBalance account={account} /></h3>
</div>
</div>
@@ -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 <Loading />
}
if (result instanceof TalerError) {
return <div />
}
- if (result.type === "fail") return <div />
- const payto = parsePaytoUri(result.body.payto_uri)
- if (!payto) return <div />
+ 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 <i18n.Translate>
- Welcome, {account} {accountNumber !== undefined ?
- <span>
- (<a href={result.body.payto_uri}>{accountNumber}</a> <CopyButton
getContent={() => result.body.payto_uri} />)
- </span>
+ Welcome, <span class="whitespace-nowrap">{accountName}</span> {info !==
undefined ?
+ <small class="whitespace-nowrap">
+ (<a href={info.uri}>{info.account}</a> <CopyButton getContent={() =>
info.uri} />)
+ </small>
: <Fragment />}!
</i18n.Translate>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-wallet-core] branch master updated: justify balance,
gnunet <=