From 6415564b9259a4a6a2f6ec9cb934eab3d56a1677 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 9 Dec 2019 19:59:08 +0100 Subject: tos --- src/webex/messages.ts | 2 +- src/webex/pages/withdraw.tsx | 12 ++++++------ src/webex/renderHtml.tsx | 8 ++++---- src/webex/wxApi.ts | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/webex') 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 (
{i18n.str`Please select an exchange. You can review the details before after your selection.`} @@ -157,7 +157,7 @@ function NewExchangeSelection(props: { talerWithdrawUri: string }) {
You are about to withdraw{" "} - {renderAmount(details.withdrawInfo.amount)} from your + {renderAmount(details.bankWithdrawDetails.amount)} from your bank account into your wallet.
@@ -188,8 +188,8 @@ function NewExchangeSelection(props: { talerWithdrawUri: string }) {

- {details.reserveCreationInfo ? ( - + {details.exchangeWithdrawDetails ? ( + ) : null}
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( * from a given reserve. */ export function getReserveCreationInfo(baseUrl: string, - amount: AmountJson): Promise { + amount: AmountJson): Promise { return callBackend("reserve-creation-info", { baseUrl, amount }); } -- cgit v1.2.3