From dd3a31f33dc54b475b204e15d8d0a5c5e2a70ee8 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 16 Jul 2020 21:03:22 +0530
Subject: transactions list

---
 src/operations/transactions.ts | 14 +++++++++++---
 src/types/transactions.ts      |  8 ++------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/operations/transactions.ts b/src/operations/transactions.ts
index f2845cb18..bcf7a9e68 100644
--- a/src/operations/transactions.ts
+++ b/src/operations/transactions.ts
@@ -36,6 +36,8 @@ import {
   WithdrawalDetails,
 } from "../types/transactions";
 import { WithdrawalDetailsResponse } from "../types/walletTypes";
+import { Logger } from "../util/logging";
+import { addPaytoQueryParams } from "../util/payto";
 
 /**
  * Create an event ID from the type and the primary key for the event.
@@ -202,7 +204,6 @@ export async function getTransactions(
               }
               withdrawalDetails = {
                 type: WithdrawalType.ManualTransfer,
-                reservePublicKey: r.reservePub,
                 exchangePaytoUris: exchange.wireInfo?.accounts.map((x) => x.payto_uri) ?? [],
               };
             }
@@ -261,10 +262,17 @@ export async function getTransactions(
             // FIXME: report somehow
             return;
           }
+          const plainPaytoUris =  exchange.wireInfo?.accounts.map((x) => x.payto_uri) ?? [];
+          if (!plainPaytoUris) {
+            // FIXME: report somehow
+            return;
+          }
           withdrawalDetails = {
             type: WithdrawalType.ManualTransfer,
-            reservePublicKey: r.reservePub,
-            exchangePaytoUris: exchange.wireInfo?.accounts.map((x) => x.payto_uri) ?? [],
+            exchangePaytoUris: plainPaytoUris.map((x) => addPaytoQueryParams(x, {
+              amount: Amounts.stringify(r.instructedAmount),
+              message: `Taler Withdrawal ${r.reservePub}`,
+            })),
           };
         }
         transactions.push({
diff --git a/src/types/transactions.ts b/src/types/transactions.ts
index aa618cd4e..b87726bad 100644
--- a/src/types/transactions.ts
+++ b/src/types/transactions.ts
@@ -117,14 +117,10 @@ export type WithdrawalDetails =
 interface WithdrawalDetailsForManualTransfer {
   type: WithdrawalType.ManualTransfer;
 
-  /**
-   * Public key of the reserve that needs to be funded
-   * manually.
-   */
-  reservePublicKey: string;
-
   /**
    * Payto URIs that the exchange supports.
+   * 
+   * Already contains the amount and message.
    */
   exchangePaytoUris: string[];
 }
-- 
cgit v1.2.3