working #8882

1 files changed, 39 insertions, 12 deletions

diff --git a/packages/taler-wallet-core/src/transactions.ts b/packages/taler-wallet-core/src/transactions.ts
index 72aff319a..bcf3fcaf6 100644
--- a/packages/taler-wallet-core/src/transactions.ts
+++ b/packages/taler-wallet-core/src/transactions.ts
@@ -243,11 +243,14 @@ export async function getTransactionById(
           const opId = TaskIdentifiers.forWithdrawal(withdrawalGroupRecord);
           const ort = await tx.operationRetries.get(opId);
 
-          const exchangeDetails = await getExchangeWireDetailsInTx(
-            tx,
-            withdrawalGroupRecord.exchangeBaseUrl,
-          );
-          if (!exchangeDetails) throw Error("not exchange details");
+          const exchangeDetails =
+            withdrawalGroupRecord.exchangeBaseUrl === undefined
+              ? undefined
+              : await getExchangeWireDetailsInTx(
+                  tx,
+                  withdrawalGroupRecord.exchangeBaseUrl,
+                );
+          // if (!exchangeDetails) throw Error("not exchange details");
 
           if (
             withdrawalGroupRecord.wgInfo.withdrawalType ===
@@ -259,7 +262,10 @@ export async function getTransactionById(
               ort,
             );
           }
-
+          checkDbInvariant(
+            exchangeDetails !== undefined,
+            "manual withdrawal without exchange",
+          );
           return buildTransactionForManualWithdraw(
             withdrawalGroupRecord,
             exchangeDetails,
@@ -404,7 +410,10 @@ export async function getTransactionById(
           const debit = await tx.peerPushDebit.get(parsedTx.pursePub);
           if (!debit) throw Error("not found");
           const ct = await tx.contractTerms.get(debit.contractTermsHash);
-          checkDbInvariant(!!ct, `no contract terms for p2p push ${parsedTx.pursePub}`);
+          checkDbInvariant(
+            !!ct,
+            `no contract terms for p2p push ${parsedTx.pursePub}`,
+          );
           return buildTransactionForPushPaymentDebit(
             debit,
             ct.contractTermsRaw,
@@ -428,7 +437,10 @@ export async function getTransactionById(
           const pushInc = await tx.peerPushCredit.get(peerPushCreditId);
           if (!pushInc) throw Error("not found");
           const ct = await tx.contractTerms.get(pushInc.contractTermsHash);
-          checkDbInvariant(!!ct, `no contract terms for p2p push ${peerPushCreditId}`);
+          checkDbInvariant(
+            !!ct,
+            `no contract terms for p2p push ${peerPushCreditId}`,
+          );
 
           let wg: WithdrawalGroupRecord | undefined = undefined;
           let wgOrt: OperationRetryRecord | undefined = undefined;
@@ -593,6 +605,7 @@ function buildTransactionForPeerPullCredit(
     const txState = computePeerPullCreditTransactionState(pullCredit);
     checkDbInvariant(wsr.instructedAmount !== undefined, "wg uninitialized");
     checkDbInvariant(wsr.denomsSel !== undefined, "wg uninitialized");
+    checkDbInvariant(wsr.exchangeBaseUrl !== undefined, "wg uninitialized");
     return {
       type: TransactionType.PeerPullCredit,
       txState,
@@ -667,6 +680,7 @@ function buildTransactionForPeerPushCredit(
     }
     checkDbInvariant(wg.instructedAmount !== undefined, "wg uninitialized");
     checkDbInvariant(wg.denomsSel !== undefined, "wg uninitialized");
+    checkDbInvariant(wg.exchangeBaseUrl !== undefined, "wg uninitialized");
 
     const txState = computePeerPushCreditTransactionState(pushInc);
     return {
@@ -719,15 +733,17 @@ function buildTransactionForPeerPushCredit(
 
 function buildTransactionForBankIntegratedWithdraw(
   wg: WithdrawalGroupRecord,
-  exchangeDetails: ExchangeWireDetails,
+  exchangeDetails: ExchangeWireDetails | undefined,
   ort?: OperationRetryRecord,
 ): TransactionWithdrawal {
   if (wg.wgInfo.withdrawalType !== WithdrawalRecordType.BankIntegrated) {
     throw Error("");
   }
+  checkDbInvariant(wg.wgInfo.bankInfo.currency !== undefined, "wg uninitialized");
   const txState = computeWithdrawalTransactionStatus(wg);
+  
   const zero = Amounts.stringify(
-    Amounts.zeroOfCurrency(exchangeDetails.currency),
+    Amounts.zeroOfCurrency(wg.wgInfo.bankInfo.currency),
   );
   return {
     type: TransactionType.Withdrawal,
@@ -784,6 +800,7 @@ function buildTransactionForManualWithdraw(
 
   checkDbInvariant(wg.instructedAmount !== undefined, "wg uninitialized");
   checkDbInvariant(wg.denomsSel !== undefined, "wg uninitialized");
+  checkDbInvariant(wg.exchangeBaseUrl !== undefined, "wg uninitialized");
   const exchangePaytoUris = augmentPaytoUrisForWithdrawal(
     plainPaytoUris,
     wg.reservePub,
@@ -1034,8 +1051,14 @@ function buildTransactionForPurchase(
   }));
 
   const timestamp = purchaseRecord.timestampAccept;
-  checkDbInvariant(!!timestamp, `purchase ${purchaseRecord.orderId} without accepted time`);
-  checkDbInvariant(!!purchaseRecord.payInfo, `purchase ${purchaseRecord.orderId} without payinfo`);
+  checkDbInvariant(
+    !!timestamp,
+    `purchase ${purchaseRecord.orderId} without accepted time`,
+  );
+  checkDbInvariant(
+    !!purchaseRecord.payInfo,
+    `purchase ${purchaseRecord.orderId} without payinfo`,
+  );
 
   const txState = computePayMerchantTransactionState(purchaseRecord);
   return {
@@ -1089,6 +1112,10 @@ export async function getWithdrawalTransactionByUri(
       if (!withdrawalGroupRecord) {
         return undefined;
       }
+      if (withdrawalGroupRecord.exchangeBaseUrl === undefined) {
+        // prepared and unconfirmed withdrawals are hidden
+        return undefined;
+      }
 
       const opId = TaskIdentifiers.forWithdrawal(withdrawalGroupRecord);
       const ort = await tx.operationRetries.get(opId);