taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

use payto builder and prevent showing cancel for non-payment

Browse Source
This commit is contained in:
Sebastian 2023-01-17 16:01:04 -03:00
parent 252382a937
commit 420493b3e6
No known key found for this signature in database
GPG Key ID: BE4FF68352439FC1
4 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/taler-wallet-webextension/src/wallet/DepositPage/state.ts
View File

@ -60,8 +60,8 @@ export function useComponentState({
parsed !== undefined
? parsed
: currency !== undefined
? Amounts.zeroOfCurrency(currency)
: undefined;
? Amounts.zeroOfCurrency(currency)
: undefined;
// const [accountIdx, setAccountIdx] = useState<number>(0);
const [selectedAccount, setSelectedAccount] = useState<PaytoUri>();
@ -147,7 +147,7 @@ export function useComponentState({
initialValue ?? ({} as any),
);
const amountStr = Amounts.stringify(amount);
const depositPaytoUri = `payto://${currentAccount.targetType}/${currentAccount.targetPath}`;
const depositPaytoUri = stringifyPaytoUri(currentAccount);
// eslint-disable-next-line react-hooks/rules-of-hooks
const hook = useAsyncAsHook(async () => {
@ -193,8 +193,8 @@ export function useComponentState({
const amountError = !isDirty
? undefined
: Amounts.cmp(balance, amount) === -1
? `Too much, your current balance is ${Amounts.stringifyValue(balance)}`
: undefined;
? `Too much, your current balance is ${Amounts.stringifyValue(balance)}`
: undefined;
const unableToDeposit =
Amounts.isZero(totalToDeposit) || //deposit may be zero because of fee

2
packages/taler-wallet-webextension/src/wallet/ManageAccount/state.ts
View File

@ -128,7 +128,7 @@ export function useComponentState({
}),
},
accountByType,
deleteAccount,
deleteAccount: pushAlertOnError(deleteAccount),
onAccountAdded: {
onClick: unableToAdd ? undefined : pushAlertOnError(addAccount),
},

22
packages/taler-wallet-webextension/src/wallet/ManageAccount/views.tsx
View File

@ -15,10 +15,12 @@
*/
import {
buildPayto,
KnownBankAccountsInfo,
PaytoUriBitcoin,
PaytoUriIBAN,
PaytoUriTalerBank,
stringifyPaytoUri,
} from "@gnu-taler/taler-util";
import { styled } from "@linaria/react";
import { Fragment, h, VNode } from "preact";
@ -411,7 +413,8 @@ function BitcoinAddressAccount({ field }: { field: TextFieldHandler }): VNode {
onChange={(v) => {
setValue(v);
if (!errors && field.onInput) {
field.onInput(`payto://bitcoin/${v}`);
const p = buildPayto("bitcoin", v, undefined);
field.onInput(stringifyPaytoUri(p));
}
}}
/>
@ -448,8 +451,9 @@ function TalerBankAddressAccount({
disabled={!field.onInput}
onChange={(v) => {
setHost(v);
if (!errors && field.onInput) {
field.onInput(`payto://x-taler-bank/${v}/${account}`);
if (!errors && field.onInput && account) {
const p = buildPayto("x-taler-bank", v, account);
field.onInput(stringifyPaytoUri(p));
}
}}
/>
@ -462,8 +466,9 @@ function TalerBankAddressAccount({
error={account !== undefined ? errors?.account : undefined}
onChange={(v) => {
setAccount(v || "");
if (!errors && field.onInput) {
field.onInput(`payto://x-taler-bank/${host}/${v}`);
if (!errors && field.onInput && host) {
const p = buildPayto("x-taler-bank", host, v);
field.onInput(stringifyPaytoUri(p));
}
}}
/>
@ -500,10 +505,9 @@ function IbanAddressAccount({ field }: { field: TextFieldHandler }): VNode {
name: string,
): void {
if (!errors && field.onInput) {
const path = bic === undefined ? iban : `${bic}/${iban}`;
field.onInput(
`payto://iban/${path}?receiver-name=${encodeURIComponent(name)}`,
);
const p = buildPayto("iban", iban, bic);
p.params["receiver-name"] = name;
field.onInput(stringifyPaytoUri(p));
}
}
return (

38
packages/taler-wallet-webextension/src/wallet/Transaction.tsx
View File

@ -202,20 +202,24 @@ function TransactionTemplate({
const SHOWING_RETRY_THRESHOLD_SECS = 30;
const showSend = false;
// (transaction.type === TransactionType.PeerPullCredit ||
// transaction.type === TransactionType.PeerPushDebit) &&
// !transaction.info.completed;
const showRetry =
transaction.error !== undefined ||
transaction.timestamp.t_s === "never" ||
(transaction.extendedStatus === ExtendedStatus.Pending &&
differenceInSeconds(new Date(), transaction.timestamp.t_s * 1000) >
SHOWING_RETRY_THRESHOLD_SECS);
const hasCancelTransactionImplemented =
transaction.type === TransactionType.Payment;
const transactionStillActive =
transaction.extendedStatus !== ExtendedStatus.Aborted &&
transaction.extendedStatus !== ExtendedStatus.Done &&
transaction.extendedStatus !== ExtendedStatus.Failed;
// show retry if there is an error in an active state, or after some time
// if it is not aborting
const showRetry =
transactionStillActive &&
(transaction.error !== undefined ||
(transaction.extendedStatus !== ExtendedStatus.Aborting &&
(transaction.timestamp.t_s === "never" ||
differenceInSeconds(new Date(), transaction.timestamp.t_s * 1000) >
SHOWING_RETRY_THRESHOLD_SECS)));
return (
<Fragment>
<section style={{ padding: 8, textAlign: "center" }}>
@ -353,13 +357,15 @@ function TransactionTemplate({
</Button>
) : null}
{transactionStillActive ? (
<Button
variant="contained"
color="error"
onClick={doCheckBeforeCancel as SafeHandler<void>}
>
<i18n.Translate>Cancel</i18n.Translate>
</Button>
hasCancelTransactionImplemented ? (
<Button
variant="contained"
color="error"
onClick={doCheckBeforeCancel as SafeHandler<void>}
>
<i18n.Translate>Cancel</i18n.Translate>
</Button>
) : undefined
) : (
<Button
variant="contained"