diff --git a/pages/confirm-contract.html b/pages/confirm-contract.html index 6abb65c67..54d02f316 100644 --- a/pages/confirm-contract.html +++ b/pages/confirm-contract.html @@ -5,7 +5,6 @@ Taler Wallet: Confirm Reserve Creation - @@ -15,18 +14,45 @@ + + -
- -

Payment Confirmation

-
- - -
+

GNU Taler Wallet

diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx index 0c7419c6c..9e15841e9 100644 --- a/pages/confirm-contract.tsx +++ b/pages/confirm-contract.tsx @@ -87,7 +87,7 @@ export function main() { _.map(contract.products, (p: any) => m("li", `${p.description}: ${prettyAmount(p.price)}`))), - m("button.confirm-pay", {onclick: doPayment}, i18n`Confirm Payment`), + m("button.accept", {onclick: doPayment}, i18n`Confirm Payment`), m("p", error ? error : []), m(Details, contract) ]; diff --git a/pages/confirm-create-reserve.html b/pages/confirm-create-reserve.html index ab0a7c954..da87faf7f 100644 --- a/pages/confirm-create-reserve.html +++ b/pages/confirm-create-reserve.html @@ -4,8 +4,6 @@ Taler Wallet: Select Taler Provider - - @@ -13,21 +11,47 @@ + + -
- -

Select Taler Provider

-
- - -
-
+

GNU Taler Wallet

-
diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx index 1c3bf7cbb..4b4e19363 100644 --- a/pages/confirm-create-reserve.tsx +++ b/pages/confirm-create-reserve.tsx @@ -194,8 +194,9 @@ function view(ctrl: Controller) { let mx = (x, ...args) => controls.push(m(x, ...args)); mx("p", - i18n`The bank wants to create a reserve over ${amountToPretty( - ctrl.amount)}.`); + i18n.parts`You are about to withdraw ${m("strong", amountToPretty( + ctrl.amount))} from your bank account into your wallet.`); + mx("input", { className: "url", @@ -205,14 +206,16 @@ function view(ctrl: Controller) { oninput: m.withAttr("value", ctrl.onUrlChanged.bind(ctrl)), }); - mx("button", { + mx("br"); + + mx("button.accept", { onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo, ctrl.url(), ctrl.amount, ctrl.callbackUrl), disabled: !ctrl.isValidExchange }, - "Confirm exchange selection"); + "Accept fees and withdraw"); if (ctrl.statusString) { mx("p", ctrl.statusString);