wip, found #8653

1 files changed, 11 insertions, 15 deletions

diff --git a/packages/taler-wallet-core/src/pay-merchant.ts b/packages/taler-wallet-core/src/pay-merchant.ts
index 872e554c9..e473566b0 100644
--- a/packages/taler-wallet-core/src/pay-merchant.ts
+++ b/packages/taler-wallet-core/src/pay-merchant.ts
@@ -36,11 +36,11 @@ import {
   checkDbInvariant,
   codecForAbortResponse,
   codecForMerchantContractTerms,
-  codecForMerchantOrderRefundPickupResponse,
   codecForMerchantOrderStatusPaid,
   codecForMerchantPayResponse,
   codecForMerchantPostOrderResponse,
   codecForProposal,
+  codecForWalletRefundResponse,
   CoinDepositPermission,
   CoinRefreshRequest,
   ConfirmPayResult,
@@ -580,7 +580,6 @@ export function extractContractData(
     autoRefund: parsedContractTerms.auto_refund,
     payDeadline: parsedContractTerms.pay_deadline,
     refundDeadline: parsedContractTerms.refund_deadline,
-    wireFeeAmortization: parsedContractTerms.wire_fee_amortization || 1,
     allowedExchanges: parsedContractTerms.exchanges.map((x) => ({
       exchangeBaseUrl: x.url,
       exchangePub: x.master_pub,
@@ -591,7 +590,6 @@ export function extractContractData(
     maxDepositFee: Amounts.stringify(parsedContractTerms.max_fee),
     merchant: parsedContractTerms.merchant,
     summaryI18n: parsedContractTerms.summary_i18n,
-    minimumAge: parsedContractTerms.minimum_age,
   };
 }
 
@@ -611,8 +609,7 @@ async function processDownloadProposal(
 
   if (proposal.purchaseStatus != PurchaseStatus.PendingDownloadingProposal) {
     logger.error(
-      `unexpected state ${proposal.purchaseStatus}/${
-        PurchaseStatus[proposal.purchaseStatus]
+      `unexpected state ${proposal.purchaseStatus}/${PurchaseStatus[proposal.purchaseStatus]
       } for ${ctx.transactionId} in processDownloadProposal`,
     );
     return TaskRunResult.finished();
@@ -868,8 +865,7 @@ async function createOrReusePurchase(
     oldProposal.claimToken === claimToken
   ) {
     logger.info(
-      `Found old proposal (status=${
-        PurchaseStatus[oldProposal.purchaseStatus]
+      `Found old proposal (status=${PurchaseStatus[oldProposal.purchaseStatus]
       }) for order ${orderId} at ${merchantBaseUrl}`,
     );
     if (oldProposal.purchaseStatus === PurchaseStatus.DialogShared) {
@@ -1149,9 +1145,9 @@ async function handleInsufficientFunds(
     restrictWireMethod: contractData.wireMethod,
     contractTermsAmount: Amounts.parseOrThrow(contractData.amount),
     depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee),
-    wireFeeAmortization: contractData.wireFeeAmortization ?? 1,
+    wireFeeAmortization: 1, // FIXME #8653
     prevPayCoins,
-    requiredMinimumAge: contractData.minimumAge,
+    requiredMinimumAge: undefined, // FIXME #8653
   });
 
   if (res.type !== "success") {
@@ -1278,9 +1274,9 @@ async function checkPaymentByProposalId(
       },
       contractTermsAmount: instructedAmount,
       depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee),
-      wireFeeAmortization: contractData.wireFeeAmortization ?? 1,
+      wireFeeAmortization: 1, // FIXME #8653
       prevPayCoins: [],
-      requiredMinimumAge: contractData.minimumAge,
+      requiredMinimumAge: undefined, // FIXME #8653
       restrictWireMethod: contractData.wireMethod,
     });
 
@@ -1634,7 +1630,7 @@ export async function generateDepositPermissions(
       timestamp: contractData.timestamp,
       wireInfoHash,
       ageCommitmentProof: coin.ageCommitmentProof,
-      requiredMinimumAge: contractData.minimumAge,
+      requiredMinimumAge: undefined,// FIXME #8653
     });
     depositPermissions.push(dp);
   }
@@ -1817,9 +1813,9 @@ export async function confirmPay(
     restrictWireMethod: contractData.wireMethod,
     contractTermsAmount: Amounts.parseOrThrow(contractData.amount),
     depositFeeLimit: Amounts.parseOrThrow(contractData.maxDepositFee),
-    wireFeeAmortization: contractData.wireFeeAmortization ?? 1,
+    wireFeeAmortization: 1, // FIXME #8653
     prevPayCoins: [],
-    requiredMinimumAge: contractData.minimumAge,
+    requiredMinimumAge: undefined, // FIXME #8653
     forcedSelection: forcedCoinSel,
   });
 
@@ -2887,7 +2883,7 @@ async function processPurchaseAcceptRefund(
 
   const refundResponse = await readSuccessResponseJsonOrThrow(
     request,
-    codecForMerchantOrderRefundPickupResponse(),
+    codecForWalletRefundResponse(),
   );
   return await storeRefunds(
     wex,