From d84424202dca22fff22cb1d304286f627642187b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 31 Aug 2022 00:20:35 -0300 Subject: p2p tx rendering --- .../src/cta/TransferPickup/index.ts | 67 ++++++++++++++++++++ .../src/cta/TransferPickup/state.ts | 72 +++++++++++++++++++++ .../src/cta/TransferPickup/stories.tsx | 36 +++++++++++ .../src/cta/TransferPickup/test.ts | 31 +++++++++ .../src/cta/TransferPickup/views.tsx | 74 ++++++++++++++++++++++ 5 files changed, 280 insertions(+) create mode 100644 packages/taler-wallet-webextension/src/cta/TransferPickup/index.ts create mode 100644 packages/taler-wallet-webextension/src/cta/TransferPickup/state.ts create mode 100644 packages/taler-wallet-webextension/src/cta/TransferPickup/stories.tsx create mode 100644 packages/taler-wallet-webextension/src/cta/TransferPickup/test.ts create mode 100644 packages/taler-wallet-webextension/src/cta/TransferPickup/views.tsx (limited to 'packages/taler-wallet-webextension/src/cta/TransferPickup') diff --git a/packages/taler-wallet-webextension/src/cta/TransferPickup/index.ts b/packages/taler-wallet-webextension/src/cta/TransferPickup/index.ts new file mode 100644 index 000000000..603200747 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferPickup/index.ts @@ -0,0 +1,67 @@ +/* + This file is part of GNU Taler + (C) 2022 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +import { AmountJson, TalerErrorDetail } from "@gnu-taler/taler-util"; +import { Loading } from "../../components/Loading.js"; +import { HookError } from "../../hooks/useAsyncAsHook.js"; +import { ButtonHandler } from "../../mui/handlers.js"; +import { compose, StateViewMap } from "../../utils/index.js"; +import * as wxApi from "../../wxApi.js"; +import { useComponentState } from "./state.js"; +import { LoadingUriView, ReadyView } from "./views.js"; + +export interface Props { + talerPayPushUri: string; +} + +export type State = + | State.Loading + | State.LoadingUriError + | State.Ready; + +export namespace State { + + export interface Loading { + status: "loading"; + error: undefined; + } + + export interface LoadingUriError { + status: "loading-uri"; + error: HookError; + } + + export interface BaseInfo { + error: undefined; + } + export interface Ready extends BaseInfo { + status: "ready"; + amount: AmountJson, + error: undefined; + accept: ButtonHandler; + operationError?: TalerErrorDetail; + } +} + +const viewMapping: StateViewMap = { + loading: Loading, + "loading-uri": LoadingUriView, + "ready": ReadyView, +}; + + +export const TransferPickupPage = compose("TransferPickupPage", (p: Props) => useComponentState(p, wxApi), viewMapping) + diff --git a/packages/taler-wallet-webextension/src/cta/TransferPickup/state.ts b/packages/taler-wallet-webextension/src/cta/TransferPickup/state.ts new file mode 100644 index 000000000..a16389709 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferPickup/state.ts @@ -0,0 +1,72 @@ +/* + This file is part of GNU Taler + (C) 2022 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +import { Amounts, TalerErrorDetail } from "@gnu-taler/taler-util"; +import { TalerError } from "@gnu-taler/taler-wallet-core"; +import { useState } from "preact/hooks"; +import { useAsyncAsHook } from "../../hooks/useAsyncAsHook.js"; +import * as wxApi from "../../wxApi.js"; +import { Props, State } from "./index.js"; + +export function useComponentState( + { talerPayPushUri }: Props, + api: typeof wxApi, +): State { + const hook = useAsyncAsHook(async () => { + return await api.checkPeerPushPayment({ + talerUri: talerPayPushUri, + }) + }, []) + const [operationError, setOperationError] = useState(undefined) + + if (!hook) { + return { + status: "loading", + error: undefined, + } + } + if (hook.hasError) { + return { + status: "loading-uri", + error: hook, + }; + } + + const { amount, peerPushPaymentIncomingId } = hook.response + + async function accept(): Promise { + try { + const resp = await api.acceptPeerPushPayment({ + peerPushPaymentIncomingId + }) + } catch (e) { + if (e instanceof TalerError) { + setOperationError(e.errorDetail) + } + console.error(e) + throw Error("error trying to accept") + } + } + return { + status: "ready", + amount: Amounts.parseOrThrow(amount), + error: undefined, + accept: { + onClick: accept + }, + operationError + } +} diff --git a/packages/taler-wallet-webextension/src/cta/TransferPickup/stories.tsx b/packages/taler-wallet-webextension/src/cta/TransferPickup/stories.tsx new file mode 100644 index 000000000..7a3ccb60d --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferPickup/stories.tsx @@ -0,0 +1,36 @@ +/* + This file is part of GNU Taler + (C) 2022 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * + * @author Sebastian Javier Marchano (sebasjm) + */ + +import { createExample } from "../../test-utils.js"; +import { ReadyView } from "./views.js"; + +export default { + title: "wallet/transfer pickup", +}; + +export const Ready = createExample(ReadyView, { + amount: { + currency: "ARS", + value: 1, + fraction: 0, + }, + accept: {}, +}); diff --git a/packages/taler-wallet-webextension/src/cta/TransferPickup/test.ts b/packages/taler-wallet-webextension/src/cta/TransferPickup/test.ts new file mode 100644 index 000000000..631e76d01 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferPickup/test.ts @@ -0,0 +1,31 @@ +/* + This file is part of GNU Taler + (C) 2022 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * + * @author Sebastian Javier Marchano (sebasjm) + */ + +import { expect } from "chai"; + +describe("test description", () => { + + it("should assert", () => { + + expect([]).deep.equals([]) + }); +}) + diff --git a/packages/taler-wallet-webextension/src/cta/TransferPickup/views.tsx b/packages/taler-wallet-webextension/src/cta/TransferPickup/views.tsx new file mode 100644 index 000000000..22ef8c776 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferPickup/views.tsx @@ -0,0 +1,74 @@ +/* + This file is part of GNU Taler + (C) 2022 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +import { h, VNode } from "preact"; +import { Amount } from "../../components/Amount.js"; +import { ErrorTalerOperation } from "../../components/ErrorTalerOperation.js"; +import { LoadingError } from "../../components/LoadingError.js"; +import { LogoHeader } from "../../components/LogoHeader.js"; +import { Part } from "../../components/Part.js"; +import { SubTitle, WalletAction } from "../../components/styled/index.js"; +import { useTranslationContext } from "../../context/translation.js"; +import { Button } from "../../mui/Button.js"; +import { State } from "./index.js"; + +export function LoadingUriView({ error }: State.LoadingUriError): VNode { + const { i18n } = useTranslationContext(); + + return ( + Could not load} + error={error} + /> + ); +} + +export function ReadyView({ + accept, + amount, + operationError, +}: State.Ready): VNode { + const { i18n } = useTranslationContext(); + return ( + + + + Digital cash transfer + + {operationError && ( + + Could not finish the pickup operation + + } + error={operationError} + /> + )} +
+ Amount} + text={} + /> +
+
+ +
+ + ); +} -- cgit v1.2.3