better wording to the tx details

6 files changed, 22 insertions, 20 deletions

diff --git a/packages/taler-wallet-webextension/src/cta/InvoiceCreate/views.tsx b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/views.tsx
index 18da2609c..b67bbb216 100644
--- a/packages/taler-wallet-webextension/src/cta/InvoiceCreate/views.tsx
+++ b/packages/taler-wallet-webextension/src/cta/InvoiceCreate/views.tsx
@@ -31,7 +31,7 @@ import editIcon from "../../svg/edit_24px.inline.svg";
 import {
   ExchangeDetails,
   getAmountWithFee,
-  InvoiceDetails,
+  InvoiceCreationDetails,
 } from "../../wallet/Transaction.js";
 import { State } from "./index.js";
 
@@ -144,7 +144,7 @@ export function ReadyView({
         <Part
           title={i18n.str`Details`}
           text={
-            <InvoiceDetails
+            <InvoiceCreationDetails
               amount={getAmountWithFee(toBeReceived, requestAmount, "credit")}
             />
           }
diff --git a/packages/taler-wallet-webextension/src/cta/InvoicePay/views.tsx b/packages/taler-wallet-webextension/src/cta/InvoicePay/views.tsx
index 85923a2c5..e54e54bd1 100644
--- a/packages/taler-wallet-webextension/src/cta/InvoicePay/views.tsx
+++ b/packages/taler-wallet-webextension/src/cta/InvoicePay/views.tsx
@@ -22,7 +22,10 @@ import { PaymentButtons } from "../../components/PaymentButtons.js";
 import { SubTitle, WalletAction } from "../../components/styled/index.js";
 import { Time } from "../../components/Time.js";
 import { useTranslationContext } from "@gnu-taler/web-util/browser";
-import { getAmountWithFee, InvoiceDetails } from "../../wallet/Transaction.js";
+import {
+  getAmountWithFee,
+  InvoicePaymentDetails,
+} from "../../wallet/Transaction.js";
 import { State } from "./index.js";
 
 export function ReadyView(
@@ -38,7 +41,7 @@ export function ReadyView(
         <Part
           title={i18n.str`Details`}
           text={
-            <InvoiceDetails
+            <InvoicePaymentDetails
               amount={getAmountWithFee(effective, raw, "debit")}
             />
           }
diff --git a/packages/taler-wallet-webextension/src/cta/Payment/views.tsx b/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
index 764036dad..b0911cb2f 100644
--- a/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
+++ b/packages/taler-wallet-webextension/src/cta/Payment/views.tsx
@@ -104,7 +104,7 @@ export function BaseView(state: SupportedStates): VNode {
         )}
       </section>
       <PaymentButtons
-        amount={state.amount}
+        amount={effective}
         payStatus={state.payStatus}
         uri={state.uri}
         payHandler={state.status === "ready" ? state.payHandler : undefined}
diff --git a/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts b/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts
index edd823181..80b8a01bd 100644
--- a/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts
+++ b/packages/taler-wallet-webextension/src/cta/TransferCreate/state.ts
@@ -67,8 +67,8 @@ export function useComponentState({
   // }
 
   const { amountEffective, amountRaw } = hook.response;
-  const debitAmount = Amounts.parseOrThrow(amountRaw);
-  const toBeReceived = Amounts.parseOrThrow(amountEffective);
+  const debitAmount = Amounts.parseOrThrow(amountEffective);
+  const toBeReceived = Amounts.parseOrThrow(amountRaw);
 
   let purse_expiration: TalerProtocolTimestamp | undefined = undefined;
   let timestampError: string | undefined = undefined;
diff --git a/packages/taler-wallet-webextension/src/cta/TransferCreate/views.tsx b/packages/taler-wallet-webextension/src/cta/TransferCreate/views.tsx
index 8fe88025f..8489b0643 100644
--- a/packages/taler-wallet-webextension/src/cta/TransferCreate/views.tsx
+++ b/packages/taler-wallet-webextension/src/cta/TransferCreate/views.tsx
@@ -14,17 +14,16 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
-import { Amounts } from "@gnu-taler/taler-util";
+import { useTranslationContext } from "@gnu-taler/web-util/browser";
 import { format } from "date-fns";
 import { Fragment, h, VNode } from "preact";
-import { ErrorTalerOperation } from "../../components/ErrorTalerOperation.js";
-import { LogoHeader } from "../../components/LogoHeader.js";
 import { Part } from "../../components/Part.js";
-import { Link, SubTitle, WalletAction } from "../../components/styled/index.js";
-import { useTranslationContext } from "@gnu-taler/web-util/browser";
 import { Button } from "../../mui/Button.js";
 import { TextField } from "../../mui/TextField.js";
-import { getAmountWithFee, TransferDetails } from "../../wallet/Transaction.js";
+import {
+  getAmountWithFee,
+  TransferCreationDetails,
+} from "../../wallet/Transaction.js";
 import { State } from "./index.js";
 
 export function ReadyView({
@@ -110,7 +109,7 @@ export function ReadyView({
         <Part
           title={i18n.str`Details`}
           text={
-            <TransferDetails
+            <TransferCreationDetails
               amount={getAmountWithFee(debitAmount, toBeReceived, "debit")}
             />
           }
diff --git a/packages/taler-wallet-webextension/src/cta/TransferPickup/views.tsx b/packages/taler-wallet-webextension/src/cta/TransferPickup/views.tsx
index 189554a49..5dce2ce22 100644
--- a/packages/taler-wallet-webextension/src/cta/TransferPickup/views.tsx
+++ b/packages/taler-wallet-webextension/src/cta/TransferPickup/views.tsx
@@ -14,16 +14,16 @@
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
 
+import { useTranslationContext } from "@gnu-taler/web-util/browser";
 import { Fragment, h, VNode } from "preact";
 import { Amount } from "../../components/Amount.js";
-import { ErrorTalerOperation } from "../../components/ErrorTalerOperation.js";
-import { LogoHeader } from "../../components/LogoHeader.js";
 import { Part } from "../../components/Part.js";
-import { Link, SubTitle, WalletAction } from "../../components/styled/index.js";
 import { Time } from "../../components/Time.js";
-import { useTranslationContext } from "@gnu-taler/web-util/browser";
 import { Button } from "../../mui/Button.js";
-import { getAmountWithFee, TransferDetails } from "../../wallet/Transaction.js";
+import {
+  getAmountWithFee,
+  TransferPickupDetails,
+} from "../../wallet/Transaction.js";
 import { State } from "./index.js";
 
 export function ReadyView({
@@ -42,7 +42,7 @@ export function ReadyView({
         <Part
           title={i18n.str`Details`}
           text={
-            <TransferDetails
+            <TransferPickupDetails
               amount={getAmountWithFee(effective, raw, "credit")}
             />
           }