aboutsummaryrefslogtreecommitdiff
path: root/src/webex
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2019-12-09 19:59:08 +0100
committerFlorian Dold <florian.dold@gmail.com>2019-12-09 19:59:08 +0100
commit6415564b9259a4a6a2f6ec9cb934eab3d56a1677 (patch)
tree577372a635b5503c1ad81b2af8523a839e790bb7 /src/webex
parent99bccae9fe1588f711e7606dc3c6d7dd4a25675a (diff)
downloadwallet-core-6415564b9259a4a6a2f6ec9cb934eab3d56a1677.tar.xz
tos
Diffstat (limited to 'src/webex')
-rw-r--r--src/webex/messages.ts2
-rw-r--r--src/webex/pages/withdraw.tsx12
-rw-r--r--src/webex/renderHtml.tsx8
-rw-r--r--src/webex/wxApi.ts4
4 files changed, 13 insertions, 13 deletions
diff --git a/src/webex/messages.ts b/src/webex/messages.ts
index 6c57385c3..4aaf75b2b 100644
--- a/src/webex/messages.ts
+++ b/src/webex/messages.ts
@@ -75,7 +75,7 @@ export interface MessageMap {
};
"reserve-creation-info": {
request: { baseUrl: string; amount: AmountJson };
- response: walletTypes.ReserveCreationInfo;
+ response: walletTypes.ExchangeWithdrawDetails;
};
"get-history": {
request: {};
diff --git a/src/webex/pages/withdraw.tsx b/src/webex/pages/withdraw.tsx
index 6b7152dc2..3ee0f768a 100644
--- a/src/webex/pages/withdraw.tsx
+++ b/src/webex/pages/withdraw.tsx
@@ -57,9 +57,9 @@ function NewExchangeSelection(props: { talerWithdrawUri: string }) {
return;
}
console.log("got withdrawDetails", d);
- if (!selectedExchange && d.withdrawInfo.suggestedExchange) {
+ if (!selectedExchange && d.bankWithdrawDetails.suggestedExchange) {
console.log("setting selected exchange");
- setSelectedExchange(d.withdrawInfo.suggestedExchange);
+ setSelectedExchange(d.bankWithdrawDetails.suggestedExchange);
}
setDetails(d);
};
@@ -101,7 +101,7 @@ function NewExchangeSelection(props: { talerWithdrawUri: string }) {
}
if (selecting) {
- const bankSuggestion = details && details.withdrawInfo.suggestedExchange;
+ const bankSuggestion = details && details.bankWithdrawDetails.suggestedExchange;
return (
<div>
{i18n.str`Please select an exchange. You can review the details before after your selection.`}
@@ -157,7 +157,7 @@ function NewExchangeSelection(props: { talerWithdrawUri: string }) {
<div>
<i18n.Translate wrap="p">
You are about to withdraw{" "}
- <strong>{renderAmount(details.withdrawInfo.amount)}</strong> from your
+ <strong>{renderAmount(details.bankWithdrawDetails.amount)}</strong> from your
bank account into your wallet.
</i18n.Translate>
<div>
@@ -188,8 +188,8 @@ function NewExchangeSelection(props: { talerWithdrawUri: string }) {
</span>
</p>
- {details.reserveCreationInfo ? (
- <WithdrawDetailView rci={details.reserveCreationInfo} />
+ {details.exchangeWithdrawDetails ? (
+ <WithdrawDetailView rci={details.exchangeWithdrawDetails} />
) : null}
</div>
</div>
diff --git a/src/webex/renderHtml.tsx b/src/webex/renderHtml.tsx
index 945719b65..bf9cdc76f 100644
--- a/src/webex/renderHtml.tsx
+++ b/src/webex/renderHtml.tsx
@@ -26,7 +26,7 @@
import { AmountJson } from "../util/amounts";
import * as Amounts from "../util/amounts";
import { DenominationRecord } from "../dbTypes";
-import { ReserveCreationInfo } from "../walletTypes";
+import { ExchangeWithdrawDetails } from "../walletTypes";
import * as moment from "moment";
import * as i18n from "../i18n";
import React from "react";
@@ -126,7 +126,7 @@ export class Collapsible extends React.Component<
}
function AuditorDetailsView(props: {
- rci: ReserveCreationInfo | null;
+ rci: ExchangeWithdrawDetails | null;
}): JSX.Element {
const rci = props.rci;
console.log("rci", rci);
@@ -163,7 +163,7 @@ function AuditorDetailsView(props: {
}
function FeeDetailsView(props: {
- rci: ReserveCreationInfo | null;
+ rci: ExchangeWithdrawDetails | null;
}): JSX.Element {
const rci = props.rci;
if (!rci) {
@@ -271,7 +271,7 @@ function FeeDetailsView(props: {
* Shows details about a withdraw request.
*/
export function WithdrawDetailView(props: {
- rci: ReserveCreationInfo | null;
+ rci: ExchangeWithdrawDetails | null;
}): JSX.Element {
const rci = props.rci;
return (
diff --git a/src/webex/wxApi.ts b/src/webex/wxApi.ts
index c4fa65186..b0af7ac29 100644
--- a/src/webex/wxApi.ts
+++ b/src/webex/wxApi.ts
@@ -34,7 +34,7 @@ import {
import {
BenchmarkResult,
ConfirmPayResult,
- ReserveCreationInfo,
+ ExchangeWithdrawDetails,
SenderWireInfos,
TipStatus,
WalletBalance,
@@ -102,7 +102,7 @@ async function callBackend<T extends MessageType>(
* from a given reserve.
*/
export function getReserveCreationInfo(baseUrl: string,
- amount: AmountJson): Promise<ReserveCreationInfo> {
+ amount: AmountJson): Promise<ExchangeWithdrawDetails> {
return callBackend("reserve-creation-info", { baseUrl, amount });
}