some ui fixes

1 files changed, 34 insertions, 43 deletions

diff --git a/packages/demobank-ui/src/pages/ShowAccountDetails.tsx b/packages/demobank-ui/src/pages/ShowAccountDetails.tsx
index 3534f9733..c65b90503 100644
--- a/packages/demobank-ui/src/pages/ShowAccountDetails.tsx
+++ b/packages/demobank-ui/src/pages/ShowAccountDetails.tsx
@@ -7,7 +7,7 @@ import { Loading } from "../components/Loading.js";
 import { useBankCoreApiContext } from "../context/config.js";
 import { useAccountDetails } from "../hooks/access.js";
 import { useBackendState } from "../hooks/backend.js";
-import { buildRequestErrorMessage, undefinedIfEmpty } from "../utils.js";
+import { buildRequestErrorMessage, undefinedIfEmpty, withRuntimeErrorHandling } from "../utils.js";
 import { assertUnreachable } from "./HomePage.js";
 import { LoginForm } from "./LoginForm.js";
 import { AccountForm } from "./admin/AccountForm.js";
@@ -49,50 +49,41 @@ export function ShowAccountDetails({
   async function doUpdate() {
     if (!update) {
       setUpdate(true);
-    } else {
-      if (!submitAccount || !creds) return;
-      try {
-        const resp = await api.updateAccount(creds, {
-          cashout_address: submitAccount.cashout_payto_uri,
-          challenge_contact_data: undefinedIfEmpty({
-            email: submitAccount.contact_data?.email,
-            phone: submitAccount.contact_data?.phone,
-          }),
-          is_exchange: false,
-          name: submitAccount.name,
-        });
-        if (resp.type === "ok") {
-          onUpdateSuccess();
-        } else {
-          switch (resp.case) {
-            case "unauthorized": return notify({
-              type: "error",
-              title: i18n.str`The rights to change the account are not sufficient`,
-              description: resp.detail.hint as TranslatedString,
-              debug: resp.detail,
-            })
-            case "not-found": return notify({
-              type: "error",
-              title: i18n.str`The username was not found`,
-              description: resp.detail.hint as TranslatedString,
-              debug: resp.detail,
-            })
-            default: assertUnreachable(resp)
-          }
-        }
-      } catch (error) {
-        if (error instanceof TalerError) {
-          notify(buildRequestErrorMessage(i18n, error))
-        } else {
-          notifyError(
-            i18n.str`Operation failed, please report`,
-            (error instanceof Error
-              ? error.message
-              : JSON.stringify(error)) as TranslatedString
-          )
+      return;
+    }
+    if (!submitAccount || !creds) return;
+    await withRuntimeErrorHandling(i18n, async () => {
+      const resp = await api.updateAccount(creds, {
+        cashout_address: submitAccount.cashout_payto_uri,
+        challenge_contact_data: undefinedIfEmpty({
+          email: submitAccount.contact_data?.email,
+          phone: submitAccount.contact_data?.phone,
+        }),
+        is_exchange: false,
+        name: submitAccount.name,
+      });
+      
+      if (resp.type === "ok") {
+        onUpdateSuccess();
+      } else {
+        switch (resp.case) {
+          case "unauthorized": return notify({
+            type: "error",
+            title: i18n.str`The rights to change the account are not sufficient`,
+            description: resp.detail.hint as TranslatedString,
+            debug: resp.detail,
+          })
+          case "not-found": return notify({
+            type: "error",
+            title: i18n.str`The username was not found`,
+            description: resp.detail.hint as TranslatedString,
+            debug: resp.detail,
+          })
+          default: assertUnreachable(resp)
         }
       }
-    }
+    })
+
   }
 
   return (