pretty

3 files changed, 213 insertions, 144 deletions

diff --git a/packages/taler-wallet-webextension/src/cta/Payment/index.ts b/packages/taler-wallet-webextension/src/cta/Payment/index.ts
index 6e401f7d2..b20f91b0c 100644
--- a/packages/taler-wallet-webextension/src/cta/Payment/index.ts
+++ b/packages/taler-wallet-webextension/src/cta/Payment/index.ts
@@ -14,7 +14,14 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-import { AmountJson, ConfirmPayResult, PreparePayResult, PreparePayResultAlreadyConfirmed, PreparePayResultInsufficientBalance, PreparePayResultPaymentPossible } from "@gnu-taler/taler-util";
+import {
+  AmountJson,
+  ConfirmPayResult,
+  PreparePayResult,
+  PreparePayResultAlreadyConfirmed,
+  PreparePayResultInsufficientBalance,
+  PreparePayResultPaymentPossible,
+} from "@gnu-taler/taler-util";
 import { TalerError } from "@gnu-taler/taler-wallet-core";
 import { Loading } from "../../components/Loading.js";
 import { HookError } from "../../hooks/useAsyncAsHook.js";
@@ -24,8 +31,6 @@ import * as wxApi from "../../wxApi.js";
 import { useComponentState } from "./state.js";
 import { LoadingUriView, BaseView } from "./views.js";
 
