aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/package.json2
-rw-r--r--packages/website/public/images/team/steve.pngbin0 -> 49008 bytes
-rw-r--r--packages/website/ts/blockchain.ts10
-rw-r--r--packages/website/ts/pages/about/about.tsx11
-rw-r--r--packages/website/ts/utils/error_reporter.ts5
-rw-r--r--packages/website/ts/utils/utils.ts7
6 files changed, 21 insertions, 14 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index aabb6b28e..22250f59a 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -58,6 +58,7 @@
"react-typist": "^2.0.4",
"redux": "^3.6.0",
"redux-devtools-extension": "^2.13.2",
+ "rollbar": "^2.4.7",
"semver-sort": "0.0.4",
"styled-components": "^3.3.0",
"thenby": "^1.2.3",
@@ -86,7 +87,6 @@
"@types/redux": "^3.6.0",
"@types/web3-provider-engine": "^14.0.0",
"awesome-typescript-loader": "^5.2.1",
- "copyfiles": "^2.0.0",
"css-loader": "0.23.x",
"less-loader": "^4.1.0",
"make-promises-safe": "^1.1.0",
diff --git a/packages/website/public/images/team/steve.png b/packages/website/public/images/team/steve.png
new file mode 100644
index 000000000..751583fba
--- /dev/null
+++ b/packages/website/public/images/team/steve.png
Binary files differ
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index b1181e4c6..8955bbc30 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -374,7 +374,7 @@ export class Blockchain {
return unavailableTakerAmount;
}
public getExchangeContractAddressIfExists(): string | undefined {
- return this._contractWrappers.exchange.getContractAddress();
+ return this._contractWrappers.exchange.address;
}
public async validateFillOrderThrowIfInvalidAsync(
signedOrder: SignedOrder,
@@ -859,10 +859,12 @@ export class Blockchain {
shouldUserLedgerProvider,
);
if (!_.isUndefined(this._contractWrappers)) {
- this._contractWrappers.setProvider(provider, networkId);
- } else {
- this._contractWrappers = new ContractWrappers(provider, { networkId });
+ this._contractWrappers.unsubscribeAll();
}
+ const contractWrappersConfig = {
+ networkId,
+ };
+ this._contractWrappers = new ContractWrappers(provider, contractWrappersConfig);
if (!_.isUndefined(this._zeroEx)) {
this._zeroEx.setProvider(provider, networkId);
} else {
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 2fbd946ae..5f42dfa97 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -239,6 +239,16 @@ const teamRow8: ProfileInfo[] = [
},
];
+const teamRow9: ProfileInfo[] = [
+ {
+ name: 'Steve Klebanoff',
+ title: 'Senior Engineer',
+ description: ` Full-stack engineer. Previously Staff Software Engineer at Appfolio. Computer Science & Cognitive Psychology at Northeastern University.`,
+ image: 'images/team/steve.png',
+ linkedIn: 'https://www.linkedin.com/in/steveklebanoff/',
+ },
+];
+
const advisors1: ProfileInfo[] = [
{
name: 'Fred Ehrsam',
@@ -347,6 +357,7 @@ export class About extends React.Component<AboutProps, AboutState> {
<div className="clearfix">{this._renderProfiles(teamRow6)}</div>
<div className="clearfix">{this._renderProfiles(teamRow7)}</div>
<div className="clearfix">{this._renderProfiles(teamRow8)}</div>
+ <div className="clearfix">{this._renderProfiles(teamRow9)}</div>
</div>
<div className="pt3 pb2">
<div
diff --git a/packages/website/ts/utils/error_reporter.ts b/packages/website/ts/utils/error_reporter.ts
index 6008fffed..bec92e829 100644
--- a/packages/website/ts/utils/error_reporter.ts
+++ b/packages/website/ts/utils/error_reporter.ts
@@ -1,4 +1,5 @@
import { logUtils } from '@0xproject/utils';
+import Rollbar = require('rollbar');
import { configs } from 'ts/utils/configs';
import { constants } from 'ts/utils/constants';
import { utils } from 'ts/utils/utils';
@@ -36,8 +37,8 @@ const rollbarConfig = {
'SecurityError (DOM Exception 18)',
],
};
-import Rollbar = require('../../public/js/rollbar.umd.min.js');
-const rollbar = Rollbar.init(rollbarConfig);
+
+const rollbar = new Rollbar(rollbarConfig);
export const errorReporter = {
report(err: Error): void {
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index d083e0ffc..d1628bc52 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -231,13 +231,6 @@ export const utils = {
},
zeroExErrToHumanReadableErrMsg(error: ContractWrappersError | ExchangeContractErrs, takerAddress: string): string {
const ContractWrappersErrorToHumanReadableError: { [error: string]: string } = {
- [ContractWrappersError.ExchangeContractDoesNotExist]: 'Exchange contract does not exist',
- [ContractWrappersError.EtherTokenContractDoesNotExist]: 'EtherToken contract does not exist',
- [ContractWrappersError.ERC20ProxyContractDoesNotExist]: 'ERC20 proxy contract des not exist',
- [ContractWrappersError.ERC721ProxyContractDoesNotExist]: 'ERC721 proxy contract des not exist',
- [ContractWrappersError.ERC20TokenContractDoesNotExist]: 'ERC20 token contract does not exist',
- [ContractWrappersError.ERC721TokenContractDoesNotExist]: 'ERC721 token contract does not exist',
- [ContractWrappersError.ZRXContractDoesNotExist]: 'ZRX contract does not exist',
[BlockchainCallErrs.UserHasNoAssociatedAddresses]: 'User has no addresses available',
[OrderError.InvalidSignature]: 'Order signature is not valid',
[ContractWrappersError.ContractNotDeployedOnNetwork]: 'Contract is not deployed on the detected network',