diff options
Diffstat (limited to 'packages/taler-wallet-webextension/src/cta')
21 files changed, 1376 insertions, 1 deletions
diff --git a/packages/taler-wallet-webextension/src/cta/InvoiceCreate/index.ts b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/index.ts new file mode 100644 index 000000000..f12fd80e0 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/index.ts @@ -0,0 +1,79 @@ +/* + 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 <http://www.gnu.org/licenses/> + */ + +import { Loading } from "../../components/Loading.js"; +import { HookError } from "../../hooks/useAsyncAsHook.js"; +import { compose, StateViewMap } from "../../utils/index.js"; +import { LoadingUriView, ReadyView, ShowQrView } from "./views.js"; +import * as wxApi from "../../wxApi.js"; +import { useComponentState } from "./state.js"; +import { AmountJson, TalerErrorDetail } from "@gnu-taler/taler-util"; +import { ButtonHandler, SelectFieldHandler, TextFieldHandler } from "../../mui/handlers.js"; + +export interface Props { + amount: string; +} + +export type State = + | State.Loading + | State.LoadingUriError + | State.ShowQr + | 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 ShowQr extends BaseInfo { + status: "show-qr"; + talerUri: string; + close: () => void; + } + export interface Ready extends BaseInfo { + status: "ready"; + showQr: ButtonHandler; + copyToClipboard: ButtonHandler; + subject: TextFieldHandler; + toBeReceived: AmountJson, + chosenAmount: AmountJson, + exchangeUrl: string; + invalid: boolean; + error: undefined; + operationError?: TalerErrorDetail; + } +} + +const viewMapping: StateViewMap<State> = { + loading: Loading, + "loading-uri": LoadingUriView, + "show-qr": ShowQrView, + "ready": ReadyView, +}; + + +export const InvoiceCreatePage = compose("InvoiceCreatePage", (p: Props) => useComponentState(p, wxApi), viewMapping) + diff --git a/packages/taler-wallet-webextension/src/cta/InvoiceCreate/state.ts b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/state.ts new file mode 100644 index 000000000..dd9220480 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/state.ts @@ -0,0 +1,113 @@ +/* + 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 <http://www.gnu.org/licenses/> + */ + +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( + { amount: amountStr }: Props, + api: typeof wxApi, +): State { + const amount = Amounts.parseOrThrow(amountStr) + + const [subject, setSubject] = useState(""); + const [talerUri, setTalerUri] = useState("") + + const hook = useAsyncAsHook(api.listExchanges); + const [exchangeIdx, setExchangeIdx] = useState("0") + const [operationError, setOperationError] = useState<TalerErrorDetail | undefined>(undefined) + + + if (!hook) { + return { + status: "loading", + error: undefined, + } + } + if (hook.hasError) { + return { + status: "loading-uri", + error: hook, + }; + } + + if (talerUri) { + return { + status: "show-qr", + talerUri, + error: undefined, + close: () => { null }, + // chosenAmount: amount, + // toBeReceived: amount, + } + } + + const exchanges = hook.response.exchanges.filter(e => e.currency === amount.currency); + const exchangeMap = exchanges.reduce((prev, cur, idx) => ({ ...prev, [String(idx)]: cur.exchangeBaseUrl }), {} as Record<string, string>) + const selected = exchanges[Number(exchangeIdx)]; + + async function accept(): Promise<string> { + try { + + const resp = await api.initiatePeerPullPayment({ + amount: Amounts.stringify(amount), + exchangeBaseUrl: selected.exchangeBaseUrl, + partialContractTerms: { + summary: subject + } + }) + return resp.talerUri + } catch (e) { + if (e instanceof TalerError) { + setOperationError(e.errorDetail) + } + console.error(e) + throw Error("error trying to accept") + } + } + + + return { + status: "ready", + subject: { + error: !subject ? "cant be empty" : undefined, + value: subject, + onInput: async (e) => setSubject(e) + }, + invalid: !subject || Amounts.isZero(amount), + exchangeUrl: selected.exchangeBaseUrl, + copyToClipboard: { + onClick: async () => { + const uri = await accept(); + navigator.clipboard.writeText(uri || ""); + } + }, + showQr: { + onClick: async () => { + const uri = await accept(); + setTalerUri(uri) + } + }, + chosenAmount: amount, + toBeReceived: amount, + error: undefined, + operationError + } +} diff --git a/packages/taler-wallet-webextension/src/cta/InvoiceCreate/stories.tsx b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/stories.tsx new file mode 100644 index 000000000..e6252062e --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/stories.tsx @@ -0,0 +1,57 @@ +/* + 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 <http://www.gnu.org/licenses/> + */ + +/** + * + * @author Sebastian Javier Marchano (sebasjm) + */ + +import { createExample } from "../../test-utils.js"; +import { ReadyView, ShowQrView } from "./views.js"; + +export default { + title: "wallet/invoice create", +}; + +export const ShowQr = createExample(ShowQrView, { + talerUri: + "taler://pay-pull/exchange.taler.ar/HS585JK0QCXHJ8Z8QWZA3EBAY5WY7XNC1RR2MHJXSH2Z4WP0YPJ0", + close: () => { + null; + }, +}); + +export const Ready = createExample(ReadyView, { + chosenAmount: { + currency: "ARS", + value: 1, + fraction: 0, + }, + toBeReceived: { + currency: "ARS", + value: 1, + fraction: 0, + }, + exchangeUrl: "https://exchange.taler.ar", + subject: { + value: "some subject", + onInput: async () => { + null; + }, + }, + copyToClipboard: {}, + showQr: {}, +}); diff --git a/packages/taler-wallet-webextension/src/cta/InvoiceCreate/test.ts b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/test.ts new file mode 100644 index 000000000..631e76d01 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/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 <http://www.gnu.org/licenses/> + */ + +/** + * + * @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/InvoiceCreate/views.tsx b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/views.tsx new file mode 100644 index 000000000..ebb15e75c --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/views.tsx @@ -0,0 +1,150 @@ +/* + 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 <http://www.gnu.org/licenses/> + */ + +import { h, VNode } from "preact"; +import { LoadingError } from "../../components/LoadingError.js"; +import { LogoHeader } from "../../components/LogoHeader.js"; +import { Part } from "../../components/Part.js"; +import { QR } from "../../components/QR.js"; +import { + Link, + SubTitle, + SvgIcon, + WalletAction, +} from "../../components/styled/index.js"; +import { useTranslationContext } from "../../context/translation.js"; +import { Button } from "../../mui/Button.js"; +import { Grid } from "../../mui/Grid.js"; +import { TextField } from "../../mui/TextField.js"; +import editIcon from "../../svg/edit_24px.svg"; +import { ExchangeDetails, InvoiceDetails } from "../../wallet/Transaction.js"; +import { State } from "./index.js"; + +export function LoadingUriView({ error }: State.LoadingUriError): VNode { + const { i18n } = useTranslationContext(); + + return ( + <LoadingError + title={<i18n.Translate>Could not load</i18n.Translate>} + error={error} + /> + ); +} + +export function ShowQrView({ talerUri, close }: State.ShowQr): VNode { + const { i18n } = useTranslationContext(); + return ( + <WalletAction> + <LogoHeader /> + <SubTitle> + <i18n.Translate>Digital invoice</i18n.Translate> + </SubTitle> + <section> + <p>Scan this QR code with the wallet</p> + <QR text={talerUri} /> + </section> + <section> + <Link upperCased onClick={close}> + <i18n.Translate>Close</i18n.Translate> + </Link> + </section> + </WalletAction> + ); +} + +export function ReadyView({ + invalid, + exchangeUrl, + subject, + showQr, + operationError, + copyToClipboard, + toBeReceived, + chosenAmount, +}: State.Ready): VNode { + const { i18n } = useTranslationContext(); + + return ( + <WalletAction> + <LogoHeader /> + <SubTitle> + <i18n.Translate>Digital invoice</i18n.Translate> + </SubTitle> + <section style={{ textAlign: "left" }}> + <TextField + label="Subject" + variant="filled" + error={!!subject.error} + required + fullWidth + value={subject.value} + onChange={subject.onInput} + /> + + <Part + title={ + <div + style={{ + display: "flex", + alignItems: "center", + }} + > + <i18n.Translate>Exchange</i18n.Translate> + <Link> + <SvgIcon + title="Edit" + dangerouslySetInnerHTML={{ __html: editIcon }} + color="black" + /> + </Link> + </div> + } + text={<ExchangeDetails exchange={exchangeUrl} />} + kind="neutral" + big + /> + + <Part + title={<i18n.Translate>Details</i18n.Translate>} + text={ + <InvoiceDetails + amount={{ + effective: toBeReceived, + raw: chosenAmount, + }} + /> + } + /> + </section> + <section> + <p>How do you want to send the invoice?</p> + + <Grid item container columns={1} spacing={1}> + <Grid item xs={1}> + <Button disabled={invalid} onClick={copyToClipboard.onClick}> + Copy request URI to clipboard + </Button> + </Grid> + <Grid item xs={1}> + <Button disabled={invalid} onClick={showQr.onClick}> + Show QR + </Button> + </Grid> + </Grid> + </section> + </WalletAction> + ); +} diff --git a/packages/taler-wallet-webextension/src/cta/InvoicePay/index.ts b/packages/taler-wallet-webextension/src/cta/InvoicePay/index.ts new file mode 100644 index 000000000..8d1612c7a --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoicePay/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 <http://www.gnu.org/licenses/> + */ + +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 { + talerPayPullUri: 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<State> = { + loading: Loading, + "loading-uri": LoadingUriView, + "ready": ReadyView, +}; + + +export const InvoicePayPage = compose("InvoicePayPage", (p: Props) => useComponentState(p, wxApi), viewMapping) + diff --git a/packages/taler-wallet-webextension/src/cta/InvoicePay/state.ts b/packages/taler-wallet-webextension/src/cta/InvoicePay/state.ts new file mode 100644 index 000000000..53db117f9 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoicePay/state.ts @@ -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 <http://www.gnu.org/licenses/> + */ + +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( + { talerPayPullUri }: Props, + api: typeof wxApi, +): State { + const hook = useAsyncAsHook(async () => { + return await api.checkPeerPullPayment({ + talerUri: talerPayPullUri + }) + }, []) + const [operationError, setOperationError] = useState<TalerErrorDetail | undefined>(undefined) + + if (!hook) { + return { + status: "loading", + error: undefined, + } + } + if (hook.hasError) { + return { + status: "loading-uri", + error: hook, + }; + } + + const { amount, peerPullPaymentIncomingId } = hook.response + + async function accept(): Promise<void> { + try { + const resp = await api.acceptPeerPullPayment({ + peerPullPaymentIncomingId + }) + } 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/InvoicePay/stories.tsx b/packages/taler-wallet-webextension/src/cta/InvoicePay/stories.tsx new file mode 100644 index 000000000..6adaa5c22 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoicePay/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 <http://www.gnu.org/licenses/> + */ + +/** + * + * @author Sebastian Javier Marchano (sebasjm) + */ + +import { createExample } from "../../test-utils.js"; +import { ReadyView } from "./views.js"; + +export default { + title: "wallet/invoice payment", +}; + +export const Ready = createExample(ReadyView, { + amount: { + currency: "ARS", + value: 1, + fraction: 0, + }, + accept: {}, +}); diff --git a/packages/taler-wallet-webextension/src/cta/InvoicePay/test.ts b/packages/taler-wallet-webextension/src/cta/InvoicePay/test.ts new file mode 100644 index 000000000..631e76d01 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoicePay/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 <http://www.gnu.org/licenses/> + */ + +/** + * + * @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/InvoicePay/views.tsx b/packages/taler-wallet-webextension/src/cta/InvoicePay/views.tsx new file mode 100644 index 000000000..2960c3168 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/InvoicePay/views.tsx @@ -0,0 +1,85 @@ +/* + 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 <http://www.gnu.org/licenses/> + */ + +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 { QR } from "../../components/QR.js"; +import { + Link, + SubTitle, + SvgIcon, + WalletAction, +} from "../../components/styled/index.js"; +import { useTranslationContext } from "../../context/translation.js"; +import { Button } from "../../mui/Button.js"; +import { Grid } from "../../mui/Grid.js"; +import { TextField } from "../../mui/TextField.js"; +import editIcon from "../../svg/edit_24px.svg"; +import { ExchangeDetails, InvoiceDetails } from "../../wallet/Transaction.js"; +import { State } from "./index.js"; + +export function LoadingUriView({ error }: State.LoadingUriError): VNode { + const { i18n } = useTranslationContext(); + + return ( + <LoadingError + title={<i18n.Translate>Could not load</i18n.Translate>} + error={error} + /> + ); +} + +export function ReadyView({ + operationError, + accept, + amount, +}: State.Ready): VNode { + const { i18n } = useTranslationContext(); + + return ( + <WalletAction> + <LogoHeader /> + <SubTitle> + <i18n.Translate>Digital invoice</i18n.Translate> + </SubTitle> + {operationError && ( + <ErrorTalerOperation + title={ + <i18n.Translate> + Could not finish the payment operation + </i18n.Translate> + } + error={operationError} + /> + )} + <section style={{ textAlign: "left" }}> + <Part + title={<i18n.Translate>Amount</i18n.Translate>} + text={<Amount value={amount} />} + /> + </section> + <section> + <Button variant="contained" color="success" onClick={accept.onClick}> + <i18n.Translate>Pay</i18n.Translate> + </Button> + </section> + </WalletAction> + ); +} diff --git a/packages/taler-wallet-webextension/src/cta/TransferCreate/index.ts b/packages/taler-wallet-webextension/src/cta/TransferCreate/index.ts new file mode 100644 index 000000000..fd034341e --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferCreate/index.ts @@ -0,0 +1,78 @@ +/* + 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 <http://www.gnu.org/licenses/> + */ + +import { Loading } from "../../components/Loading.js"; +import { HookError } from "../../hooks/useAsyncAsHook.js"; +import { compose, StateViewMap } from "../../utils/index.js"; +import { LoadingUriView, ReadyView, ShowQrView } from "./views.js"; +import * as wxApi from "../../wxApi.js"; +import { useComponentState } from "./state.js"; +import { AmountJson, TalerErrorDetail } from "@gnu-taler/taler-util"; +import { ButtonHandler, SelectFieldHandler, TextFieldHandler } from "../../mui/handlers.js"; + +export interface Props { + amount: string; +} + +export type State = + | State.Loading + | State.LoadingUriError + | State.ShowQr + | 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 ShowQr extends BaseInfo { + status: "show-qr"; + talerUri: string; + close: () => void; + } + export interface Ready extends BaseInfo { + status: "ready"; + showQr: ButtonHandler; + invalid: boolean; + copyToClipboard: ButtonHandler; + toBeReceived: AmountJson, + chosenAmount: AmountJson, + subject: TextFieldHandler, + error: undefined; + operationError?: TalerErrorDetail; + } +} + +const viewMapping: StateViewMap<State> = { + loading: Loading, + "loading-uri": LoadingUriView, + "show-qr": ShowQrView, + "ready": ReadyView, +}; + + +export const TransferCreatePage = compose("TransferCreatePage", (p: Props) => useComponentState(p, wxApi), viewMapping) + diff --git a/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts b/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts new file mode 100644 index 000000000..9853f05ff --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts @@ -0,0 +1,86 @@ +/* + 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 <http://www.gnu.org/licenses/> + */ + +import { Amounts, TalerErrorDetail } from "@gnu-taler/taler-util"; +import { TalerError } from "@gnu-taler/taler-wallet-core"; +import { useState } from "preact/hooks"; +import * as wxApi from "../../wxApi.js"; +import { Props, State } from "./index.js"; + +export function useComponentState( + { amount: amountStr }: Props, + api: typeof wxApi, +): State { + const amount = Amounts.parseOrThrow(amountStr) + + const [subject, setSubject] = useState(""); + const [talerUri, setTalerUri] = useState("") + const [operationError, setOperationError] = useState<TalerErrorDetail | undefined>(undefined) + + + if (talerUri) { + return { + status: "show-qr", + talerUri, + error: undefined, + close: () => { null }, + } + } + + + async function accept(): Promise<string> { + try { + + const resp = await api.initiatePeerPushPayment({ + amount: Amounts.stringify(amount), + partialContractTerms: { + summary: subject + } + }) + return resp.talerUri + } catch (e) { + if (e instanceof TalerError) { + setOperationError(e.errorDetail) + } + console.error(e) + throw Error("error trying to accept") + } + } + return { + status: "ready", + invalid: !subject || Amounts.isZero(amount), + subject: { + value: subject, + onInput: async (e) => setSubject(e) + }, + copyToClipboard: { + onClick: async () => { + const uri = await accept(); + navigator.clipboard.writeText(uri || ""); + } + }, + showQr: { + onClick: async () => { + const uri = await accept(); + setTalerUri(uri) + } + }, + chosenAmount: amount, + toBeReceived: amount, + error: undefined, + operationError + } +} diff --git a/packages/taler-wallet-webextension/src/cta/TransferCreate/stories.tsx b/packages/taler-wallet-webextension/src/cta/TransferCreate/stories.tsx new file mode 100644 index 000000000..1e528df73 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferCreate/stories.tsx @@ -0,0 +1,56 @@ +/* + 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 <http://www.gnu.org/licenses/> + */ + +/** + * + * @author Sebastian Javier Marchano (sebasjm) + */ + +import { createExample } from "../../test-utils.js"; +import { ReadyView, ShowQrView } from "./views.js"; + +export default { + title: "wallet/transfer create", +}; + +export const ShowQr = createExample(ShowQrView, { + talerUri: + "taler://pay-push/exchange.taler.ar/HS585JK0QCXHJ8Z8QWZA3EBAY5WY7XNC1RR2MHJXSH2Z4WP0YPJ0", + close: () => { + null; + }, +}); + +export const Ready = createExample(ReadyView, { + chosenAmount: { + currency: "ARS", + value: 1, + fraction: 0, + }, + toBeReceived: { + currency: "ARS", + value: 1, + fraction: 0, + }, + copyToClipboard: {}, + showQr: {}, + subject: { + value: "the subject", + onInput: async () => { + null; + }, + }, +}); diff --git a/packages/taler-wallet-webextension/src/cta/TransferCreate/test.ts b/packages/taler-wallet-webextension/src/cta/TransferCreate/test.ts new file mode 100644 index 000000000..631e76d01 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferCreate/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 <http://www.gnu.org/licenses/> + */ + +/** + * + * @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/TransferCreate/views.tsx b/packages/taler-wallet-webextension/src/cta/TransferCreate/views.tsx new file mode 100644 index 000000000..ebdf1e746 --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/TransferCreate/views.tsx @@ -0,0 +1,117 @@ +/* + 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 <http://www.gnu.org/licenses/> + */ + +import { h, VNode } from "preact"; +import { LoadingError } from "../../components/LoadingError.js"; +import { LogoHeader } from "../../components/LogoHeader.js"; +import { Part } from "../../components/Part.js"; +import { QR } from "../../components/QR.js"; +import { Link, SubTitle, WalletAction } from "../../components/styled/index.js"; +import { useTranslationContext } from "../../context/translation.js"; +import { Button } from "../../mui/Button.js"; +import { Grid } from "../../mui/Grid.js"; +import { TextField } from "../../mui/TextField.js"; +import { TransferDetails } from "../../wallet/Transaction.js"; +import { State } from "./index.js"; + +export function LoadingUriView({ error }: State.LoadingUriError): VNode { + const { i18n } = useTranslationContext(); + + return ( + <LoadingError + title={<i18n.Translate>Could not load</i18n.Translate>} + error={error} + /> + ); +} + +export function ShowQrView({ talerUri, close }: State.ShowQr): VNode { + const { i18n } = useTranslationContext(); + return ( + <WalletAction> + <LogoHeader /> + <SubTitle> + <i18n.Translate>Digital invoice</i18n.Translate> + </SubTitle> + <section> + <p>Scan this QR code with the wallet</p> + <QR text={talerUri} /> + </section> + <section> + <Link upperCased onClick={close}> + <i18n.Translate>Close</i18n.Translate> + </Link> + </section> + </WalletAction> + ); +} + +export function ReadyView({ + subject, + toBeReceived, + chosenAmount, + showQr, + copyToClipboard, + invalid, +}: State.Ready): VNode { + const { i18n } = useTranslationContext(); + return ( + <WalletAction> + <LogoHeader /> + <SubTitle> + <i18n.Translate>Digital cash transfer</i18n.Translate> + </SubTitle> + <section style={{ textAlign: "left" }}> + <TextField + label="Subject" + variant="filled" + error={!!subject.error} + required + fullWidth + value={subject.value} + onChange={subject.onInput} + /> + <Part + title={<i18n.Translate>Details</i18n.Translate>} + text={ + <TransferDetails + amount={{ + effective: toBeReceived, + raw: chosenAmount, + }} + /> + } + /> + </section> + <section> + <p>How do you want to transfer?</p> + + <Grid item container columns={1} spacing={1}> + <Grid item xs={1}> + <Button disabled={invalid} onClick={copyToClipboard.onClick}> + Copy transfer URI to clipboard + </Button> + </Grid> + <Grid item xs={1}> + <Button disabled={invalid} onClick={showQr.onClick}> + Show QR + </Button> + </Grid> + </Grid> + </section> + </WalletAction> + ); +} 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 <http://www.gnu.org/licenses/> + */ + +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<State> = { + 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 <http://www.gnu.org/licenses/> + */ + +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<TalerErrorDetail | undefined>(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<void> { + 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 <http://www.gnu.org/licenses/> + */ + +/** + * + * @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 <http://www.gnu.org/licenses/> + */ + +/** + * + * @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 <http://www.gnu.org/licenses/> + */ + +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 ( + <LoadingError + title={<i18n.Translate>Could not load</i18n.Translate>} + error={error} + /> + ); +} + +export function ReadyView({ + accept, + amount, + operationError, +}: State.Ready): VNode { + const { i18n } = useTranslationContext(); + return ( + <WalletAction> + <LogoHeader /> + <SubTitle> + <i18n.Translate>Digital cash transfer</i18n.Translate> + </SubTitle> + {operationError && ( + <ErrorTalerOperation + title={ + <i18n.Translate> + Could not finish the pickup operation + </i18n.Translate> + } + error={operationError} + /> + )} + <section style={{ textAlign: "left" }}> + <Part + title={<i18n.Translate>Amount</i18n.Translate>} + text={<Amount value={amount} />} + /> + </section> + <section> + <Button variant="contained" color="success" onClick={accept.onClick}> + <i18n.Translate>Pickup</i18n.Translate> + </Button> + </section> + </WalletAction> + ); +} diff --git a/packages/taler-wallet-webextension/src/cta/index.stories.ts b/packages/taler-wallet-webextension/src/cta/index.stories.ts index 92f4bbcb1..2f0ef33fb 100644 --- a/packages/taler-wallet-webextension/src/cta/index.stories.ts +++ b/packages/taler-wallet-webextension/src/cta/index.stories.ts @@ -25,5 +25,9 @@ import * as a4 from "./Refund/stories.jsx"; import * as a5 from "./Tip/stories.jsx"; import * as a6 from "./Withdraw/stories.jsx"; import * as a7 from "./TermsOfServiceSection.stories.js"; +import * as a8 from "./InvoiceCreate/stories.js"; +import * as a9 from "./InvoicePay/stories.js"; +import * as a10 from "./TransferCreate/stories.js"; +import * as a11 from "./TransferPickup/stories.js"; -export default [a1, a3, a4, a5, a6, a7]; +export default [a1, a3, a4, a5, a6, a7, a8, a9, a10, a11]; |