[taler-wallet-core] 01/02: pending #7468

[gnunet]

This is an automated email from the git hooks/post-receive script.

sebasjm pushed a commit to branch master
in repository wallet-core.

commit 7fc8d64c90a3e525637986db30dbd8f71e4dda00
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Fri Nov 18 13:26:48 2022 -0300

    pending #7468
---
 .../src/components/TransactionItem.tsx             | 39 ++++++++++++++--------
 .../src/wallet/Transaction.tsx                     |  6 ++--
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git 
a/packages/taler-wallet-webextension/src/components/TransactionItem.tsx 
b/packages/taler-wallet-webextension/src/components/TransactionItem.tsx
index 840b01308..e5ce4140f 100644
--- a/packages/taler-wallet-webextension/src/components/TransactionItem.tsx
+++ b/packages/taler-wallet-webextension/src/components/TransactionItem.tsx
@@ -21,6 +21,7 @@ import {
   AbsoluteTime,
   Transaction,
   TransactionType,
+  WithdrawalType,
 } from "@gnu-taler/taler-util";
 import { h, VNode } from "preact";
 import { useTranslationContext } from "../context/translation.js";
@@ -38,6 +39,7 @@ import { Time } from "./Time.js";
 
 export function TransactionItem(props: { tx: Transaction }): VNode {
   const tx = props.tx;
+  const { i18n } = useTranslationContext();
   switch (tx.type) {
     case TransactionType.Withdrawal:
       return (
@@ -48,7 +50,18 @@ export function TransactionItem(props: { tx: Transaction }): 
VNode {
           title={new URL(tx.exchangeBaseUrl).hostname}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"W"}
-          pending={tx.pending}
+          pending={
+            tx.pending
+              ? tx.withdrawalDetails.type ===
+                WithdrawalType.TalerBankIntegrationApi
+                ? !tx.withdrawalDetails.confirmed
+                  ? i18n.str`Need approval in the Bank`
+                  : i18n.str`Exchange is waiting the wire transfer`
+                : undefined
+              : tx.withdrawalDetails.type === WithdrawalType.ManualTransfer
+              ? i18n.str`Exchange is waiting the wire transfer`
+              : undefined
+          }
         />
       );
     case TransactionType.Payment:
@@ -61,7 +74,7 @@ export function TransactionItem(props: { tx: Transaction }): 
VNode {
           subtitle={tx.info.summary}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"P"}
-          pending={tx.pending}
+          // pending={tx.pending}
         />
       );
     case TransactionType.Refund:
@@ -74,7 +87,7 @@ export function TransactionItem(props: { tx: Transaction }): 
VNode {
           title={tx.info.merchant.name}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"R"}
-          pending={tx.pending}
+          // pending={tx.pending}
         />
       );
     case TransactionType.Tip:
@@ -86,7 +99,7 @@ export function TransactionItem(props: { tx: Transaction }): 
VNode {
           title={new URL(tx.merchantBaseUrl).hostname}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"T"}
-          pending={tx.pending}
+          // pending={tx.pending}
         />
       );
     case TransactionType.Refresh:
@@ -98,7 +111,7 @@ export function TransactionItem(props: { tx: Transaction }): 
VNode {
           title={new URL(tx.exchangeBaseUrl).hostname}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"R"}
-          pending={tx.pending}
+          // pending={tx.pending}
         />
       );
     case TransactionType.Deposit:
@@ -110,7 +123,7 @@ export function TransactionItem(props: { tx: Transaction 
}): VNode {
           title={tx.targetPaytoUri}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"D"}
-          pending={tx.pending}
+          // pending={tx.pending}
         />
       );
     case TransactionType.PeerPullCredit:
@@ -122,7 +135,7 @@ export function TransactionItem(props: { tx: Transaction 
}): VNode {
           title={tx.info.summary || "Invoice"}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"I"}
-          pending={tx.pending}
+          // pending={tx.pending}
         />
       );
     case TransactionType.PeerPullDebit:
@@ -134,7 +147,7 @@ export function TransactionItem(props: { tx: Transaction 
}): VNode {
           title={tx.info.summary || "Invoice"}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"I"}
-          pending={tx.pending}
+          // pending={tx.pending}
         />
       );
     case TransactionType.PeerPushCredit:
@@ -146,7 +159,7 @@ export function TransactionItem(props: { tx: Transaction 
}): VNode {
           title={tx.info.summary || "Transfer"}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"T"}
-          pending={tx.pending}
+          // pending={tx.pending}
         />
       );
     case TransactionType.PeerPushDebit:
@@ -158,7 +171,7 @@ export function TransactionItem(props: { tx: Transaction 
}): VNode {
           title={tx.info.summary || "Transfer"}
           timestamp={AbsoluteTime.fromTimestamp(tx.timestamp)}
           iconPath={"T"}
-          pending={tx.pending}
+          // pending={tx.pending}
         />
       );
     default: {
@@ -198,7 +211,7 @@ function TransactionLayout(props: TransactionLayoutProps): 
VNode {
         </LargeText>
         {props.pending && (
           <LightText style={{ marginTop: 5, marginBottom: 5 }}>
-            <i18n.Translate>Waiting for confirmation</i18n.Translate>
+            <i18n.Translate>{props.pending}</i18n.Translate>
           </LightText>
         )}
         <SmallLightText style={{ marginTop: 5 }}>
@@ -206,7 +219,7 @@ function TransactionLayout(props: TransactionLayoutProps): 
VNode {
         </SmallLightText>
       </Column>
       <TransactionAmount
-        pending={props.pending}
+        pending={props.pending !== undefined}
         amount={Amounts.parseOrThrow(props.amount)}
         debitCreditIndicator={props.debitCreditIndicator}
       />
@@ -222,7 +235,7 @@ interface TransactionLayoutProps {
   subtitle?: string;
   id: string;
   iconPath: string;
-  pending: boolean;
+  pending?: string;
 }
 
 interface TransactionAmountProps {
diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx 
b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
index 8ccf15c14..e70f5fbd1 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
@@ -341,8 +341,7 @@ export function TransactionView({
               <InfoBox>
                 <div style={{ display: "block" }}>
                   <i18n.Translate>
-                    The bank did not yet confirmed the wire transfer. Go to the
-                    {` `}
+                    Wire transfer need a confirmation. Go to the
                     <a
                       href={transaction.withdrawalDetails.bankConfirmationUrl}
                       target="_blank"
@@ -351,7 +350,8 @@ export function TransactionView({
                     >
                       <i18n.Translate>bank site</i18n.Translate>
                     </a>{" "}
-                    and check there is no pending step.
+                    and check wire transfer operation to exchange account is
+                    complete.
                   </i18n.Translate>
                 </div>
               </InfoBox>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.