aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/package.json8
-rw-r--r--packages/website/ts/components/eth_weth_conversion_button.tsx2
-rw-r--r--packages/website/ts/components/fill_order.tsx4
-rw-r--r--packages/website/ts/components/inputs/allowance_toggle.tsx2
-rw-r--r--packages/website/ts/components/token_balances.tsx4
-rw-r--r--packages/website/ts/containers/zero_ex_js_documentation.tsx5
-rw-r--r--packages/website/ts/pages/documentation/documentation.tsx4
-rw-r--r--packages/website/ts/pages/wiki/wiki.tsx4
-rw-r--r--packages/website/ts/utils/configs.ts8
9 files changed, 23 insertions, 18 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index 235ff236e..ad7f361e5 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
- "version": "0.0.2",
+ "version": "0.0.3",
"private": true,
"description": "Website and 0x portal dapp",
"scripts": {
@@ -18,9 +18,9 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "0x.js": "~0.27.2",
- "@0xproject/subproviders": "^0.1.0",
- "@0xproject/utils": "^0.1.0",
+ "0x.js": "^0.28.0",
+ "@0xproject/subproviders": "^0.1.1",
+ "@0xproject/utils": "^0.1.1",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"bignumber.js": "~4.1.0",
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index e94f46f22..f2aee9d6d 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -109,11 +109,11 @@ export class EthWethConversionButton extends
} else if (!_.includes(errMsg, 'User denied transaction')) {
utils.consoleLog(`Unexpected error encountered: ${err}`);
utils.consoleLog(err.stack);
- await errorReporter.reportAsync(err);
const errorMsg = direction === Side.Deposit ?
'Failed to wrap your ETH. Please try again.' :
'Failed to unwrap your WETH. Please try again.';
this.props.dispatcher.showFlashMessage(errorMsg);
+ await errorReporter.reportAsync(err);
}
}
this.setState({
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx
index c8c9cc0d8..abb46f7f2 100644
--- a/packages/website/ts/components/fill_order.tsx
+++ b/packages/website/ts/components/fill_order.tsx
@@ -594,10 +594,10 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
}
globalErrMsg = 'Failed to fill order, please refresh and try again';
utils.consoleLog(`${err}`);
- await errorReporter.reportAsync(err);
this.setState({
globalErrMsg,
});
+ await errorReporter.reportAsync(err);
return;
}
}
@@ -677,10 +677,10 @@ export class FillOrder extends React.Component<FillOrderProps, FillOrderState> {
}
globalErrMsg = 'Failed to cancel order, please refresh and try again';
utils.consoleLog(`${err}`);
- await errorReporter.reportAsync(err);
this.setState({
globalErrMsg,
});
+ await errorReporter.reportAsync(err);
return;
}
}
diff --git a/packages/website/ts/components/inputs/allowance_toggle.tsx b/packages/website/ts/components/inputs/allowance_toggle.tsx
index 9bd015d04..2404a1e31 100644
--- a/packages/website/ts/components/inputs/allowance_toggle.tsx
+++ b/packages/website/ts/components/inputs/allowance_toggle.tsx
@@ -84,8 +84,8 @@ export class AllowanceToggle extends React.Component<AllowanceToggleProps, Allow
}
utils.consoleLog(`Unexpected error encountered: ${err}`);
utils.consoleLog(err.stack);
- await errorReporter.reportAsync(err);
this.props.onErrorOccurred(BalanceErrs.allowanceSettingFailed);
+ await errorReporter.reportAsync(err);
}
}
private _isAllowanceSet() {
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index 695cb05d8..208cd54e1 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -590,10 +590,10 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
}
utils.consoleLog(`Unexpected error encountered: ${err}`);
utils.consoleLog(err.stack);
- await errorReporter.reportAsync(err);
this.setState({
errorType: BalanceErrs.mintingFailed,
});
+ await errorReporter.reportAsync(err);
return false;
}
}
@@ -619,13 +619,13 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala
const responseBody = await response.text();
if (response.status !== constants.SUCCESS_STATUS) {
utils.consoleLog(`Unexpected status code: ${response.status} -> ${responseBody}`);
- await errorReporter.reportAsync(new Error(`Faucet returned non-200: ${JSON.stringify(response)}`));
const errorType = response.status === constants.UNAVAILABLE_STATUS ?
BalanceErrs.faucetQueueIsFull :
BalanceErrs.faucetRequestFailed;
this.setState({
errorType,
});
+ await errorReporter.reportAsync(new Error(`Faucet returned non-200: ${JSON.stringify(response)}`));
return false;
}
diff --git a/packages/website/ts/containers/zero_ex_js_documentation.tsx b/packages/website/ts/containers/zero_ex_js_documentation.tsx
index ded62d2bc..2f2c49167 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.tsx
+++ b/packages/website/ts/containers/zero_ex_js_documentation.tsx
@@ -108,6 +108,9 @@ const docsInfoConfig: DocsInfoConfig = {
'LogErrorContractEventArgs',
'LogFillContractEventArgs',
'LogCancelContractEventArgs',
+ 'EtherTokenContractEventArgs',
+ 'WithdrawalContractEventArgs',
+ 'DepositContractEventArgs',
'TokenEvents',
'ExchangeContractEventArgs',
'TransferContractEventArgs',
@@ -116,6 +119,8 @@ const docsInfoConfig: DocsInfoConfig = {
'ZeroExConfig',
'TransactionReceiptWithDecodedLogs',
'LogWithDecodedArgs',
+ 'EtherTokenEvents',
+ 'BlockParamLiteral',
'DecodedLogArgs',
'MethodOpts',
'ValidateOrderFillableOpts',
diff --git a/packages/website/ts/pages/documentation/documentation.tsx b/packages/website/ts/pages/documentation/documentation.tsx
index ad244ef1f..c0be882f8 100644
--- a/packages/website/ts/pages/documentation/documentation.tsx
+++ b/packages/website/ts/pages/documentation/documentation.tsx
@@ -63,13 +63,13 @@ interface DocumentationState {
const styles: Styles = {
mainContainers: {
position: 'absolute',
- top: 60,
+ top: 1,
left: 0,
bottom: 0,
right: 0,
overflowZ: 'hidden',
overflowY: 'scroll',
- minHeight: 'calc(100vh - 60px)',
+ minHeight: 'calc(100vh - 1px)',
WebkitOverflowScrolling: 'touch',
},
menuContainer: {
diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx
index 4ddb11008..72da94a20 100644
--- a/packages/website/ts/pages/wiki/wiki.tsx
+++ b/packages/website/ts/pages/wiki/wiki.tsx
@@ -29,13 +29,13 @@ interface WikiState {
const styles: Styles = {
mainContainers: {
position: 'absolute',
- top: 60,
+ top: 1,
left: 0,
bottom: 0,
right: 0,
overflowZ: 'hidden',
overflowY: 'scroll',
- minHeight: 'calc(100vh - 60px)',
+ minHeight: 'calc(100vh - 1px)',
WebkitOverflowScrolling: 'touch',
},
menuContainer: {
diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts
index 4ae40d715..4a05799b8 100644
--- a/packages/website/ts/utils/configs.ts
+++ b/packages/website/ts/utils/configs.ts
@@ -104,15 +104,15 @@ export const configs = {
42: {
address: '0x05d090b51c40b020eab3bfcb6a2dff130df22e9c',
timestampMsRange: {
- startTimestampMs: 1501614680000,
- endTimestampMs: 1513106129000,
+ startTimestampMs: 1502455607000,
+ endTimestampMs: 1513790926000,
},
},
1: {
address: '0x2956356cd2a2bf3202f771f50d3d14a367b48070',
timestampMsRange: {
- startTimestampMs: 1513123415000,
- endTimestampMs: 1513106129000,
+ startTimestampMs: 1502455607000,
+ endTimestampMs: 1513790926000,
},
},
},