fix insufficient funds message (#4768)

We now distinguish the case where the wallet knows the exchange already
and the case where we don't have anything in common.
This commit is contained in:
Florian Dold 2016-11-14 03:54:51 +01:00
parent ce33432036
commit ded250e6a5

View File

@ -32,12 +32,12 @@ import {getExchanges} from "src/wxApi";
interface DetailState { interface DetailState {
collapsed: boolean; collapsed: boolean;
exchanges: null|IExchangeInfo[];
} }
interface DetailProps { interface DetailProps {
contract: Contract contract: Contract
collapsed: boolean collapsed: boolean
exchanges: null|IExchangeInfo[];
} }
@ -47,17 +47,9 @@ class Details extends React.Component<DetailProps, DetailState> {
console.log("new Details component created"); console.log("new Details component created");
this.state = { this.state = {
collapsed: props.collapsed, collapsed: props.collapsed,
exchanges: null
}; };
console.log("initial state:", this.state); console.log("initial state:", this.state);
this.update();
}
async update() {
let exchanges = await getExchanges();
this.setState({exchanges} as any);
} }
render() { render() {
@ -85,7 +77,7 @@ class Details extends React.Component<DetailProps, DetailState> {
</ul> </ul>
Exchanges in the wallet: Exchanges in the wallet:
<ul> <ul>
{(this.state.exchanges || []).map( {(this.props.exchanges || []).map(
(e: IExchangeInfo) => (e: IExchangeInfo) =>
<li>{`${e.baseUrl}: ${e.masterPublicKey}`}</li>)} <li>{`${e.baseUrl}: ${e.masterPublicKey}`}</li>)}
</ul> </ul>
@ -100,18 +92,20 @@ interface ContractPromptProps {
} }
interface ContractPromptState { interface ContractPromptState {
offer: any; offer: Offer|null;
error: string|null; error: string|null;
payDisabled: boolean; payDisabled: boolean;
exchanges: null|IExchangeInfo[];
} }
class ContractPrompt extends React.Component<ContractPromptProps, ContractPromptState> { class ContractPrompt extends React.Component<ContractPromptProps, ContractPromptState> {
constructor() { constructor() {
super(); super();
this.state = { this.state = {
offer: undefined, offer: null,
error: null, error: null,
payDisabled: true, payDisabled: true,
exchanges: null
} }
} }
@ -127,6 +121,8 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
let offer = await this.getOffer(); let offer = await this.getOffer();
this.setState({offer} as any); this.setState({offer} as any);
this.checkPayment(); this.checkPayment();
let exchanges = await getExchanges();
this.setState({exchanges} as any);
} }
getOffer(): Promise<Offer> { getOffer(): Promise<Offer> {
@ -155,7 +151,20 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
console.log("check-pay error", JSON.stringify(resp)); console.log("check-pay error", JSON.stringify(resp));
switch (resp.error) { switch (resp.error) {
case "coins-insufficient": case "coins-insufficient":
this.state.error = i18n`You have insufficient funds of the requested currency in your wallet.`; let msgInsufficient = i18n`You have insufficient funds of the requested currency in your wallet.`;
let msgNoMatch = i18n`You do not have any funds from an exchange that is accepted by this merchant.
None of the exchanges accepted by the merchant is known to your wallet.`;
if (this.state.exchanges && this.state.offer) {
let acceptedExchangePubs = this.state.offer.contract.exchanges.map((e) => e.master_pub);
let ex = this.state.exchanges.find((e) => acceptedExchangePubs.indexOf(e.masterPublicKey) >= 0);
if (ex) {
this.state.error = msgInsufficient;
} else {
this.state.error = msgNoMatch;
}
} else {
this.state.error = msgInsufficient;
}
break; break;
default: default:
this.state.error = `Error: ${resp.error}`; this.state.error = `Error: ${resp.error}`;
@ -188,7 +197,7 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
this.setState({} as any); this.setState({} as any);
return; return;
} }
let c = d.offer.contract; let c = d.offer!.contract;
console.log("contract", c); console.log("contract", c);
document.location.href = substituteFulfillmentUrl(c.fulfillment_url, document.location.href = substituteFulfillmentUrl(c.fulfillment_url,
this.state.offer); this.state.offer);
@ -214,7 +223,7 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
<div> <div>
{(this.state.error ? <p className="errorbox">{this.state.error}</p> : <p />)} {(this.state.error ? <p className="errorbox">{this.state.error}</p> : <p />)}
</div> </div>
<Details contract={c} collapsed={!this.state.error}/> <Details exchanges={this.state.exchanges} contract={c} collapsed={!this.state.error}/>
</div> </div>
); );
} }