aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-05-17 19:57:51 +0800
committerFabio Berger <me@fabioberger.com>2018-05-17 19:57:51 +0800
commit0eacbac8f69bf3b5f03029aae338f63462ca3154 (patch)
tree4a7709245f79912b0223a2fcabad261288b80b7c
parent22f3f57f44cfc4bdd27a79df36a8d80b96b02a07 (diff)
parentcec76c33b6a33d2c36305bd581de628641c14d5e (diff)
downloaddexon-sol-tools-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar
dexon-sol-tools-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.gz
dexon-sol-tools-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.bz2
dexon-sol-tools-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.lz
dexon-sol-tools-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.xz
dexon-sol-tools-0eacbac8f69bf3b5f03029aae338f63462ca3154.tar.zst
dexon-sol-tools-0eacbac8f69bf3b5f03029aae338f63462ca3154.zip
Merge branch 'development' into improvement/addCustomTslintRules
* development: Remove "Order utils" from menu for now Fix top tokens key Improve about page descriptions Do not remove artifacts when running `clean`
-rw-r--r--packages/migrations/artifacts/1.0.0/Exchange.json8
-rw-r--r--packages/migrations/artifacts/1.0.0/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json8
-rw-r--r--packages/migrations/artifacts/1.0.0/TokenRegistry.json8
-rw-r--r--packages/migrations/artifacts/1.0.0/TokenTransferProxy.json8
-rw-r--r--packages/migrations/artifacts/1.0.0/WETH9.json8
-rw-r--r--packages/migrations/artifacts/1.0.0/ZRXToken.json8
-rw-r--r--packages/migrations/package.json2
-rw-r--r--packages/website/ts/components/relayer_index/relayer_top_tokens.tsx10
-rw-r--r--packages/website/ts/components/top_bar/top_bar.tsx6
-rw-r--r--packages/website/ts/pages/about/about.tsx6
10 files changed, 18 insertions, 54 deletions
diff --git a/packages/migrations/artifacts/1.0.0/Exchange.json b/packages/migrations/artifacts/1.0.0/Exchange.json
index dbe83ca32..25b0d4557 100644
--- a/packages/migrations/artifacts/1.0.0/Exchange.json
+++ b/packages/migrations/artifacts/1.0.0/Exchange.json
@@ -668,11 +668,5 @@
}
}
},
- "networks": {
- "50": {
- "address": "0x48bacb9266a570d521063ef5dd96e61686dbe788",
- "links": {},
- "constructorArgs": "[\"0x1d7022f5b17d2f8b695918fb48fa1089c9f85401\",\"0x1dc4c1cefef38a777b15aa20260a54e584b16c48\"]"
- }
- }
+ "networks": {}
} \ No newline at end of file
diff --git a/packages/migrations/artifacts/1.0.0/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json b/packages/migrations/artifacts/1.0.0/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json
index 79aefc3f7..7ab25758b 100644
--- a/packages/migrations/artifacts/1.0.0/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json
+++ b/packages/migrations/artifacts/1.0.0/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.json
@@ -715,11 +715,5 @@
}
}
},
- "networks": {
- "50": {
- "address": "0x34d402f14d58e001d8efbe6585051bf9706aa064",
- "links": {},
- "constructorArgs": "[[\"0x5409ed021d9299bf6814279a6a1411a7e866a631\",\"0x6ecbe1db9ef729cbe972c83fb886247691fb6beb\"],\"2\",\"0\",\"0x1dc4c1cefef38a777b15aa20260a54e584b16c48\"]"
- }
- }
+ "networks": {}
} \ No newline at end of file
diff --git a/packages/migrations/artifacts/1.0.0/TokenRegistry.json b/packages/migrations/artifacts/1.0.0/TokenRegistry.json
index f3f92c568..93753ad55 100644
--- a/packages/migrations/artifacts/1.0.0/TokenRegistry.json
+++ b/packages/migrations/artifacts/1.0.0/TokenRegistry.json
@@ -590,11 +590,5 @@
}
}
},
- "networks": {
- "50": {
- "address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082",
- "links": {},
- "constructorArgs": "[]"
- }
- }
+ "networks": {}
} \ No newline at end of file
diff --git a/packages/migrations/artifacts/1.0.0/TokenTransferProxy.json b/packages/migrations/artifacts/1.0.0/TokenTransferProxy.json
index ac8788603..eb157b760 100644
--- a/packages/migrations/artifacts/1.0.0/TokenTransferProxy.json
+++ b/packages/migrations/artifacts/1.0.0/TokenTransferProxy.json
@@ -226,11 +226,5 @@
}
}
},
- "networks": {
- "50": {
- "address": "0x1dc4c1cefef38a777b15aa20260a54e584b16c48",
- "links": {},
- "constructorArgs": "[]"
- }
- }
+ "networks": {}
} \ No newline at end of file
diff --git a/packages/migrations/artifacts/1.0.0/WETH9.json b/packages/migrations/artifacts/1.0.0/WETH9.json
index 493fae7e5..c6c59fb94 100644
--- a/packages/migrations/artifacts/1.0.0/WETH9.json
+++ b/packages/migrations/artifacts/1.0.0/WETH9.json
@@ -322,11 +322,5 @@
}
}
},
- "networks": {
- "50": {
- "address": "0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c",
- "links": {},
- "constructorArgs": "[]"
- }
- }
+ "networks": {}
} \ No newline at end of file
diff --git a/packages/migrations/artifacts/1.0.0/ZRXToken.json b/packages/migrations/artifacts/1.0.0/ZRXToken.json
index df0dfd78b..b5c71bd46 100644
--- a/packages/migrations/artifacts/1.0.0/ZRXToken.json
+++ b/packages/migrations/artifacts/1.0.0/ZRXToken.json
@@ -278,11 +278,5 @@
}
}
},
- "networks": {
- "50": {
- "address": "0x1d7022f5b17d2f8b695918fb48fa1089c9f85401",
- "links": {},
- "constructorArgs": "[]"
- }
- }
+ "networks": {}
} \ No newline at end of file
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index aec2dc311..b1925ed35 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -12,7 +12,7 @@
"prebuild": "run-s clean compile copy_artifacts generate_contract_wrappers",
"copy_artifacts": "copyfiles -u 4 'artifacts/1.0.0/**/*' ./lib/src/artifacts",
"build": "tsc",
- "clean": "shx rm -rf lib artifacts",
+ "clean": "shx rm -rf lib",
"lint": "tslint --project .",
"migrate": "run-s build compile script:migrate",
"script:migrate": "node ./lib/migrate.js",
diff --git a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
index 03c70c9dd..40ab7bd03 100644
--- a/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_top_tokens.tsx
@@ -26,7 +26,14 @@ export const TopTokens: React.StatelessComponent<TopTokensProps> = (props: TopTo
{_.map(props.tokens, (tokenInfo: WebsiteBackendTokenInfo, index: number) => {
const firstItemStyle = { ...styles.tokenLabel, ...styles.followingTokenLabel };
const style = index !== 0 ? firstItemStyle : styles.tokenLabel;
- return <TokenLink tokenInfo={tokenInfo} style={style} networkId={props.networkId} />;
+ return (
+ <TokenLink
+ key={tokenInfo.address}
+ tokenInfo={tokenInfo}
+ style={style}
+ networkId={props.networkId}
+ />
+ );
})}
</div>
);
@@ -56,7 +63,6 @@ class TokenLink extends React.Component<TokenLinkProps, TokenLinkState> {
};
return (
<a
- key={this.props.tokenInfo.address}
href={tokenLinkFromToken(this.props.tokenInfo, this.props.networkId)}
target="_blank"
style={style}
diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 5fde007d6..3b39d789b 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -143,12 +143,6 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
primaryText={this.props.translate.get(Key.Web3Wrapper, Deco.CapWords)}
/>
</Link>,
- <Link key="subMenuItem-order-utils" to={WebsitePaths.OrderUtils} className="text-decoration-none">
- <MenuItem
- style={{ fontSize: styles.menuItem.fontSize }}
- primaryText={this.props.translate.get(Key.OrderUtils, Deco.CapWords)}
- />
- </Link>,
<Link key="subMenuItem-sol-compiler" to={WebsitePaths.SolCompiler} className="text-decoration-none">
<MenuItem
style={{ fontSize: styles.menuItem.fontSize }}
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index 360cbb136..ac67ca968 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -37,7 +37,7 @@ const teamRow1: ProfileInfo[] = [
name: 'Fabio Berger',
title: 'Senior Engineer',
description: `Full-stack blockchain engineer. Previously software engineer \
- at Airtable and founder of WealthLift. Computer science at Duke.`,
+ at Airtable and founder of WealthLift. Computer Science at Duke.`,
image: '/images/team/fabio.jpg',
linkedIn: 'https://www.linkedin.com/in/fabio-berger-03ab261a/',
github: 'https://github.com/fabioberger',
@@ -60,7 +60,7 @@ const teamRow2: ProfileInfo[] = [
name: 'Leonid Logvinov',
title: 'Engineer',
description: `Full-stack blockchain engineer. Previously blockchain engineer \
- at Neufund. Computer science at University of Warsaw.`,
+ at Neufund. Computer Science at University of Warsaw.`,
image: '/images/team/leonid.png',
linkedIn: 'https://www.linkedin.com/in/leonidlogvinov/',
github: 'https://github.com/LogvinovLeon',
@@ -152,7 +152,7 @@ const teamRow5: ProfileInfo[] = [
{
name: 'Francesco Agosti',
title: 'Senior Frontend Engineer',
- description: `Full-stack engineer. Previously senior software engineer at Yelp. Computer science Duke.`,
+ description: `Full-stack engineer. Previously senior software engineer at Yelp. Computer Science at Duke.`,
image: 'images/team/fragosti.png',
linkedIn: 'https://www.linkedin.com/in/fragosti/',
github: 'http://github.com/fragosti',