From bf9c2ae7f9c24168ddea2ef9387c5a624287d993 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 3 Sep 2020 17:33:11 +0530
Subject: add proposalId in preparePay response

fixes https://bugs.taler.net/n/6535
---
 packages/taler-wallet-core/src/operations/pay.ts    | 3 +++
 packages/taler-wallet-core/src/types/walletTypes.ts | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/packages/taler-wallet-core/src/operations/pay.ts b/packages/taler-wallet-core/src/operations/pay.ts
index ce71737d1..2c491ec6c 100644
--- a/packages/taler-wallet-core/src/operations/pay.ts
+++ b/packages/taler-wallet-core/src/operations/pay.ts
@@ -1085,6 +1085,7 @@ export async function preparePayForUri(
       paid: true,
       amountRaw: Amounts.stringify(purchase.contractData.amount),
       amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
+      proposalId,
     };
   } else if (!purchase.timestampFirstSuccessfulPay) {
     return {
@@ -1094,6 +1095,7 @@ export async function preparePayForUri(
       paid: false,
       amountRaw: Amounts.stringify(purchase.contractData.amount),
       amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
+      proposalId,
     };
   } else {
     const paid = !purchase.paymentSubmitPending;
@@ -1105,6 +1107,7 @@ export async function preparePayForUri(
       amountRaw: Amounts.stringify(purchase.contractData.amount),
       amountEffective: Amounts.stringify(purchase.payCostInfo.totalCost),
       ...(paid ? { nextUrl: purchase.contractData.orderId } : {}),
+      proposalId,
     };
   }
 }
diff --git a/packages/taler-wallet-core/src/types/walletTypes.ts b/packages/taler-wallet-core/src/types/walletTypes.ts
index 01fd95e05..bde4fee66 100644
--- a/packages/taler-wallet-core/src/types/walletTypes.ts
+++ b/packages/taler-wallet-core/src/types/walletTypes.ts
@@ -416,6 +416,7 @@ export const codecForPreparePayResultAlreadyConfirmed = (): Codec<
     .property("paid", codecForBoolean())
     .property("contractTerms", codecForAny())
     .property("contractTermsHash", codecForString())
+    .property("proposalId", codecForString())
     .build("PreparePayResultAlreadyConfirmed");
 
 export const codecForPreparePayResult = (): Codec<PreparePayResult> =>
@@ -462,6 +463,7 @@ export interface PreparePayResultAlreadyConfirmed {
   amountRaw: string;
   amountEffective: string;
   contractTermsHash: string;
+  proposalId: string;
 }
 
 export interface BankWithdrawDetails {
-- 
cgit v1.2.3