merchant-backoffice

commit 7f3ecacdcdb3c1dd22949a9be98adcf467a3f8a8
parent c6e9fdb7dac4f173271b831bd72c7a15301ff78c
Author: ms <ms@taler.net>
Date:   Sat,  9 Apr 2022 08:39:25 +0200

move logout button to frame component

Diffstat:
M
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
@@ -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 {
             }} />&nbsp;<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 />