update code to match others

1 files changed, 18 insertions, 9 deletions

diff --git a/packages/aml-backoffice-ui/src/pages/Officer.tsx b/packages/aml-backoffice-ui/src/pages/Officer.tsx
index eaa961b90..ad8ae1ed3 100644
--- a/packages/aml-backoffice-ui/src/pages/Officer.tsx
+++ b/packages/aml-backoffice-ui/src/pages/Officer.tsx
@@ -1,6 +1,6 @@
 /*
  This file is part of GNU Taler
- (C) 2022 Taler Systems S.A.
+ (C) 2022-2024 Taler Systems S.A.
 
  GNU Taler is free software; you can redistribute it and/or modify it under the
  terms of the GNU General Public License as published by the Free Software
@@ -13,22 +13,27 @@
  You should have received a copy of the GNU General Public License along with
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
-import { useTranslationContext } from "@gnu-taler/web-util/browser";
+import {
+  useExchangeApiContext,
+  useTranslationContext,
+} from "@gnu-taler/web-util/browser";
 import { h } from "preact";
-import { getInitialBackendBaseURL } from "../hooks/useBackend.js";
-import { useOfficer } from "../hooks/useOfficer.js";
-import { uiSettings } from "../settings.js";
+import { useOfficer } from "../hooks/officer.js";
 import { HandleAccountNotReady } from "./HandleAccountNotReady.js";
+import { useSettingsContext } from "../context/settings.js";
 
 export function Officer() {
   const officer = useOfficer();
-  const { i18n } = useTranslationContext()
+  const settings = useSettingsContext();
+  const { lib } = useExchangeApiContext();
+
+  const { i18n } = useTranslationContext();
   if (officer.state !== "ready") {
     return <HandleAccountNotReady officer={officer} />;
   }
 
-  const url = new URL(getInitialBackendBaseURL())
-  const signupEmail = uiSettings.signupEmail ?? `aml-signup@${url.hostname}`
+  const url = new URL("./", lib.exchange.baseUrl);
+  const signupEmail = settings.signupEmail ?? `aml-signup@${url.hostname}`;
 
   return (
     <div>
@@ -40,7 +45,11 @@ export function Officer() {
       </div>
       <p>
         <a
-          href={`mailto:${signupEmail}?subject=${encodeURIComponent("Request AML signup")}&body=${encodeURIComponent(`I want my AML account\n\n\nPubKey: ${officer.account.id}`)}`}
+          href={`mailto:${signupEmail}?subject=${encodeURIComponent(
+            "Request AML signup",
+          )}&body=${encodeURIComponent(
+            `I want my AML account\n\n\nPubKey: ${officer.account.id}`,
+          )}`}
           target="_blank"
           rel="noreferrer"
           class="m-4 block rounded-md w-fit border-0 px-3 py-2 text-center text-sm bg-indigo-700 text-white shadow-sm hover:bg-indigo-700"