From f300850b19f8b4084bfac88a4cfd06e43bc75a8e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 6 Apr 2022 12:20:00 -0300 Subject: cta stories and input filled mui --- .../src/cta/Pay.stories.tsx | 41 ++++++++++------------ packages/taler-wallet-webextension/src/cta/Pay.tsx | 31 ++++++++-------- .../src/cta/Withdraw.stories.tsx | 16 +++++---- .../src/cta/index.stories.ts | 28 +++++++++++++++ 4 files changed, 73 insertions(+), 43 deletions(-) create mode 100644 packages/taler-wallet-webextension/src/cta/index.stories.ts (limited to 'packages/taler-wallet-webextension/src/cta') diff --git a/packages/taler-wallet-webextension/src/cta/Pay.stories.tsx b/packages/taler-wallet-webextension/src/cta/Pay.stories.tsx index 3804ab3d3..7dbb7723d 100644 --- a/packages/taler-wallet-webextension/src/cta/Pay.stories.tsx +++ b/packages/taler-wallet-webextension/src/cta/Pay.stories.tsx @@ -147,7 +147,7 @@ export const TicketWithAProductList = createExample(TestedComponent, { }, }); -export const AlreadyConfirmedWithFullfilment = createExample(TestedComponent, { +export const AlreadyConfirmedByOther = createExample(TestedComponent, { payStatus: { status: PreparePayResultType.AlreadyConfirmed, amountEffective: "USD:10", @@ -156,8 +156,6 @@ export const AlreadyConfirmedWithFullfilment = createExample(TestedComponent, { merchant: { name: "someone", }, - fulfillment_message: - "congratulations! you are looking at the fulfillment message! ", summary: "some beers", amount: "USD:10", } as Partial as any, @@ -167,28 +165,25 @@ export const AlreadyConfirmedWithFullfilment = createExample(TestedComponent, { }, }); -export const AlreadyConfirmedWithoutFullfilment = createExample( - TestedComponent, - { - payStatus: { - status: PreparePayResultType.AlreadyConfirmed, - amountEffective: "USD:10", - amountRaw: "USD:10", - contractTerms: { - merchant: { - name: "someone", - }, - summary: "some beers", - amount: "USD:10", - } as Partial as any, - contractTermsHash: "123456", - proposalId: "proposal1234", - paid: false, - }, +export const AlreadyPaidWithoutFulfillment = createExample(TestedComponent, { + payStatus: { + status: PreparePayResultType.AlreadyConfirmed, + amountEffective: "USD:10", + amountRaw: "USD:10", + contractTerms: { + merchant: { + name: "someone", + }, + summary: "some beers", + amount: "USD:10", + } as Partial as any, + contractTermsHash: "123456", + proposalId: "proposal1234", + paid: true, }, -); +}); -export const AlreadyPaid = createExample(TestedComponent, { +export const AlreadyPaidWithFulfillment = createExample(TestedComponent, { payStatus: { status: PreparePayResultType.AlreadyConfirmed, amountEffective: "USD:10", diff --git a/packages/taler-wallet-webextension/src/cta/Pay.tsx b/packages/taler-wallet-webextension/src/cta/Pay.tsx index 13fb69853..359625999 100644 --- a/packages/taler-wallet-webextension/src/cta/Pay.tsx +++ b/packages/taler-wallet-webextension/src/cta/Pay.tsx @@ -105,6 +105,23 @@ export function PayPage({ return { payStatus, balance }; }, [NotificationType.CoinWithdrawn]); + useEffect(() => { + const payStatus = + hook && !hook.hasError ? hook.response.payStatus : undefined; + if ( + payStatus && + payStatus.status === PreparePayResultType.AlreadyConfirmed && + payStatus.paid + ) { + const fu = payStatus.contractTerms.fulfillment_url; + if (fu) { + setTimeout(() => { + document.location.href = fu; + }, 3000); + } + } + }, []); + if (!hook) { return ; } @@ -172,20 +189,6 @@ export function PaymentRequestView({ let totalFees: AmountJson = Amounts.getZero(payStatus.amountRaw); const contractTerms: ContractTerms = payStatus.contractTerms; - useEffect(() => { - if ( - payStatus.status === PreparePayResultType.AlreadyConfirmed && - payStatus.paid - ) { - const fu = payStatus.contractTerms.fulfillment_url; - if (fu) { - setTimeout(() => { - document.location.href = fu; - }, 3000); - } - } - }); - if (!contractTerms) { return ( + */ + +/** + * + * @author Sebastian Javier Marchano (sebasjm) + */ + +import * as a1 from "./Deposit.stories.jsx"; +import * as a3 from "./Pay.stories.jsx"; +import * as a4 from "./Refund.stories.jsx"; +import * as a5 from "./Tip.stories.jsx"; +import * as a6 from "./Withdraw.stories.jsx"; + +export default [a1, a3, a4, a5, a6]; -- cgit v1.2.3