[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-backoffice] 02/03: move logout button to frame component
From: |
gnunet |
Subject: |
[taler-merchant-backoffice] 02/03: move logout button to frame component |
Date: |
Sat, 09 Apr 2022 10:10:31 +0200 |
This is an automated email from the git hooks/post-receive script.
ms pushed a commit to branch master
in repository merchant-backoffice.
commit 7f3ecacdcdb3c1dd22949a9be98adcf467a3f8a8
Author: ms <ms@taler.net>
AuthorDate: Sat Apr 9 08:39:25 2022 +0200
move logout button to frame component
---
packages/bank/src/pages/home/index.tsx | 48 ++++++++++++++++------------------
1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/packages/bank/src/pages/home/index.tsx
b/packages/bank/src/pages/home/index.tsx
index 84eaa8c..f96676c 100644
--- a/packages/bank/src/pages/home/index.tsx
+++ b/packages/bank/src/pages/home/index.tsx
@@ -689,6 +689,26 @@ function BankFrame(Props: any): VNode {
const i18n = useTranslator();
const [pageState, pageStateSetter] = useContext(PageContext);
console.log("BankFrame state", pageState);
+ const logOut = (
+ <a
+ href="#"
+ class="pure-button logout-button"
+ onClick={() => {
+ pageStateSetter((prevState: PageStateType) => {
+ const {
+ talerWithdrawUri,
+ withdrawalOutcome,
+ withdrawalId, ...rest } = prevState;
+ return {
+ ...rest,
+ isLoggedIn: false,
+ withdrawalInProgress: false,
+ isRawPayto: false,
+ tryManualTransfer: false,
+ };
+ });
+ }}>{i18n`Logout`}</a>);
+
return (
<Fragment>
<header class="demobar" style="display: flex; flex-direction: row;
justify-content: space-between;">
@@ -729,6 +749,7 @@ function BankFrame(Props: any): VNode {
</div>
<section id="main" class="content">
<ErrorBanner pageState={[pageState, pageStateSetter]}/>
+ {pageState.isLoggedIn ? logOut : null}
{Props.children}
<hr></hr>
<div>
@@ -788,6 +809,7 @@ function PaytoWireTransfer(Props: any): VNode {
}} /> <label>{currency}</label><br /><br />
<input
type="submit"
+ value="Send"
onClick={() => {
amountInput = amountInput.replace(",", ".");
if (!validateAmount(amountInput)) return;
@@ -1208,7 +1230,7 @@ function Account(Props: any): VNode {
const { accountLabel, backendState } = Props;
// Getting the bank account balance:
const endpoint = `access-api/accounts/${accountLabel}`;
- const { data, error } = useSWR(endpoint, {refreshIfStale: true});
+ const { data, error } = useSWR(endpoint, {revalidateOnStale: true});
const [pageState, pageStateSetter] = useContext(PageContext);
const {
withdrawalInProgress,
@@ -1219,27 +1241,6 @@ function Account(Props: any): VNode {
isLoggedIn,
talerWithdrawUri } = pageState;
const i18n = useTranslator();
- const logOut = (
- <a
- href="#"
- class="pure-button logout-button"
- onClick={() => {
- setTxPageNumber(0);
- pageStateSetter((prevState: PageStateType) => {
- const {
- talerWithdrawUri,
- withdrawalOutcome,
- withdrawalId, ...rest } = prevState;
- return {
- ...rest,
- isLoggedIn: false,
- withdrawalInProgress: false,
- isRawPayto: false,
- tryManualTransfer: false,
- };
- });
- }}>{i18n`Logout`}</a>);
-
/**
* This part shows a list of transactions: with 5 elements by
* default and offers a "load more" button.
@@ -1352,7 +1353,6 @@ function Account(Props: any): VNode {
console.log("Bank created a new Taler withdrawal");
return (
<BankFrame>
- {logOut}<br />
<TalerWithdrawalQRCode
accountLabel={accountLabel}
backendState={backendState}
@@ -1365,7 +1365,6 @@ function Account(Props: any): VNode {
if (tryManualTransfer) {
return (
<BankFrame>
- {logOut}<br />
<CurrencyContext.Provider value={balance.currency}>
<PaytoWireTransfer backendState={backendState} />
</CurrencyContext.Provider></BankFrame>);
@@ -1375,7 +1374,6 @@ function Account(Props: any): VNode {
<h1 class="nav">
<Translate>Welcome, {accountLabel}
({getIbanFromPayto(data.paytoUri)})!</Translate>
</h1>
- {logOut}<br />
</div>
<section id="menu">
<p>{i18n`Bank account balance:`} <br />
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.