fix #7477
This commit is contained in:
parent
1a63d56bfd
commit
6dc4fda73a
@ -527,6 +527,8 @@ export interface TransactionDeposit extends TransactionCommon {
|
||||
* Effective amount that is being deposited
|
||||
*/
|
||||
amountEffective: AmountString;
|
||||
|
||||
wireTransferDeadline: TalerProtocolTimestamp;
|
||||
}
|
||||
|
||||
export interface TransactionByIdRequest {
|
||||
|
@ -527,6 +527,7 @@ function buildTransactionForDeposit(
|
||||
frozen: false,
|
||||
timestamp: dg.timestampCreated,
|
||||
targetPaytoUri: dg.wire.payto_uri,
|
||||
wireTransferDeadline: dg.contractTermsRaw.wire_transfer_deadline,
|
||||
transactionId: makeTransactionId(
|
||||
TransactionType.Deposit,
|
||||
dg.depositGroupId,
|
||||
|
@ -144,7 +144,11 @@ export function PartPayto({ payto, kind, big }: PropsPayto): VNode {
|
||||
const { i18n } = useTranslationContext();
|
||||
if (payto.isKnown) {
|
||||
if (payto.targetType === "x-taler-bank") {
|
||||
text = <Fragment>{payto.account}</Fragment>;
|
||||
text = (
|
||||
<a target="_bank" rel="noreferrer" href={payto.host}>
|
||||
{payto.account}
|
||||
</a>
|
||||
);
|
||||
title = i18n.str`Bank account`;
|
||||
} else if (payto.targetType === "bitcoin") {
|
||||
text =
|
||||
@ -159,8 +163,17 @@ export function PartPayto({ payto, kind, big }: PropsPayto): VNode {
|
||||
);
|
||||
title = i18n.str`Bitcoin address`;
|
||||
} else if (payto.targetType === "iban") {
|
||||
text = <Fragment>{payto.targetPath}</Fragment>;
|
||||
title = i18n.str`IBAN`;
|
||||
if (payto.bic) {
|
||||
text = (
|
||||
<Fragment>
|
||||
{payto.bic}/{payto.iban}
|
||||
</Fragment>
|
||||
);
|
||||
title = i18n.str`BIC/IBAN`;
|
||||
} else {
|
||||
text = <Fragment>{payto.iban}</Fragment>;
|
||||
title = i18n.str`IBAN`;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!text) {
|
||||
|
@ -110,6 +110,9 @@ const exampleData = {
|
||||
deposit: {
|
||||
...commonTransaction,
|
||||
type: TransactionType.Deposit,
|
||||
wireTransferDeadline: {
|
||||
t_s: new Date().getTime() / 1000,
|
||||
},
|
||||
depositGroupId: "#groupId",
|
||||
targetPaytoUri: "payto://x-taler-bank/bank.demo.taler.net/Exchange",
|
||||
} as TransactionDeposit,
|
||||
|
@ -524,6 +524,18 @@ export function TransactionView({
|
||||
text={<DepositDetails transaction={transaction} />}
|
||||
kind="neutral"
|
||||
/>
|
||||
<Part
|
||||
title={<i18n.Translate>Wire transfer deadline</i18n.Translate>}
|
||||
text={
|
||||
<Time
|
||||
timestamp={AbsoluteTime.fromTimestamp(
|
||||
transaction.wireTransferDeadline,
|
||||
)}
|
||||
format="dd MMMM yyyy 'at' HH:mm"
|
||||
/>
|
||||
}
|
||||
kind="neutral"
|
||||
/>
|
||||
</TransactionTemplate>
|
||||
);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user