validate IBAN, removing internal iban from account form, add missing logo, do not save backend URL in login state

2 files changed, 13 insertions, 13 deletions

diff --git a/packages/demobank-ui/src/hooks/backend.ts b/packages/demobank-ui/src/hooks/backend.ts
index 3f2981edf..3eaf1f186 100644
--- a/packages/demobank-ui/src/hooks/backend.ts
+++ b/packages/demobank-ui/src/hooks/backend.ts
@@ -42,26 +42,23 @@ export interface BackendCredentials {
 }
 
 interface LoggedIn extends BackendCredentials {
-  url: string;
   status: "loggedIn";
   isUserAdministrator: boolean;
 }
 interface LoggedOut {
-  url: string;
   status: "loggedOut";
 }
 
-const maybeRootPath = bankUiSettings.backendBaseURL;
-
 export function getInitialBackendBaseURL(): string {
   const overrideUrl = localStorage.getItem("bank-base-url");
 
-  return canonicalizeBaseUrl(overrideUrl ? overrideUrl : maybeRootPath);
+  return canonicalizeBaseUrl(
+    overrideUrl ? overrideUrl : bankUiSettings.backendBaseURL,
+  );
 }
 
 export const defaultState: BackendState = {
   status: "loggedOut",
-  url: getInitialBackendBaseURL(),
 };
 
 export interface BackendStateHandler {
@@ -91,13 +88,12 @@ export function useBackendState(): BackendStateHandler {
   return {
     state,
     logOut() {
-      update(JSON.stringify({ ...defaultState, url: state.url }));
+      update(JSON.stringify({ ...defaultState }));
     },
     logIn(info) {
       //admin is defined by the username
       const nextState: BackendState = {
         status: "loggedIn",
-        url: state.url,
         ...info,
         isUserAdministrator: info.username === "admin",
       };
@@ -125,7 +121,7 @@ export function usePublicBackend(): useBackendType {
   const { state } = useBackendContext();
   const { request: requestHandler } = useApiContext();
 
-  const baseUrl = state.url;
+  const baseUrl = getInitialBackendBaseURL();
 
   const request = useCallback(
     function requestImpl<T>(
@@ -201,7 +197,7 @@ export function useAuthenticatedBackend(): useBackendType {
   const { request: requestHandler } = useApiContext();
 
   const creds = state.status === "loggedIn" ? state : undefined;
-  const baseUrl = state.url;
+  const baseUrl = getInitialBackendBaseURL();
 
   const request = useCallback(
     function requestImpl<T>(
diff --git a/packages/demobank-ui/src/hooks/circuit.ts b/packages/demobank-ui/src/hooks/circuit.ts
index c2563adb4..423ed1a5b 100644
--- a/packages/demobank-ui/src/hooks/circuit.ts
+++ b/packages/demobank-ui/src/hooks/circuit.ts
@@ -24,7 +24,11 @@ import {
 import { useEffect, useMemo, useState } from "preact/hooks";
 import { useBackendContext } from "../context/backend.js";
 import { MAX_RESULT_SIZE, PAGE_SIZE } from "../utils.js";
-import { useAuthenticatedBackend, useMatchMutate } from "./backend.js";
+import {
+  getInitialBackendBaseURL,
+  useAuthenticatedBackend,
+  useMatchMutate,
+} from "./backend.js";
 
 // FIX default import https://github.com/microsoft/TypeScript/issues/49189
 import _useSWR, { SWRHook } from "swr";
@@ -210,10 +214,10 @@ export interface CircuitAccountAPI {
 
 async function getBusinessStatus(
   request: ReturnType<typeof useApiContext>["request"],
-  url: string,
   basicAuth: { username: string; password: string },
 ): Promise<boolean> {
   try {
+    const url = getInitialBackendBaseURL();
     const result = await request<
       HttpResponseOk<SandboxBackend.Circuit.CircuitAccountData>
     >(url, `circuit-api/accounts/${basicAuth.username}`, { basicAuth });
@@ -234,7 +238,7 @@ export function useBusinessAccountFlag(): boolean | undefined {
 
   useEffect(() => {
     if (!creds) return;
-    getBusinessStatus(request, state.url, creds)
+    getBusinessStatus(request, creds)
       .then((result) => {
         setIsBusiness(result);
       })