Skip to content
This repository has been archived by the owner on Feb 27, 2021. It is now read-only.

Commit

Permalink
fix: update node version and typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
BelfordZ committed Oct 16, 2020
1 parent ece1d4c commit 2ed5dc6
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 19 deletions.
8 changes: 2 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ aliases:

defaults: &defaults
working_directory: ~/project
docker:
- image: circleci/node:12

jobs:
test:
<<: *defaults
docker:
- image: circleci/node:10
steps:
- checkout
- restore_cache: *restore-deps-cache
Expand All @@ -41,8 +41,6 @@ jobs:

build:
<<: *defaults
docker:
- image: circleci/node:10
steps:
- checkout
- restore_cache: *restore-deps-cache
Expand All @@ -52,8 +50,6 @@ jobs:

release:
<<: *defaults
docker:
- image: circleci/node:10
steps:
- checkout
- restore_cache: *restore-deps-cache
Expand Down
23 changes: 23 additions & 0 deletions .jsbeautifyrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"indent_size": 2,
"indent_char": " ",
"eol": "\n",
"indent_level": 0,
"indent_with_tabs": false,
"preserve_newlines": true,
"max_preserve_newlines": 2,
"jslint_happy": false,
"space_after_anon_function": false,
"brace_style": "collapse",
"keep_array_indentation": false,
"keep_function_indentation": false,
"space_before_conditional": true,
"break_chained_methods": true,
"eval_code": false,
"unescape_strings": false,
"wrap_line_length": 80,
"wrap_attributes": "auto",
"wrap_attributes_indent_size": 2,
"e4x": true,
"end_with_newline": true
}
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.15.3
12.18.4
19 changes: 13 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@types/bignumber.js": "^4.0.3",
"@types/jest": "^21.1.6",
"@types/lodash": "^4.14.149",
"@types/node": "^8.10.58",
"@types/node": "^14.11.8",
"@types/react": "^16.9.11",
"@types/react-dom": "^16.9.3",
"@types/react-router-dom": "^5.1.1",
Expand All @@ -76,7 +76,7 @@
"ts-node": "^8.5.0",
"tslint": "^5.8.0",
"tslint-react": "^4.1.0",
"typescript": "^3.7.2"
"typescript": "^4.0.3"
},
"browserslist": {
"production": [
Expand Down
7 changes: 3 additions & 4 deletions src/components/BlockView/BlockGasPrice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,26 @@ function BlockGasPrice(props: any) {

if (transactions.length === 0) {return <></>;}


return (
<>
<TableRow>
<TableCell>{t("Average Gas Price")}</TableCell>
<TableCell>
{_.meanBy(transactions, (t: any) => parseInt(t.gasPrice, 16))}
{/* {_.meanBy(transactions, (t: any) => BigInt(t.gasPrice))} */}
</TableCell>
</TableRow>

<TableRow>
<TableCell>{t("Min Gas Price")}</TableCell>
<TableCell>
{hexToNumber(_.minBy(transactions, (t: any) => parseInt(t.gasPrice, 16)).gasPrice)}
{/* {hexToNumber(_.minBy(transactions, (t: any) => BigInt(t.gasPrice)).gasPrice)} */}
</TableCell>
</TableRow>

<TableRow>
<TableCell>{t("Max Gas Price")}</TableCell>
<TableCell>
{hexToNumber(_.maxBy(transactions, (t: any) => parseInt(t.gasPrice, 16)).gasPrice)}
{/* {hexToNumber(_.maxBy(transactions, (t: any) => BigInt(t.gasPrice)).gasPrice)} */}
</TableCell>
</TableRow>
</>
Expand Down

0 comments on commit 2ed5dc6

Please sign in to comment.