Merge branch 'master' into age-withdraw

3 files changed, 12 insertions, 7 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/ListPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/ListPage.tsx
index db2533ecc..02b12c4c2 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/ListPage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/ListPage.tsx
@@ -73,7 +73,7 @@ export function ListPage({
           >
             <InputSelector
               name="payto_uri"
-              label={i18n.str`Address`}
+              label={i18n.str`Account URI`}
               values={accounts}
               placeholder={i18n.str`Select one account`}
               tooltip={i18n.str`filter by account address`}
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/Table.tsx b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/Table.tsx
index 1c464cbc7..b6b1cf328 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/Table.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/Table.tsx
@@ -125,11 +125,10 @@ function Table({
   const [settings] = useSettings();
   return (
     <div class="table-container">
-      {onLoadMoreBefore && (
+      {hasMoreBefore && (
         <button
           class="button is-fullwidth"
           data-tooltip={i18n.str`load more transfers before the first one`}
-          disabled={!hasMoreBefore}
           onClick={onLoadMoreBefore}
         >
           <i18n.Translate>load newer transfers</i18n.Translate>
@@ -198,11 +197,10 @@ function Table({
           })}
         </tbody>
       </table>
-      {onLoadMoreAfter && (
+      {hasMoreAfter && (
         <button
           class="button is-fullwidth"
           data-tooltip={i18n.str`load more transfer after the last one`}
-          disabled={!hasMoreAfter}
           onClick={onLoadMoreAfter}
         >
           <i18n.Translate>load older transfers</i18n.Translate>
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/index.tsx
index 1bc1673ba..0fdbb9bc3 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/transfers/list/index.tsx
@@ -21,7 +21,7 @@
 
 import { ErrorType, HttpError } from "@gnu-taler/web-util/browser";
 import { h, VNode } from "preact";
-import { useState } from "preact/hooks";
+import { useEffect, useState } from "preact/hooks";
 import { Loading } from "../../../../components/exception/loading.js";
 import { MerchantBackend } from "../../../../declaration.js";
 import { useInstanceDetails } from "../../../../hooks/instance.js";
@@ -47,7 +47,6 @@ export default function ListTransfer({
   onCreate,
   onNotFound,
 }: Props): VNode {
-  const [form, setForm] = useState<Form>({ payto_uri: "" });
   const setFilter = (s?: "yes" | "no") => setForm({ ...form, verified: s });
 
   const [position, setPosition] = useState<string | undefined>(undefined);
@@ -56,6 +55,14 @@ export default function ListTransfer({
   const accounts = !instance.ok
     ? []
     : instance.data.accounts.map((a) => a.payto_uri);
+  const [form, setForm] = useState<Form>({ payto_uri: "" });
+
+  const shoulUseDefaultAccount = accounts.length === 1
+  useEffect(() => {
+    if (shoulUseDefaultAccount) {
+      setForm({...form, payto_uri: accounts[0]})
+    }
+  }, [shoulUseDefaultAccount])
 
   const isVerifiedTransfers = form.verified === "yes";
   const isNonVerifiedTransfers = form.verified === "no";