1 files changed, 40 insertions, 29 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/accounts/create/CreatePage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/accounts/create/CreatePage.tsx
index dd77d609c..255caa375 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/accounts/create/CreatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/accounts/create/CreatePage.tsx
@@ -44,8 +44,8 @@ const accountAuthType = ["none", "basic"];
 
 function isValidURL(s: string): boolean {
   try {
-    const u = new URL("/", s)
-    return true;
+    const parsed = new URL("/", s);
+    return parsed instanceof URL;
   } catch (e) {
     return false;
   }
@@ -61,43 +61,54 @@ export function CreatePage({ onCreate, onBack }: Props): VNode {
     credit_facade_credentials: !state.credit_facade_credentials
       ? undefined
       : undefinedIfEmpty({
-        username:
-          state.credit_facade_credentials.type === "basic" && !state.credit_facade_credentials.username
-            ? i18n.str`required`
-            : undefined,
-        password:
-          state.credit_facade_credentials.type === "basic" && !state.credit_facade_credentials.password
-            ? i18n.str`required`
-            : undefined,
-      }),
+          username:
+            state.credit_facade_credentials.type === "basic" &&
+            !state.credit_facade_credentials.username
+              ? i18n.str`required`
+              : undefined,
+          password:
+            state.credit_facade_credentials.type === "basic" &&
+            !state.credit_facade_credentials.password
+              ? i18n.str`required`
+              : undefined,
+        }),
     credit_facade_url: !state.credit_facade_url
       ? undefined
-      : !isValidURL(state.credit_facade_url) ? i18n.str`not valid url`
+      : !isValidURL(state.credit_facade_url)
+        ? i18n.str`not valid url`
+        : undefined,
+    repeatPassword: !state.credit_facade_credentials
+      ? undefined
+      : state.credit_facade_credentials.type === "basic" &&
+          (!state.credit_facade_credentials.password ||
+            state.credit_facade_credentials.password !== state.repeatPassword)
+        ? i18n.str`is not the same`
         : undefined,
-    repeatPassword:
-      !state.credit_facade_credentials
-        ? undefined
-        : state.credit_facade_credentials.type === "basic" && (!state.credit_facade_credentials.password || state.credit_facade_credentials.password !== state.repeatPassword)
-          ? i18n.str`is not the same`
-          : undefined,
   };
 
   const hasErrors = Object.keys(errors).some(
-    (k) => (errors as any)[k] !== undefined,
+    (k) => (errors as Record<string, unknown>)[k] !== undefined,
   );
 
   const submitForm = () => {
     if (hasErrors) return Promise.reject();
-    const credit_facade_url = !state.credit_facade_url ? undefined : new URL("/", state.credit_facade_url).href
-    const credit_facade_credentials: TalerMerchantApi.FacadeCredentials | undefined =
-      credit_facade_url == undefined ? undefined :
-        state.credit_facade_credentials?.type === "basic" ? {
-          type: "basic",
-          password: state.credit_facade_credentials.password,
-          username: state.credit_facade_credentials.username,
-        } : {
-          type: "none"
-        }
+    const credit_facade_url = !state.credit_facade_url
+      ? undefined
+      : new URL("/", state.credit_facade_url).href;
+    const credit_facade_credentials:
+      | TalerMerchantApi.FacadeCredentials
+      | undefined =
+      credit_facade_url == undefined
+        ? undefined
+        : state.credit_facade_credentials?.type === "basic"
+          ? {
+              type: "basic",
+              password: state.credit_facade_credentials.password,
+              username: state.credit_facade_credentials.username,
+            }
+          : {
+              type: "none",
+            };
 
     return onCreate({
       payto_uri: state.payto_uri!,