From dc842eab6b7a3b2e891ee89a325ec73e04d3be95 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 3 May 2022 00:16:03 -0300 Subject: deposit from payto --- .../src/NavigationBar.tsx | 1 + .../src/components/Part.tsx | 43 +++++- .../src/cta/Deposit.stories.tsx | 13 +- .../src/cta/Deposit.test.ts | 92 ++++++++++++ .../taler-wallet-webextension/src/cta/Deposit.tsx | 158 +++++++++++++++++++-- .../src/wallet/Application.tsx | 2 + .../src/wallet/Transaction.tsx | 6 +- packages/taler-wallet-webextension/src/wxApi.ts | 12 ++ 8 files changed, 308 insertions(+), 19 deletions(-) create mode 100644 packages/taler-wallet-webextension/src/cta/Deposit.test.ts (limited to 'packages/taler-wallet-webextension/src') diff --git a/packages/taler-wallet-webextension/src/NavigationBar.tsx b/packages/taler-wallet-webextension/src/NavigationBar.tsx index df779cae3..58783a087 100644 --- a/packages/taler-wallet-webextension/src/NavigationBar.tsx +++ b/packages/taler-wallet-webextension/src/NavigationBar.tsx @@ -63,6 +63,7 @@ export enum Pages { cta_refund = "/cta/refund", cta_tips = "/cta/tip", cta_withdraw = "/cta/withdraw", + cta_deposit = "/cta/deposit", } export function PopupNavBar({ path = "" }: { path?: string }): VNode { diff --git a/packages/taler-wallet-webextension/src/components/Part.tsx b/packages/taler-wallet-webextension/src/components/Part.tsx index d1683b20b..21c0f65dc 100644 --- a/packages/taler-wallet-webextension/src/components/Part.tsx +++ b/packages/taler-wallet-webextension/src/components/Part.tsx @@ -13,7 +13,8 @@ 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 { PaytoUri, stringifyPaytoUri } from "@gnu-taler/taler-util"; +import { Fragment, h, VNode } from "preact"; import { ExtraLargeText, LargeText, SmallLightText } from "./styled/index.js"; export type Kind = "positive" | "negative" | "neutral"; @@ -39,3 +40,43 @@ export function Part({ text, title, kind, big }: Props): VNode { ); } + +interface PropsPayto { + payto: PaytoUri; + kind: Kind; + big?: boolean; +} +export function PartPayto({ payto, kind, big }: PropsPayto): VNode { + const Text = big ? ExtraLargeText : LargeText; + let text: string | undefined = undefined; + let title = ""; + if (payto.isKnown) { + if (payto.targetType === "x-taler-bank") { + text = payto.account; + title = "Bank account"; + } else if (payto.targetType === "bitcoin") { + text = payto.targetPath; + title = "Bitcoin addr"; + } else if (payto.targetType === "iban") { + text = payto.targetPath; + title = "IBAN"; + } + } + if (!text) { + text = stringifyPaytoUri(payto); + title = "Payto URI"; + } + return ( +
+ {title} + + {text} + +
+ ); +} diff --git a/packages/taler-wallet-webextension/src/cta/Deposit.stories.tsx b/packages/taler-wallet-webextension/src/cta/Deposit.stories.tsx index 6432d532d..7356bb4e9 100644 --- a/packages/taler-wallet-webextension/src/cta/Deposit.stories.tsx +++ b/packages/taler-wallet-webextension/src/cta/Deposit.stories.tsx @@ -19,7 +19,7 @@ * @author Sebastian Javier Marchano (sebasjm) */ -import { ContractTerms, PreparePayResultType } from "@gnu-taler/taler-util"; +import { Amounts } from "@gnu-taler/taler-util"; import { createExample } from "../test-utils.js"; import { View as TestedComponent } from "./Deposit.js"; @@ -29,6 +29,13 @@ export default { argTypes: {}, }; -export const Simple = createExample(TestedComponent, { - state: { status: "ready" }, +export const Ready = createExample(TestedComponent, { + state: { + status: "ready", + confirm: {}, + cost: Amounts.parseOrThrow("EUR:1.2"), + effective: Amounts.parseOrThrow("EUR:1"), + fee: Amounts.parseOrThrow("EUR:0.2"), + hook: undefined, + }, }); diff --git a/packages/taler-wallet-webextension/src/cta/Deposit.test.ts b/packages/taler-wallet-webextension/src/cta/Deposit.test.ts new file mode 100644 index 000000000..16e7961cc --- /dev/null +++ b/packages/taler-wallet-webextension/src/cta/Deposit.test.ts @@ -0,0 +1,92 @@ +/* + This file is part of GNU Taler + (C) 2021 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 { Amounts, PrepareDepositResponse } from "@gnu-taler/taler-util"; +import { expect } from "chai"; +import { mountHook } from "../test-utils.js"; +import { useComponentState } from "./Deposit.jsx"; + +describe("Deposit CTA states", () => { + it("should tell the user that the URI is missing", async () => { + const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } = mountHook(() => + useComponentState(undefined, undefined, { + prepareRefund: async () => ({}), + applyRefund: async () => ({}), + onUpdateNotification: async () => ({}) + } as any), + ); + + { + const { status, hook } = getLastResultOrThrow() + expect(status).equals('loading') + expect(hook).undefined; + } + + await waitNextUpdate() + + { + const { status, hook } = getLastResultOrThrow() + + expect(status).equals('loading') + if (!hook) expect.fail(); + if (!hook.hasError) expect.fail(); + if (hook.operational) expect.fail(); + expect(hook.message).eq("ERROR_NO-URI-FOR-DEPOSIT"); + } + + await assertNoPendingUpdate() + }); + + it("should be ready after loading", async () => { + const { getLastResultOrThrow, waitNextUpdate, assertNoPendingUpdate } = mountHook(() => + useComponentState("payto://refund/asdasdas", "EUR:1", { + prepareDeposit: async () => ({ + effectiveDepositAmount: Amounts.parseOrThrow("EUR:1"), + totalDepositCost: Amounts.parseOrThrow("EUR:1.2") + } as PrepareDepositResponse as any), + createDepositGroup: async () => ({}), + } as any), + ); + + { + const { status, hook } = getLastResultOrThrow() + expect(status).equals('loading') + expect(hook).undefined; + } + + await waitNextUpdate() + + { + const state = getLastResultOrThrow() + + if (state.status !== 'ready') expect.fail(); + if (state.hook) expect.fail(); + expect(state.confirm.onClick).not.undefined; + expect(state.cost).deep.eq(Amounts.parseOrThrow("EUR:1.2")); + expect(state.fee).deep.eq(Amounts.parseOrThrow("EUR:0.2")); + expect(state.effective).deep.eq(Amounts.parseOrThrow("EUR:1")); + } + + await assertNoPendingUpdate() + + }); + +}); \ No newline at end of file diff --git a/packages/taler-wallet-webextension/src/cta/Deposit.tsx b/packages/taler-wallet-webextension/src/cta/Deposit.tsx index 529da11ba..2fc7cbc41 100644 --- a/packages/taler-wallet-webextension/src/cta/Deposit.tsx +++ b/packages/taler-wallet-webextension/src/cta/Deposit.tsx @@ -24,48 +24,120 @@ * Imports. */ +import { + AmountJson, + Amounts, + AmountString, + CreateDepositGroupResponse, +} from "@gnu-taler/taler-util"; import { Fragment, h, VNode } from "preact"; +import { useState } from "preact/hooks"; +import { Amount } from "../components/Amount.js"; import { Loading } from "../components/Loading.js"; import { LoadingError } from "../components/LoadingError.js"; import { LogoHeader } from "../components/LogoHeader.js"; -import { SubTitle, WalletAction } from "../components/styled/index.js"; +import { Part } from "../components/Part.js"; +import { + ButtonSuccess, + SubTitle, + WalletAction, +} from "../components/styled/index.js"; import { useTranslationContext } from "../context/translation.js"; -import { HookError } from "../hooks/useAsyncAsHook.js"; +import { HookError, useAsyncAsHook } from "../hooks/useAsyncAsHook.js"; +import { ButtonHandler } from "../mui/handlers.js"; +import * as wxApi from "../wxApi.js"; interface Props { talerDepositUri?: string; + amount: AmountString; goBack: () => void; } -type State = Loading | Ready; +type State = Loading | Ready | Completed; interface Loading { status: "loading"; hook: HookError | undefined; } interface Ready { status: "ready"; + hook: undefined; + fee: AmountJson; + cost: AmountJson; + effective: AmountJson; + confirm: ButtonHandler; } +interface Completed { + status: "completed"; + hook: undefined; +} + +export function useComponentState( + talerDepositUri: string | undefined, + amountStr: AmountString | undefined, + api: typeof wxApi, +): State { + const [result, setResult] = useState( + undefined, + ); + + const info = useAsyncAsHook(async () => { + if (!talerDepositUri) throw Error("ERROR_NO-URI-FOR-DEPOSIT"); + if (!amountStr) throw Error("ERROR_NO-AMOUNT-FOR-DEPOSIT"); + const amount = Amounts.parse(amountStr); + if (!amount) throw Error("ERROR_INVALID-AMOUNT-FOR-DEPOSIT"); + const deposit = await api.prepareDeposit( + talerDepositUri, + Amounts.stringify(amount), + ); + return { deposit, uri: talerDepositUri, amount }; + }); + + if (!info || info.hasError) { + return { + status: "loading", + hook: info, + }; + } + + const { deposit, uri, amount } = info.response; + async function doDeposit(): Promise { + const resp = await api.createDepositGroup(uri, Amounts.stringify(amount)); + setResult(resp); + } + + if (result !== undefined) { + return { + status: "completed", + hook: undefined, + }; + } -function useComponentState(uri: string | undefined): State { return { - status: "loading", + status: "ready", hook: undefined, + confirm: { + onClick: doDeposit, + }, + fee: Amounts.sub(deposit.totalDepositCost, deposit.effectiveDepositAmount) + .amount, + cost: deposit.totalDepositCost, + effective: deposit.effectiveDepositAmount, }; } -export function DepositPage({ talerDepositUri, goBack }: Props): VNode { +export function DepositPage({ talerDepositUri, amount, goBack }: Props): VNode { const { i18n } = useTranslationContext(); - const state = useComponentState(talerDepositUri); - if (state.status === "loading") { - if (!state.hook) return ; + const state = useComponentState(talerDepositUri, amount, wxApi); + + if (!talerDepositUri) { return ( - Could not load pay status} - error={state.hook} - /> + + missing taler deposit uri + ); } + return ; } @@ -75,13 +147,71 @@ export interface ViewProps { export function View({ state }: ViewProps): VNode { const { i18n } = useTranslationContext(); + if (state.status === "loading") { + if (!state.hook) return ; + return ( + Could not load deposit status} + error={state.hook} + /> + ); + } + + if (state.status === "completed") { + return ( + + + + + Digital cash deposit + +
+

+ deposit completed +

+
+ + ); + } + return ( - Digital cash refund + Digital cash deposit +
+ {Amounts.isNonZero(state.cost) && ( + Cost} + text={} + kind="negative" + /> + )} + {Amounts.isNonZero(state.fee) && ( + Fee} + text={} + kind="negative" + /> + )} + To be received} + text={} + kind="positive" + /> +
+
+ + + Deposit {} + + +
); } diff --git a/packages/taler-wallet-webextension/src/wallet/Application.tsx b/packages/taler-wallet-webextension/src/wallet/Application.tsx index a5197d5b4..6a7f62c6c 100644 --- a/packages/taler-wallet-webextension/src/wallet/Application.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Application.tsx @@ -38,6 +38,7 @@ import { PayPage } from "../cta/Pay.js"; import { RefundPage } from "../cta/Refund.js"; import { TipPage } from "../cta/Tip.js"; import { WithdrawPage } from "../cta/Withdraw.js"; +import { DepositPage as DepositPageCTA } from "../cta/Deposit.js"; import { Pages, WalletNavBar } from "../NavigationBar.js"; import { DeveloperPage } from "./DeveloperPage.js"; import { BackupPage } from "./BackupPage.js"; @@ -232,6 +233,7 @@ export function Application(): VNode { + {/** * NOT FOUND diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx index 6f7c208da..bcf6114a1 100644 --- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx @@ -19,6 +19,7 @@ import { Amounts, NotificationType, parsePaytoUri, + parsePayUri, Transaction, TransactionType, WithdrawalType, @@ -32,13 +33,14 @@ import { BankDetailsByPaytoType } from "../components/BankDetailsByPaytoType.js" import { ErrorTalerOperation } from "../components/ErrorTalerOperation.js"; import { Loading } from "../components/Loading.js"; import { LoadingError } from "../components/LoadingError.js"; -import { Part } from "../components/Part.js"; +import { Part, PartPayto } from "../components/Part.js"; import { Button, ButtonDestructive, ButtonPrimary, CenteredDialog, InfoBox, + LargeText, ListOfProducts, Overlay, RowBorderGray, @@ -428,6 +430,7 @@ export function TransactionView({ Amounts.parseOrThrow(transaction.amountEffective), Amounts.parseOrThrow(transaction.amountRaw), ).amount; + const payto = parsePaytoUri(transaction.targetPaytoUri); return ( @@ -456,6 +459,7 @@ export function TransactionView({ text={} kind="negative" /> + {payto && } ); } diff --git a/packages/taler-wallet-webextension/src/wxApi.ts b/packages/taler-wallet-webextension/src/wxApi.ts index d2e903054..b48826645 100644 --- a/packages/taler-wallet-webextension/src/wxApi.ts +++ b/packages/taler-wallet-webextension/src/wxApi.ts @@ -43,6 +43,8 @@ import { GetWithdrawalDetailsForUriRequest, KnownBankAccounts, NotificationType, + PrepareDepositRequest, + PrepareDepositResponse, PreparePayResult, PrepareRefundRequest, PrepareRefundResult, @@ -160,6 +162,16 @@ export function getFeeForDeposit( } as GetFeeForDepositRequest); } +export function prepareDeposit( + depositPaytoUri: string, + amount: AmountString, +): Promise { + return callBackend("prepareDeposit", { + depositPaytoUri, + amount, + } as PrepareDepositRequest); +} + export function createDepositGroup( depositPaytoUri: string, amount: AmountString, -- cgit v1.2.3