diff --git a/packages/taler-wallet-webextension/src/svg/check_24px.svg b/packages/taler-wallet-webextension/src/svg/check_24px.svg new file mode 100644 index 000000000..522695ef3 --- /dev/null +++ b/packages/taler-wallet-webextension/src/svg/check_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/taler-wallet-webextension/src/svg/warning_24px.svg b/packages/taler-wallet-webextension/src/svg/warning_24px.svg new file mode 100644 index 000000000..d27c4c6ec --- /dev/null +++ b/packages/taler-wallet-webextension/src/svg/warning_24px.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/taler-wallet-webextension/src/wallet/AddAccount/stories.tsx b/packages/taler-wallet-webextension/src/wallet/AddAccount/stories.tsx deleted file mode 100644 index 696e424c4..000000000 --- a/packages/taler-wallet-webextension/src/wallet/AddAccount/stories.tsx +++ /dev/null @@ -1,29 +0,0 @@ -/* - 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: "example", -}; - -export const Ready = createExample(ReadyView, {}); diff --git a/packages/taler-wallet-webextension/src/wallet/AddAccount/views.tsx b/packages/taler-wallet-webextension/src/wallet/AddAccount/views.tsx deleted file mode 100644 index d6ab7e967..000000000 --- a/packages/taler-wallet-webextension/src/wallet/AddAccount/views.tsx +++ /dev/null @@ -1,249 +0,0 @@ -/* - 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 { parsePaytoUri } from "@gnu-taler/taler-util"; -import { Fragment, h, VNode } from "preact"; -import { useState } from "preact/hooks"; -import { ErrorMessage } from "../../components/ErrorMessage.js"; -import { LoadingError } from "../../components/LoadingError.js"; -import { SelectList } from "../../components/SelectList.js"; -import { Input, LightText, SubTitle } from "../../components/styled/index.js"; -import { useTranslationContext } from "../../context/translation.js"; -import { Button } from "../../mui/Button.js"; -import { TextFieldHandler } from "../../mui/handlers.js"; -import { TextField } from "../../mui/TextField.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({ - currency, - error, - accountType, - alias, - onAccountAdded, - onCancel, - uri, -}: State.Ready): VNode { - const { i18n } = useTranslationContext(); - - return ( - -
- - Add bank account for {currency} - - - - Enter the URL of an exchange you trust. - - - - {error && ( - Unable add this account} - description={error} - /> - )} -

- - Select account type} - list={accountType.list} - name="accountType" - value={accountType.value} - onChange={accountType.onChange} - /> - -

- {accountType.value === "" ? undefined : ( - -

- -

-

- -

- - )} -
-
- - -
- - ); -} - -function BitcoinAddressAccount({ field }: { field: TextFieldHandler }): VNode { - const { i18n } = useTranslationContext(); - const [value, setValue] = useState(undefined); - const errors = undefinedIfEmpty({ - value: !value ? i18n.str`Can't be empty` : undefined, - }); - return ( - - { - setValue(v); - if (!errors) { - field.onInput(`payto://bitcoin/${value}`); - } - }} - /> - {value !== undefined && errors?.value && ( - {errors?.value}} /> - )} - - ); -} - -function undefinedIfEmpty(obj: T): T | undefined { - return Object.keys(obj).some((k) => (obj as any)[k] !== undefined) - ? obj - : undefined; -} - -function TalerBankAddressAccount({ - field, -}: { - field: TextFieldHandler; -}): VNode { - const { i18n } = useTranslationContext(); - const [host, setHost] = useState(undefined); - const [account, setAccount] = useState(undefined); - const errors = undefinedIfEmpty({ - host: !host ? i18n.str`Can't be empty` : undefined, - account: !account ? i18n.str`Can't be empty` : undefined, - }); - return ( - - { - setHost(v); - if (!errors) { - field.onInput(`payto://x-taler-bank/${host}/${account}`); - } - }} - />{" "} - {host !== undefined && errors?.host && ( - {errors?.host}} /> - )} - { - setAccount(v || ""); - if (!errors) { - field.onInput(`payto://x-taler-bank/${host}/${account}`); - } - }} - />{" "} - {account !== undefined && errors?.account && ( - {errors?.account}} /> - )} - - ); -} - -function IbanAddressAccount({ field }: { field: TextFieldHandler }): VNode { - const { i18n } = useTranslationContext(); - const [value, setValue] = useState(undefined); - const errors = undefinedIfEmpty({ - value: !value ? i18n.str`Can't be empty` : undefined, - }); - return ( - - { - setValue(v); - if (!errors) { - field.onInput(`payto://iba/${value}`); - } - }} - /> - {value !== undefined && errors?.value && ( - {errors?.value}} /> - )} - - ); -} - -function CustomFieldByAccountType({ - type, - field, -}: { - type: string; - field: TextFieldHandler; -}): VNode { - if (type === "bitcoin") { - return ; - } - if (type === "x-taler-bank") { - return ; - } - if (type === "iban") { - return ; - } - return ; -} diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage/index.ts b/packages/taler-wallet-webextension/src/wallet/DepositPage/index.ts index 77661fe15..85896da26 100644 --- a/packages/taler-wallet-webextension/src/wallet/DepositPage/index.ts +++ b/packages/taler-wallet-webextension/src/wallet/DepositPage/index.ts @@ -24,7 +24,7 @@ import { } from "../../mui/handlers.js"; import { compose, StateViewMap } from "../../utils/index.js"; import { wxApi } from "../../wxApi.js"; -import { AddAccountPage } from "../AddAccount/index.js"; +import { ManageAccountPage } from "../ManageAccount/index.js"; import { useComponentState } from "./state.js"; import { AmountOrCurrencyErrorView, @@ -62,7 +62,7 @@ export namespace State { } export interface AddingAccount { - status: "adding-account"; + status: "manage-account"; error: undefined; currency: string; onAccountAdded: (p: string) => void; @@ -94,7 +94,7 @@ export namespace State { error: undefined; currency: string; - selectedAccount: PaytoUri | undefined; + currentAccount: PaytoUri; totalFee: AmountJson; totalToDeposit: AmountJson; @@ -112,7 +112,7 @@ const viewMapping: StateViewMap = { "amount-or-currency-error": AmountOrCurrencyErrorView, "no-enough-balance": NoEnoughBalanceView, "no-accounts": NoAccountToDepositView, - "adding-account": AddAccountPage, + "manage-account": ManageAccountPage, ready: ReadyView, }; diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts b/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts index b3a377040..fe692e80d 100644 --- a/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts +++ b/packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts @@ -50,9 +50,7 @@ export function useComponentState( // const [accountIdx, setAccountIdx] = useState(0); const [amount, setAmount] = useState(initialValue); - const [selectedAccount, setSelectedAccount] = useState< - PaytoUri | undefined - >(); + const [selectedAccount, setSelectedAccount] = useState(); const [fee, setFee] = useState(undefined); const [addingAccount, setAddingAccount] = useState(false); @@ -82,7 +80,7 @@ export function useComponentState( if (addingAccount) { return { - status: "adding-account", + status: "manage-account", error: undefined, currency, onAccountAdded: (p: string) => { @@ -92,6 +90,7 @@ export function useComponentState( }, onCancel: () => { setAddingAccount(false); + hook.retry(); }, }; } @@ -122,13 +121,12 @@ export function useComponentState( }, }; } + const firstAccount = accounts[0].uri + const currentAccount = !selectedAccount ? firstAccount : selectedAccount; const accountMap = createLabelsForBankAccount(accounts); - accountMap[""] = "Select one account..."; async function updateAccountFromList(accountStr: string): Promise { - // const newSelected = !accountMap[accountStr] ? undefined : accountMap[accountStr]; - // if (!newSelected) return; const uri = !accountStr ? undefined : parsePaytoUri(accountStr); if (uri && parsedAmount) { try { @@ -136,7 +134,6 @@ export function useComponentState( setSelectedAccount(uri); setFee(result); } catch (e) { - console.error(e) setSelectedAccount(uri); setFee(undefined); } @@ -145,13 +142,12 @@ export function useComponentState( async function updateAmount(numStr: string): Promise { const parsed = Amounts.parse(`${currency}:${numStr}`); - if (parsed && selectedAccount) { + if (parsed) { try { - const result = await getFeeForAmount(selectedAccount, parsed, api); + const result = await getFeeForAmount(currentAccount, parsed, api); setAmount(numStr); setFee(result); } catch (e) { - console.error(e) setAmount(numStr); setFee(undefined); } @@ -179,15 +175,14 @@ export function useComponentState( const unableToDeposit = !parsedAmount || //no amount specified - selectedAccount === undefined || //no account selected Amounts.isZero(totalToDeposit) || //deposit may be zero because of fee fee === undefined || //no fee calculated yet amountError !== undefined; //amount field may be invalid async function doSend(): Promise { - if (!selectedAccount || !parsedAmount || !currency) return; + if (!parsedAmount || !currency) return; - const depositPaytoUri = `payto://${selectedAccount.targetType}/${selectedAccount.targetPath}`; + const depositPaytoUri = `payto://${currentAccount.targetType}/${currentAccount.targetPath}`; const amount = Amounts.stringify(parsedAmount); await api.wallet.call(WalletApiOperation.CreateDepositGroup, { amount, depositPaytoUri @@ -211,10 +206,10 @@ export function useComponentState( }, account: { list: accountMap, - value: !selectedAccount ? "" : stringifyPaytoUri(selectedAccount), + value: stringifyPaytoUri(currentAccount), onChange: updateAccountFromList, }, - selectedAccount, + currentAccount, cancelHandler: { onClick: async () => { onCancel(currency); diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx b/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx index ed5945c06..64b2c91a7 100644 --- a/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/DepositPage/stories.tsx @@ -55,6 +55,13 @@ export const WithNoAccountForIBAN = createExample(ReadyView, { null; }, }, + currentAccount: { + isKnown: true, + targetType: "iban", + iban: "ABCD1234", + params: {}, + targetPath: "/ABCD1234", + }, currency: "USD", amount: { onInput: async () => { @@ -83,6 +90,13 @@ export const WithIBANAccountTypeSelected = createExample(ReadyView, { null; }, }, + currentAccount: { + isKnown: true, + targetType: "iban", + iban: "ABCD1234", + params: {}, + targetPath: "/ABCD1234", + }, currency: "USD", amount: { onInput: async () => { @@ -111,6 +125,13 @@ export const NewBitcoinAccountTypeSelected = createExample(ReadyView, { null; }, }, + currentAccount: { + isKnown: true, + targetType: "iban", + iban: "ABCD1234", + params: {}, + targetPath: "/ABCD1234", + }, onAddAccount: {}, currency: "USD", amount: { diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage/test.ts b/packages/taler-wallet-webextension/src/wallet/DepositPage/test.ts index 62097c3e4..4a648312e 100644 --- a/packages/taler-wallet-webextension/src/wallet/DepositPage/test.ts +++ b/packages/taler-wallet-webextension/src/wallet/DepositPage/test.ts @@ -172,7 +172,7 @@ describe("DepositPage states", () => { if (r.status !== "ready") expect.fail(); expect(r.cancelHandler.onClick).not.undefined; expect(r.currency).eq(currency); - expect(r.account.value).eq(""); + expect(r.account.value).eq(stringifyPaytoUri(ibanPayto.uri)); expect(r.amount.value).eq("0"); expect(r.depositHandler.onClick).undefined; } @@ -195,7 +195,7 @@ describe("DepositPage states", () => { }], }) handler.addWalletCallResponse(WalletApiOperation.ListKnownBankAccounts, undefined, { - accounts: [ibanPayto] + accounts: [talerBankPayto, ibanPayto] }); handler.addWalletCallResponse(WalletApiOperation.GetFeeForDeposit, undefined, withoutFee()) handler.addWalletCallResponse(WalletApiOperation.GetFeeForDeposit, undefined, withoutFee()) @@ -221,7 +221,7 @@ describe("DepositPage states", () => { if (r.status !== "ready") expect.fail(); expect(r.cancelHandler.onClick).not.undefined; expect(r.currency).eq(currency); - expect(r.account.value).eq(""); + expect(r.account.value).eq(stringifyPaytoUri(talerBankPayto.uri)); expect(r.amount.value).eq("0"); expect(r.depositHandler.onClick).undefined; expect(r.totalFee).deep.eq(Amounts.parseOrThrow(`${currency}:0`)); @@ -328,7 +328,7 @@ describe("DepositPage states", () => { }], }) handler.addWalletCallResponse(WalletApiOperation.ListKnownBankAccounts, undefined, { - accounts: [ibanPayto] + accounts: [talerBankPayto, ibanPayto] }); handler.addWalletCallResponse(WalletApiOperation.GetFeeForDeposit, undefined, withSomeFee()) handler.addWalletCallResponse(WalletApiOperation.GetFeeForDeposit, undefined, withSomeFee()) @@ -353,7 +353,7 @@ describe("DepositPage states", () => { if (r.status !== "ready") expect.fail(); expect(r.cancelHandler.onClick).not.undefined; expect(r.currency).eq(currency); - expect(r.account.value).eq(""); + expect(r.account.value).eq(stringifyPaytoUri(talerBankPayto.uri)); expect(r.amount.value).eq("0"); expect(r.depositHandler.onClick).undefined; expect(r.totalFee).deep.eq(Amounts.parseOrThrow(`${currency}:0`)); diff --git a/packages/taler-wallet-webextension/src/wallet/DepositPage/views.tsx b/packages/taler-wallet-webextension/src/wallet/DepositPage/views.tsx index ddb23c9bb..e864c8413 100644 --- a/packages/taler-wallet-webextension/src/wallet/DepositPage/views.tsx +++ b/packages/taler-wallet-webextension/src/wallet/DepositPage/views.tsx @@ -160,61 +160,55 @@ export function ReadyView(state: State.Ready): VNode { variant="text" style={{ marginLeft: "auto" }} > - Add another account + Manage accounts - {state.selectedAccount && ( - -

- -

- - -
- {state.currency} - state.amount.onInput(e.currentTarget.value)} - /> -
- {state.amount.error && ( - {state.amount.error} - )} - +

+ +

+ + +
+ {state.currency} + state.amount.onInput(e.currentTarget.value)} + /> +
+ {state.amount.error && {state.amount.error}} + - - -
- {state.currency} - -
- + + +
+ {state.currency} + +
+ - - -
- {state.currency} - -
- - - )} + + +
+ {state.currency} + +
+