-
-
 export interface Props {
   talerPayUri?: string;
   goToWalletManualWithdraw: (amount?: string) => Promise<void>;
@@ -42,7 +47,6 @@ export type State =
   | State.Confirmed;
 
 export namespace State {
-
   export interface Loading {
     status: "loading";
     error: undefined;
@@ -60,12 +64,12 @@ export namespace State {
     cancel: () => Promise<void>;
   }
   export interface NoBalanceForCurrency extends BaseInfo {
-    status: "no-balance-for-currency"
+    status: "no-balance-for-currency";
     payStatus: PreparePayResult;
     balance: undefined;
   }
   export interface NoEnoughBalance extends BaseInfo {
-    status: "no-enough-balance"
+    status: "no-enough-balance";
     payStatus: PreparePayResult;
     balance: AmountJson;
   }
@@ -101,4 +105,8 @@ const viewMapping: StateViewMap<State> = {
   ready: BaseView,
 };
 
-export const PaymentPage = compose("Payment", (p: Props) => useComponentState(p, wxApi), viewMapping)
+export const PaymentPage = compose(
+  "Payment",
+  (p: Props) => useComponentState(p, wxApi),
+  viewMapping,
+);
diff --git a/packages/taler-wallet-webextension/src/cta/Payment/state.ts b/packages/taler-wallet-webextension/src/cta/Payment/state.ts
index ad4bb7004..488263bb8 100644
--- a/packages/taler-wallet-webextension/src/cta/Payment/state.ts
+++ b/packages/taler-wallet-webextension/src/cta/Payment/state.ts
@@ -14,8 +14,15 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-
-import { AmountJson, Amounts, ConfirmPayResult, ConfirmPayResultType, NotificationType, PreparePayResultType, TalerErrorCode } from "@gnu-taler/taler-util";
+import {
+  AmountJson,
+  Amounts,
+  ConfirmPayResult,
+  ConfirmPayResultType,
+  NotificationType,
+  PreparePayResultType,
+  TalerErrorCode,
+} from "@gnu-taler/taler-util";
 import { TalerError } from "@gnu-taler/taler-wallet-core";
 import { useEffect, useState } from "preact/hooks";
 import { useAsyncAsHook } from "../../hooks/useAsyncAsHook.js";
@@ -82,8 +89,9 @@ export function useComponentState(
     uri: hook.response.uri,
     amount,
     error: undefined,
-    cancel, goToWalletManualWithdraw
-  }
+    cancel,
+    goToWalletManualWithdraw,
+  };
 
   if (!foundBalance) {
     return {
@@ -91,7 +99,7 @@ export function useComponentState(
       balance: undefined,
       payStatus,
       ...baseResult,
-    }
+    };
   }
 
   const foundAmount = Amounts.parseOrThrow(foundBalance.available);
@@ -109,11 +117,11 @@ export function useComponentState(
 
   if (payStatus.status === PreparePayResultType.InsufficientBalance) {
     return {
-      status: 'no-enough-balance',
+      status: "no-enough-balance",
       balance: foundAmount,
       payStatus,
       ...baseResult,
-    }
+    };
   }
 
   if (payStatus.status === PreparePayResultType.AlreadyConfirmed) {
@@ -125,7 +133,6 @@ export function useComponentState(
     };
   }
 
-
   async function doPayment(): Promise<void> {
     try {
       if (payStatus.status !== "payment-possible") {
@@ -169,8 +176,6 @@ export function useComponentState(
     payHandler,
     payStatus,
     ...baseResult,
-    balance: foundAmount
+    balance: foundAmount,
   };
-
 }
-
diff --git a/packages/taler-wallet-webextension/src/cta/Payment/test.ts b/packages/taler-wallet-webextension/src/cta/Payment/test.ts
index 2052927b1..235b22c22 100644
--- a/packages/taler-wallet-webextension/src/cta/Payment/test.ts
+++ b/packages/taler-wallet-webextension/src/cta/Payment/test.ts
@@ -70,9 +70,16 @@ describe("Payment CTA states", () => {
   it("should tell the user that the URI is missing", async () => {
     const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } =
       mountHook(() =>
-        useComponentState({ talerPayUri: undefined, cancel: nullFunction, goToWalletManualWithdraw: nullFunction }, {
-          onUpdateNotification: nullFunction,
-        } as Partial<typeof wxApi> as any),
+        useComponentState(
+          {
+            talerPayUri: undefined,
+            cancel: nullFunction,
+            goToWalletManualWithdraw: nullFunction,
+          },
+          {
+            onUpdateNotification: nullFunction,
+          } as Partial<typeof wxApi> as any,
+        ),
       );
 
     {
@@ -98,18 +105,25 @@ describe("Payment CTA states", () => {
   it("should response with no balance", async () => {
     const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } =
       mountHook(() =>
-        useComponentState({ talerPayUri: "taller://pay", cancel: nullFunction, goToWalletManualWithdraw: nullFunction }, {
-          onUpdateNotification: nullFunction,
-          preparePay: async () =>
-          ({
-            amountRaw: "USD:10",
-            status: PreparePayResultType.InsufficientBalance,
-          } as Partial<PreparePayResult>),
-          getBalance: async () =>
-          ({
-            balances: [],
-          } as Partial<BalancesResponse>),
-        } as Partial<typeof wxApi> as any),
+        useComponentState(
+          {
+            talerPayUri: "taller://pay",
+            cancel: nullFunction,
+            goToWalletManualWithdraw: nullFunction,
+          },
+          {
+            onUpdateNotification: nullFunction,
+            preparePay: async () =>
+              ({
+                amountRaw: "USD:10",
+                status: PreparePayResultType.InsufficientBalance,
+              } as Partial<PreparePayResult>),
+            getBalance: async () =>
+              ({
+                balances: [],
+              } as Partial<BalancesResponse>),
+          } as Partial<typeof wxApi> as any,
+        ),
       );
 
     {
@@ -133,22 +147,29 @@ describe("Payment CTA states", () => {
   it("should not be able to pay if there is no enough balance", async () => {
     const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } =
       mountHook(() =>
-        useComponentState({ talerPayUri: "taller://pay", cancel: nullFunction, goToWalletManualWithdraw: nullFunction }, {
-          onUpdateNotification: nullFunction,
-          preparePay: async () =>
-          ({
-            amountRaw: "USD:10",
-            status: PreparePayResultType.InsufficientBalance,
-          } as Partial<PreparePayResult>),
-          getBalance: async () =>
-          ({
-            balances: [
-              {
-                available: "USD:5",
-              },
-            ],
-          } as Partial<BalancesResponse>),
-        } as Partial<typeof wxApi> as any),
+        useComponentState(
+          {
+            talerPayUri: "taller://pay",
+            cancel: nullFunction,
+            goToWalletManualWithdraw: nullFunction,
+          },
+          {
+            onUpdateNotification: nullFunction,
+            preparePay: async () =>
+              ({
+                amountRaw: "USD:10",
+                status: PreparePayResultType.InsufficientBalance,
+              } as Partial<PreparePayResult>),
+            getBalance: async () =>
+              ({
+                balances: [
+                  {
+                    available: "USD:5",
+                  },
+                ],
+              } as Partial<BalancesResponse>),
+          } as Partial<typeof wxApi> as any,
+        ),
       );
 
     {
@@ -172,23 +193,30 @@ describe("Payment CTA states", () => {
   it("should be able to pay (without fee)", async () => {
     const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } =
       mountHook(() =>
-        useComponentState({ talerPayUri: "taller://pay", cancel: nullFunction, goToWalletManualWithdraw: nullFunction }, {
-          onUpdateNotification: nullFunction,
-          preparePay: async () =>
-          ({
-            amountRaw: "USD:10",
-            amountEffective: "USD:10",
-            status: PreparePayResultType.PaymentPossible,
-          } as Partial<PreparePayResult>),
-          getBalance: async () =>
-          ({
-            balances: [
-              {
-                available: "USD:15",
-              },
-            ],
-          } as Partial<BalancesResponse>),
-        } as Partial<typeof wxApi> as any),
+        useComponentState(
+          {
+            talerPayUri: "taller://pay",
+            cancel: nullFunction,
+            goToWalletManualWithdraw: nullFunction,
+          },
+          {
+            onUpdateNotification: nullFunction,
+            preparePay: async () =>
+              ({
+                amountRaw: "USD:10",
+                amountEffective: "USD:10",
+                status: PreparePayResultType.PaymentPossible,
+              } as Partial<PreparePayResult>),
+            getBalance: async () =>
+              ({
+                balances: [
+                  {
+                    available: "USD:15",
+                  },
+                ],
+              } as Partial<BalancesResponse>),
+          } as Partial<typeof wxApi> as any,
+        ),
       );
 
     {
@@ -214,23 +242,30 @@ describe("Payment CTA states", () => {
   it("should be able to pay (with fee)", async () => {
     const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } =
       mountHook(() =>
-        useComponentState({ talerPayUri: "taller://pay", cancel: nullFunction, goToWalletManualWithdraw: nullFunction }, {
-          onUpdateNotification: nullFunction,
-          preparePay: async () =>
-          ({
-            amountRaw: "USD:9",
-            amountEffective: "USD:10",
-            status: PreparePayResultType.PaymentPossible,
-          } as Partial<PreparePayResult>),
-          getBalance: async () =>
-          ({
-            balances: [
-              {
-                available: "USD:15",
-              },
-            ],
-          } as Partial<BalancesResponse>),
-        } as Partial<typeof wxApi> as any),
+        useComponentState(
+          {
+            talerPayUri: "taller://pay",
+            cancel: nullFunction,
+            goToWalletManualWithdraw: nullFunction,
+          },
+          {
+            onUpdateNotification: nullFunction,
+            preparePay: async () =>
+              ({
+                amountRaw: "USD:9",
+                amountEffective: "USD:10",
+                status: PreparePayResultType.PaymentPossible,
+              } as Partial<PreparePayResult>),
+            getBalance: async () =>
+              ({
+                balances: [
+                  {
+                    available: "USD:15",
+                  },
+                ],
+              } as Partial<BalancesResponse>),
+          } as Partial<typeof wxApi> as any,
+        ),
       );
 
     {
@@ -256,28 +291,35 @@ describe("Payment CTA states", () => {
   it("should get confirmation done after pay successfully", async () => {
     const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } =
       mountHook(() =>
-        useComponentState({ talerPayUri: "taller://pay", cancel: nullFunction, goToWalletManualWithdraw: nullFunction }, {
-          onUpdateNotification: nullFunction,
-          preparePay: async () =>
-          ({
-            amountRaw: "USD:9",
-            amountEffective: "USD:10",
-            status: PreparePayResultType.PaymentPossible,
-          } as Partial<PreparePayResult>),
-          getBalance: async () =>
-          ({
-            balances: [
-              {
-                available: "USD:15",
-              },
-            ],
-          } as Partial<BalancesResponse>),
-          confirmPay: async () =>
-          ({
-            type: ConfirmPayResultType.Done,
-            contractTerms: {},
-          } as Partial<ConfirmPayResult>),
-        } as Partial<typeof wxApi> as any),
+        useComponentState(
+          {
+            talerPayUri: "taller://pay",
+            cancel: nullFunction,
+            goToWalletManualWithdraw: nullFunction,
+          },
+          {
+            onUpdateNotification: nullFunction,
+            preparePay: async () =>
+              ({
+                amountRaw: "USD:9",
+                amountEffective: "USD:10",
+                status: PreparePayResultType.PaymentPossible,
+              } as Partial<PreparePayResult>),
+            getBalance: async () =>
+              ({
+                balances: [
+                  {
+                    available: "USD:15",
+                  },
+                ],
+              } as Partial<BalancesResponse>),
+            confirmPay: async () =>
+              ({
+                type: ConfirmPayResultType.Done,
+                contractTerms: {},
+              } as Partial<ConfirmPayResult>),
+          } as Partial<typeof wxApi> as any,
+        ),
       );
 
     {
@@ -317,28 +359,35 @@ describe("Payment CTA states", () => {
   it("should not stay in ready state after pay with error", async () => {
     const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } =
       mountHook(() =>
-        useComponentState({ talerPayUri: "taller://pay", cancel: nullFunction, goToWalletManualWithdraw: nullFunction }, {
-          onUpdateNotification: nullFunction,
-          preparePay: async () =>
-          ({
-            amountRaw: "USD:9",
-            amountEffective: "USD:10",
-            status: PreparePayResultType.PaymentPossible,
-          } as Partial<PreparePayResult>),
-          getBalance: async () =>
-          ({
-            balances: [
-              {
-                available: "USD:15",
-              },
-            ],
-          } as Partial<BalancesResponse>),
-          confirmPay: async () =>
-          ({
-            type: ConfirmPayResultType.Pending,
-            lastError: { code: 1 },
-          } as Partial<ConfirmPayResult>),
-        } as Partial<typeof wxApi> as any),
+        useComponentState(
+          {
+            talerPayUri: "taller://pay",
+            cancel: nullFunction,
+            goToWalletManualWithdraw: nullFunction,
+          },
+          {
+            onUpdateNotification: nullFunction,
+            preparePay: async () =>
+              ({
+                amountRaw: "USD:9",
+                amountEffective: "USD:10",
+                status: PreparePayResultType.PaymentPossible,
+              } as Partial<PreparePayResult>),
+            getBalance: async () =>
+              ({
+                balances: [
+                  {
+                    available: "USD:15",
+                  },
+                ],
+              } as Partial<BalancesResponse>),
+            confirmPay: async () =>
+              ({
+                type: ConfirmPayResultType.Pending,
+                lastError: { code: 1 },
+              } as Partial<ConfirmPayResult>),
+          } as Partial<typeof wxApi> as any,
+        ),
       );
 
     {
@@ -393,23 +442,30 @@ describe("Payment CTA states", () => {
 
     const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } =
       mountHook(() =>
-        useComponentState({ talerPayUri: "taller://pay", cancel: nullFunction, goToWalletManualWithdraw: nullFunction }, {
-          onUpdateNotification: subscriptions.saveSubscription,
-          preparePay: async () =>
-          ({
-            amountRaw: "USD:9",
-            amountEffective: "USD:10",
-            status: PreparePayResultType.PaymentPossible,
-          } as Partial<PreparePayResult>),
-          getBalance: async () =>
-          ({
-            balances: [
-              {
-                available: Amounts.stringify(availableBalance),
-              },
-            ],
-          } as Partial<BalancesResponse>),
-        } as Partial<typeof wxApi> as any),
+        useComponentState(
+          {
+            talerPayUri: "taller://pay",
+            cancel: nullFunction,
+            goToWalletManualWithdraw: nullFunction,
+          },
+          {
+            onUpdateNotification: subscriptions.saveSubscription,
+            preparePay: async () =>
+              ({
+                amountRaw: "USD:9",
+                amountEffective: "USD:10",
+                status: PreparePayResultType.PaymentPossible,
+              } as Partial<PreparePayResult>),
+            getBalance: async () =>
+              ({
+                balances: [
+                  {
+                    available: Amounts.stringify(availableBalance),
+                  },
+                ],
+              } as Partial<BalancesResponse>),
+          } as Partial<typeof wxApi> as any,
+        ),
       );
 
     {