aboutsummaryrefslogtreecommitdiff
path: root/src/operations/pay.ts
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-05-15 16:03:52 +0530
committerFlorian Dold <florian.dold@gmail.com>2020-05-15 16:03:52 +0530
commit3eb88574bcf327672c34120becfb511eac4e06cd (patch)
tree9d54748adef52dc9a21c8ea97c7d034cd773277a /src/operations/pay.ts
parent35c83414f9e0af11012c1a2e00672d2a7c1856ae (diff)
downloadwallet-core-3eb88574bcf327672c34120becfb511eac4e06cd.tar.xz
address first batch of transaction list issues
Diffstat (limited to 'src/operations/pay.ts')
-rw-r--r--src/operations/pay.ts10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/operations/pay.ts b/src/operations/pay.ts
index 45caa9583..20d62dea2 100644
--- a/src/operations/pay.ts
+++ b/src/operations/pay.ts
@@ -137,11 +137,7 @@ export async function getTotalPaymentCost(
ws: InternalWalletState,
pcs: PayCoinSelection,
): Promise<PayCostInfo> {
- const costs = [
- pcs.paymentAmount,
- pcs.customerDepositFees,
- pcs.customerWireFees,
- ];
+ const costs = [];
for (let i = 0; i < pcs.coinPubs.length; i++) {
const coin = await ws.db.get(Stores.coins, pcs.coinPubs[i]);
if (!coin) {
@@ -165,6 +161,7 @@ export async function getTotalPaymentCost(
const amountLeft = Amounts.sub(denom.value, pcs.coinContributions[i])
.amount;
const refreshCost = getTotalRefreshCost(allDenoms, denom, amountLeft);
+ costs.push(pcs.coinContributions[i]);
costs.push(refreshCost);
}
return {
@@ -670,6 +667,9 @@ async function processDownloadProposalImpl(
wireMethod: parsedContractTerms.wire_method,
wireInfoHash: parsedContractTerms.h_wire,
maxDepositFee: Amounts.parseOrThrow(parsedContractTerms.max_fee),
+ merchant: parsedContractTerms.merchant,
+ products: parsedContractTerms.products,
+ summaryI18n: parsedContractTerms.summary_i18n,
},
contractTermsRaw: JSON.stringify(proposalResp.contract_terms),
};