From 81bf1cc9c12bcf82835c7dffca4557e39ec5e600 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 21 Jun 2023 11:28:27 -0300 Subject: show bank details --- .../src/wallet/ReserveCreated.tsx | 47 +----- .../src/wallet/Transaction.tsx | 172 ++++++++++----------- 2 files changed, 88 insertions(+), 131 deletions(-) (limited to 'packages/taler-wallet-webextension/src/wallet') diff --git a/packages/taler-wallet-webextension/src/wallet/ReserveCreated.tsx b/packages/taler-wallet-webextension/src/wallet/ReserveCreated.tsx index 0bf9ef9d1..f489b805b 100644 --- a/packages/taler-wallet-webextension/src/wallet/ReserveCreated.tsx +++ b/packages/taler-wallet-webextension/src/wallet/ReserveCreated.tsx @@ -50,48 +50,11 @@ export function ReserveCreated({ function TransferDetails(): VNode { if (!paytoURI) return ; return ( -
- - - - - - - - - -
-
-                  
-                    
-                      Payto URI
-                    
-                  
-                
-
- {stringifyPaytoUri(paytoURI)} - - stringifyPaytoUri(paytoURI)} /> -
-

- - - Make sure to use the correct subject, otherwise the money will not - arrive in this wallet. - - -

-
+ ); } diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx index 9ed41c5de..13adb34b2 100644 --- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx @@ -32,9 +32,11 @@ import { TransactionAction, TransactionDeposit, TransactionIdStr, + TransactionInternalWithdrawal, TransactionMajorState, TransactionMinorState, TransactionType, + TransactionWithdrawal, TranslatedString, WithdrawalType, } from "@gnu-taler/taler-util"; @@ -459,96 +461,14 @@ export function TransactionView({ TransactionMajorState.Pending ? undefined : transaction .withdrawalDetails.type === WithdrawalType.ManualTransfer ? ( //manual withdrawal - - - - - - - - - - -
-
-                      
-                        
-                          Payto URI
-                        
-                      
-                    
-
- {transaction.withdrawalDetails.exchangePaytoUris[0]} - - - transaction.withdrawalDetails.type === - WithdrawalType.ManualTransfer - ? transaction.withdrawalDetails.exchangePaytoUris[0] - : "" - } - /> -
- - - Make sure to use the correct subject, otherwise the money will - not arrive in this wallet. - - -
+ ) : ( //integrated bank withdrawal - - {!transaction.withdrawalDetails.confirmed && - transaction.withdrawalDetails.bankConfirmationUrl ? ( - -
- - Wire transfer need a confirmation. Go to the{" "} - - bank site - {" "} - and check wire transfer operation to exchange account is - complete. - -
-
- ) : undefined} - {transaction.withdrawalDetails.confirmed && - !transaction.withdrawalDetails.reserveIsReady && ( - - - Bank has confirmed the wire transfer. Waiting for the - exchange to send the coins - - - )} - {transaction.withdrawalDetails.confirmed && - transaction.withdrawalDetails.reserveIsReady && ( - - - Exchange is ready to send the coins, withdrawal in progress. - - - )} -
+ )} - Withdraw + Wire transfer @@ -1952,3 +1872,77 @@ function getShowButtonStates(transaction: Transaction) { }); return { abort, fail, resume, retry, remove, suspend }; } + +function ShowWithdrawalDetailForBankIntegrated({ + transaction, +}: { + transaction: TransactionWithdrawal | TransactionInternalWithdrawal; +}): VNode { + const { i18n } = useTranslationContext(); + const [showDetails, setShowDetails] = useState(false); + if ( + transaction.txState.major !== TransactionMajorState.Pending || + transaction.withdrawalDetails.type === WithdrawalType.ManualTransfer + ) + return ; + const raw = Amounts.parseOrThrow(transaction.amountRaw); + return ( + + + { + e.preventDefault(); + setShowDetails(!showDetails); + }} + > + show details + + + + {showDetails && ( + + )} + {!transaction.withdrawalDetails.confirmed && + transaction.withdrawalDetails.bankConfirmationUrl ? ( + +
+ + Wire transfer need a confirmation. Go to the{" "} + + bank site + {" "} + and check wire transfer operation to exchange account is complete. + +
+
+ ) : undefined} + {transaction.withdrawalDetails.confirmed && + !transaction.withdrawalDetails.reserveIsReady && ( + + + Bank has confirmed the wire transfer. Waiting for the exchange to + send the coins + + + )} + {transaction.withdrawalDetails.confirmed && + transaction.withdrawalDetails.reserveIsReady && ( + + + Exchange is ready to send the coins, withdrawal in progress. + + + )} +
+ ); +} -- cgit v1.2.3