aboutsummaryrefslogtreecommitdiff
path: root/src/webex/pages
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2018-01-23 17:05:58 +0100
committerFlorian Dold <florian.dold@gmail.com>2018-01-23 17:05:58 +0100
commitc8c03e381e252dc3a73a2c35bb1cd2ee24eeaabb (patch)
tree2900ff7be452c2e8b76e18529d8e7d506474abe0 /src/webex/pages
parentaec2c1301edd6c62b7665d4bfbf2087927f9419b (diff)
downloadwallet-core-c8c03e381e252dc3a73a2c35bb1cd2ee24eeaabb.tar.xz
better types
Diffstat (limited to 'src/webex/pages')
-rw-r--r--src/webex/pages/confirm-contract.tsx20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/webex/pages/confirm-contract.tsx b/src/webex/pages/confirm-contract.tsx
index 2ec131052..7fe6b9600 100644
--- a/src/webex/pages/confirm-contract.tsx
+++ b/src/webex/pages/confirm-contract.tsx
@@ -49,7 +49,7 @@ interface DetailState {
interface DetailProps {
contractTerms: ContractTerms;
collapsed: boolean;
- exchanges: null|ExchangeRecord[];
+ exchanges: ExchangeRecord[] | undefined;
}
@@ -110,11 +110,11 @@ interface ContractPromptProps {
interface ContractPromptState {
proposalId: number | undefined;
- proposal: ProposalDownloadRecord | null;
+ proposal: ProposalDownloadRecord | undefined;
error: string | null;
payDisabled: boolean;
alreadyPaid: boolean;
- exchanges: null|ExchangeRecord[];
+ exchanges: ExchangeRecord[] | undefined;
/**
* Don't request updates to proposal state while
* this is set to true, to avoid UI flickering
@@ -123,6 +123,7 @@ interface ContractPromptState {
holdCheck: boolean;
payStatus?: CheckPayResult;
replaying: boolean;
+ payInProgress: boolean;
}
class ContractPrompt extends React.Component<ContractPromptProps, ContractPromptState> {
@@ -131,10 +132,11 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
this.state = {
alreadyPaid: false,
error: null,
- exchanges: null,
+ exchanges: undefined,
holdCheck: false,
payDisabled: true,
- proposal: null,
+ payInProgress: false,
+ proposal: undefined,
proposalId: props.proposalId,
replaying: false,
};
@@ -231,7 +233,13 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
return;
}
console.log("confirmPay with", proposalId, "and", this.props.sessionId);
- const payResult = await wxApi.confirmPay(proposalId, this.props.sessionId);
+ let payResult;
+ try {
+ payResult = await wxApi.confirmPay(proposalId, this.props.sessionId);
+ } catch (e) {
+
+ return;
+ }
console.log("payResult", payResult);
document.location.href = payResult.nextUrl;
this.setState({ holdCheck: true });