summaryrefslogtreecommitdiff
path: root/packages/taler-wallet-webextension/src/cta
diff options
context:
space:
mode:
authorSebastian <sebasjm@gmail.com>2022-05-03 00:16:03 -0300
committerSebastian <sebasjm@gmail.com>2022-05-03 00:16:03 -0300
commitdc842eab6b7a3b2e891ee89a325ec73e04d3be95 (patch)
tree5df20315b9f50c88598fe4084d739b8610f46bac /packages/taler-wallet-webextension/src/cta
parent939729004a8f5fecde19e679a0672843c496662f (diff)
downloadwallet-core-dc842eab6b7a3b2e891ee89a325ec73e04d3be95.tar.gz
wallet-core-dc842eab6b7a3b2e891ee89a325ec73e04d3be95.tar.bz2
wallet-core-dc842eab6b7a3b2e891ee89a325ec73e04d3be95.zip
deposit from payto
Diffstat (limited to 'packages/taler-wallet-webextension/src/cta')
-rw-r--r--packages/taler-wallet-webextension/src/cta/Deposit.stories.tsx13
-rw-r--r--packages/taler-wallet-webextension/src/cta/Deposit.test.ts92
-rw-r--r--packages/taler-wallet-webextension/src/cta/Deposit.tsx158
3 files changed, 246 insertions, 17 deletions
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 <http://www.gnu.org/licenses/>
+ */
+
+/**
+ *
+ * @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<CreateDepositGroupResponse | undefined>(
+ 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<void> {
+ 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 <Loading />;
+ const state = useComponentState(talerDepositUri, amount, wxApi);
+
+ if (!talerDepositUri) {
return (
- <LoadingError
- title={<i18n.Translate>Could not load pay status</i18n.Translate>}
- error={state.hook}
- />
+ <span>
+ <i18n.Translate>missing taler deposit uri</i18n.Translate>
+ </span>
);
}
+
return <View state={state} />;
}
@@ -75,13 +147,71 @@ export interface ViewProps {
export function View({ state }: ViewProps): VNode {
const { i18n } = useTranslationContext();
+ if (state.status === "loading") {
+ if (!state.hook) return <Loading />;
+ return (
+ <LoadingError
+ title={<i18n.Translate>Could not load deposit status</i18n.Translate>}
+ error={state.hook}
+ />
+ );
+ }
+
+ if (state.status === "completed") {
+ return (
+ <WalletAction>
+ <LogoHeader />
+
+ <SubTitle>
+ <i18n.Translate>Digital cash deposit</i18n.Translate>
+ </SubTitle>
+ <section>
+ <p>
+ <i18n.Translate>deposit completed</i18n.Translate>
+ </p>
+ </section>
+ </WalletAction>
+ );
+ }
+
return (
<WalletAction>
<LogoHeader />
<SubTitle>
- <i18n.Translate>Digital cash refund</i18n.Translate>
+ <i18n.Translate>Digital cash deposit</i18n.Translate>
</SubTitle>
+ <section>
+ {Amounts.isNonZero(state.cost) && (
+ <Part
+ big
+ title={<i18n.Translate>Cost</i18n.Translate>}
+ text={<Amount value={state.cost} />}
+ kind="negative"
+ />
+ )}
+ {Amounts.isNonZero(state.fee) && (
+ <Part
+ big
+ title={<i18n.Translate>Fee</i18n.Translate>}
+ text={<Amount value={state.fee} />}
+ kind="negative"
+ />
+ )}
+ <Part
+ big
+ title={<i18n.Translate>To be received</i18n.Translate>}
+ text={<Amount value={state.effective} />}
+ kind="positive"
+ />
+ </section>
+ <section>
+ <ButtonSuccess upperCased onClick={state.confirm.onClick}>
+ <i18n.Translate>
+ Deposit {<Amount value={state.effective} />}
+ </i18n.Translate>
+ </ButtonSuccess>
+ </section>
</WalletAction>
);
}