1 files changed, 47 insertions, 35 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/details/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/details/index.tsx
index a7fe1801b..b28e59b29 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/orders/details/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/details/index.tsx
@@ -13,55 +13,63 @@
  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 { HttpStatusCode, TalerErrorDetail } from "@gnu-taler/taler-util";
 import {
-  ErrorType,
-  HttpError,
-  useTranslationContext,
+  HttpStatusCode,
+  TalerError,
+  assertUnreachable,
+} from "@gnu-taler/taler-util";
+import {
+  useTranslationContext
 } from "@gnu-taler/web-util/browser";
 import { Fragment, VNode, h } from "preact";
 import { useState } from "preact/hooks";
+import { ErrorLoadingMerchant } from "../../../../components/ErrorLoadingMerchant.js";
 import { Loading } from "../../../../components/exception/loading.js";
 import { NotificationCard } from "../../../../components/menu/index.js";
-import { useOrderAPI, useOrderDetails } from "../../../../hooks/order.js";
+import { useSessionContext } from "../../../../context/session.js";
+import { useOrderDetails } from "../../../../hooks/order.js";
 import { Notification } from "../../../../utils/types.js";
+import { LoginPage } from "../../../login/index.js";
+import { NotFoundPageOrAdminCreate } from "../../../notfound/index.js";
 import { DetailPage } from "./DetailPage.js";
 
 export interface Props {
   oid: string;
-
   onBack: () => void;
-  onUnauthorized: () => VNode;
-  onNotFound: () => VNode;
-  onLoadError: (error: HttpError<TalerErrorDetail>) => VNode;
 }
 
-export default function Update({
-  oid,
-  onBack,
-  onLoadError,
-  onNotFound,
-  onUnauthorized,
-}: Props): VNode {
-  const { refundOrder } = useOrderAPI();
+export default function Update({ oid, onBack }: Props): VNode {
   const result = useOrderDetails(oid);
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
+  const { lib: api } = useSessionContext();
+  const { state } = useSessionContext();
 
   const { i18n } = useTranslationContext();
 
-  if (result.loading) return <Loading />;
-  if (!result.ok) {
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.Unauthorized
-    )
-      return onUnauthorized();
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.NotFound
-    )
-      return onNotFound();
-    return onLoadError(result);
+  if (!result) return <Loading />;
+  if (result instanceof TalerError) {
+    return <ErrorLoadingMerchant error={result} />;
+  }
+  if (result.type === "fail") {
+    switch (result.case) {
+      case HttpStatusCode.NotFound: {
+        return <NotFoundPageOrAdminCreate />;
+      }
+      case HttpStatusCode.BadGateway: {
+        return <div>Failed to obtain a response from the exchange</div>;
+      }
+      case HttpStatusCode.GatewayTimeout: {
+        return (
+          <div>The merchant's interaction with the exchange took too long</div>
+        );
+      }
+      case HttpStatusCode.Unauthorized: {
+        return <LoginPage />
+      }
+      default: {
+        assertUnreachable(result);
+      }
+    }
   }
 
   return (
@@ -71,8 +79,12 @@ export default function Update({
       <DetailPage
         onBack={onBack}
         id={oid}
-        onRefund={(id, value) =>
-          refundOrder(id, value)
+        onRefund={(id, value) => {
+          if (state.status !== "loggedIn") {
+            return;
+          }
+          api.instance
+            .addRefund(state.token, id, value)
             .then(() =>
               setNotif({
                 message: i18n.str`refund created successfully`,
@@ -85,9 +97,9 @@ export default function Update({
                 type: "ERROR",
                 description: error.message,
               }),
-            )
-        }
-        selected={result.data}
+            );
+        }}
+        selected={result.body}
       />
     </Fragment>
   );