From 96d3b2f35ff9cd4bb45ad04feaf30d2fb4fc2740 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Wed, 2 Aug 2017 13:03:30 -0700 Subject: Add dependejncy: react-burger-menu --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 29db4dace..c1b228272 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,7 @@ "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", "react": "^15.0.2", + "react-burger-menu": "^2.1.4", "react-dom": "^15.5.4", "react-hyperscript": "^2.2.2", "react-markdown": "^2.3.0", -- cgit From 8a39ef03c298f846171173c38912d3386d688af2 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Wed, 2 Aug 2017 17:49:04 -0700 Subject: Hook up css animation --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index c1b228272..98d0708a4 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,7 @@ "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", "react": "^15.0.2", + "react-addons-css-transition-group": "^15.6.0", "react-burger-menu": "^2.1.4", "react-dom": "^15.5.4", "react-hyperscript": "^2.2.2", @@ -116,6 +117,7 @@ "react-select": "^1.0.0-rc.2", "react-simple-file-input": "^1.0.0", "react-tooltip-component": "^0.3.0", + "react-transition-group": "^2.2.0", "readable-stream": "^2.1.2", "redux": "^3.0.5", "redux-logger": "^2.10.2", -- cgit From 3f222854e439e0cf94242e32e54d9c36126d94d5 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Sun, 6 Aug 2017 12:09:17 -0700 Subject: Migrate from css to scss + autoprefixer --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 98d0708a4..5449c1fd8 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,9 @@ "extension-link-enabler": "^1.0.0", "extensionizer": "^1.0.0", "fast-levenshtein": "^2.0.6", + "gulp-autoprefixer": "^4.0.0", "gulp-eslint": "^2.0.0", + "gulp-sass": "^3.1.0", "hat": "0.0.3", "idb-global": "^1.0.0", "identicon.js": "^1.2.1", -- cgit From da51f56df9dfdc67f6ac3e37a3a248f749230c10 Mon Sep 17 00:00:00 2001 From: sdtsui Date: Tue, 8 Aug 2017 13:36:54 -0700 Subject: Add dependencies and JSX support (reactify), for global modal implementation --- package.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 81cbc3d23..7dc1222d7 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ ] } ], + "reactify", "envify", "brfs" ] @@ -53,6 +54,7 @@ "babel-runtime": "^6.23.0", "bip39": "^2.2.0", "bluebird": "^3.5.0", + "boron": "^0.2.3", "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", "client-sw-ready-event": "^3.3.0", @@ -119,6 +121,7 @@ "react-simple-file-input": "^1.0.0", "react-tooltip-component": "^0.3.0", "react-transition-group": "^2.2.0", + "reactify": "^1.1.1", "readable-stream": "^2.1.2", "redux": "^3.0.5", "redux-logger": "^2.10.2", -- cgit From b8aa529d29434978f511e67211d8a5ff9e2f553c Mon Sep 17 00:00:00 2001 From: sdtsui Date: Mon, 14 Aug 2017 10:03:16 +0200 Subject: [WIP] Add packages and tasks for linting scss --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 25dbc1ee9..d6b5752d0 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,8 @@ "babel-runtime": "^6.23.0", "bip39": "^2.2.0", "bluebird": "^3.5.0", - "boron": "^0.2.3", "bn.js": "^4.11.7", + "boron": "^0.2.3", "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", "client-sw-ready-event": "^3.3.0", @@ -85,10 +85,10 @@ "extension-link-enabler": "^1.0.0", "extensionizer": "^1.0.0", "fast-levenshtein": "^2.0.6", - "gulp-autoprefixer": "^4.0.0", - "gulp-sass": "^3.1.0", "gulp": "github:gulpjs/gulp#4.0", + "gulp-autoprefixer": "^4.0.0", "gulp-eslint": "^4.0.0", + "gulp-sass": "^3.1.0", "hat": "0.0.3", "idb-global": "^2.1.0", "identicon.js": "^2.3.1", @@ -169,6 +169,8 @@ "gulp-livereload": "^3.8.1", "gulp-replace": "^0.6.1", "gulp-sourcemaps": "^2.6.0", + "gulp-stylefmt": "^1.1.0", + "gulp-stylelint": "^4.0.0", "gulp-util": "^3.0.7", "gulp-watch": "^4.3.5", "gulp-zip": "^4.0.0", -- cgit From 5452a26b36a84f8fc5b19197d7b58eaed847ae31 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 29 Aug 2017 13:09:47 -0230 Subject: Fixes lint errors and adds stylelint-config-standard to package.json --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 8092e03c5..e4938f693 100644 --- a/package.json +++ b/package.json @@ -194,6 +194,7 @@ "react-test-renderer": "^15.5.4", "react-testutils-additions": "^15.2.0", "sinon": "^2.3.8", + "stylelint-config-standard": "^17.0.0", "tape": "^4.5.1", "testem": "^1.10.3", "uglifyify": "^4.0.2", -- cgit From 062e67bff83fd79647231be6e2448d35b5f312f9 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Mon, 11 Sep 2017 22:14:09 -0700 Subject: Add buttons; handle back; add yarn.lock --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index e4938f693..de6e46833 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "boron": "^0.2.3", "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", + "classnames": "^2.2.5", "client-sw-ready-event": "^3.3.0", "clone": "^2.1.1", "copy-to-clipboard": "^3.0.8", -- cgit From 7eb6dae4185d083ebb967256fdd09203b5092480 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Tue, 12 Sep 2017 02:22:23 -0700 Subject: Added signTokenTx; Adding token confirmation screen --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index de6e46833..82f464986 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", + "ethjs": "^0.2.8", "ethjs-ens": "^2.0.0", "ethjs-query": "^0.2.9", "express": "^4.14.0", -- cgit From 080890a46ec98814bce8680f561fae3b52d81ed2 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 12 Sep 2017 18:08:02 -0230 Subject: Overhaul currency conversion utility and update calls to utility in pending-tx. --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 82f464986..771e73108 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", + "bignumber.js": "^4.0.4", "bip39": "^2.2.0", "bluebird": "^3.5.0", "bn.js": "^4.11.7", @@ -115,6 +116,7 @@ "pump": "^1.0.2", "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", + "ramda": "^0.24.1", "react": "^15.0.2", "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.5.4", -- cgit From b64471833fc925899acb0e9d858624e978eb29af Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Tue, 12 Sep 2017 19:05:00 -0700 Subject: Revert "Overhaul currency conversion utility and update calls to utility in pending-tx." This reverts commit 080890a46ec98814bce8680f561fae3b52d81ed2. --- package.json | 2 -- 1 file changed, 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 771e73108..82f464986 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", - "bignumber.js": "^4.0.4", "bip39": "^2.2.0", "bluebird": "^3.5.0", "bn.js": "^4.11.7", @@ -116,7 +115,6 @@ "pump": "^1.0.2", "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", - "ramda": "^0.24.1", "react": "^15.0.2", "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.5.4", -- cgit From 8b5f2a95df45c24061c13c51ca874e933e743381 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Tue, 12 Sep 2017 23:02:51 -0700 Subject: Improve styling in Confirmation Screen; Show decoded send token data --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 82f464986..87a324837 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ ] }, "dependencies": { + "abi-decoder": "^1.0.8", "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", @@ -92,6 +93,7 @@ "gulp-eslint": "^4.0.0", "gulp-sass": "^3.1.0", "hat": "0.0.3", + "human-standard-token-abi": "^1.0.2", "idb-global": "^2.1.0", "identicon.js": "^2.3.1", "iframe": "^1.0.0", -- cgit From 6fa1cd62258ba96d1a55bee140f2d1f10f091ed2 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 12 Sep 2017 18:08:02 -0230 Subject: Reapply conversion utility changes and fix calls to utility in pending-tx. --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 87a324837..8ca348bd3 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", + "bignumber.js": "^4.0.4", "bip39": "^2.2.0", "bluebird": "^3.5.0", "bn.js": "^4.11.7", @@ -117,6 +118,7 @@ "pump": "^1.0.2", "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", + "ramda": "^0.24.1", "react": "^15.0.2", "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.5.4", -- cgit From d722c1045f70954cb1a97de52cae5084a6f14815 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Wed, 13 Sep 2017 19:57:33 -0700 Subject: Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 8ca348bd3..15cb058ec 100644 --- a/package.json +++ b/package.json @@ -137,6 +137,7 @@ "request-promise": "^4.1.1", "sandwich-expando": "^1.0.5", "semaphore": "^1.0.5", + "shallow-copy": "0.0.1", "sw-stream": "^2.0.0", "textarea-caret": "^3.0.1", "through2": "^2.0.3", -- cgit From 0204aa2001af25da01ba61aed32f36eac47079a1 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Tue, 19 Sep 2017 21:18:36 -0700 Subject: Add Add Token UI; Add Fuzzy search for tokens --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index b615cab20..c6bd437f1 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "end-of-stream": "^1.1.0", "ensnare": "^1.0.0", "eth-bin-to-ops": "^1.0.1", - "eth-contract-metadata": "^1.1.4", + "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.1.1", "eth-json-rpc-filters": "^1.1.0", "eth-phishing-detect": "^1.1.4", @@ -93,6 +93,7 @@ "extensionizer": "^1.0.0", "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", + "fuse.js": "^3.1.0", "gulp": "github:gulpjs/gulp#4.0", "gulp-autoprefixer": "^4.0.0", "gulp-eslint": "^4.0.0", @@ -212,8 +213,8 @@ "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.5.4", "react-testutils-additions": "^15.2.0", - "stylelint-config-standard": "^17.0.0", "sinon": "^3.2.0", + "stylelint-config-standard": "^17.0.0", "tape": "^4.5.1", "testem": "^1.10.3", "uglifyify": "^4.0.2", -- cgit From 67ee5b21e6f64ac22e65f2712ae13dd8c09ed113 Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Thu, 28 Sep 2017 17:39:53 -0700 Subject: Query for gas estimates --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 264c73e06..5763f6e32 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "end-of-stream": "^1.1.0", "ensnare": "^1.0.0", "eth-bin-to-ops": "^1.0.1", - "eth-contract-metadata": "^1.1.5", "eth-block-tracker": "^2.2.0", + "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.1.1", "eth-json-rpc-filters": "^1.2.1", "eth-keyring-controller": "^2.0.0", @@ -84,6 +84,7 @@ "eth-sig-util": "^1.2.2", "eth-simple-keyring": "^1.1.1", "eth-token-tracker": "^1.1.4", + "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", @@ -216,8 +217,8 @@ "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.5.4", "react-testutils-additions": "^15.2.0", - "stylelint-config-standard": "^17.0.0", "sinon": "^4.0.0", + "stylelint-config-standard": "^17.0.0", "tape": "^4.5.1", "testem": "^1.10.3", "uglifyify": "^4.0.2", -- cgit From ea7926c211965e2e529e5795a4e1655e97e32144 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 9 Oct 2017 13:55:23 -0230 Subject: Adds amount and gas field to sendV2. --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 20a1fa8ea..7e4386cbd 100644 --- a/package.json +++ b/package.json @@ -136,6 +136,7 @@ "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.5.4", "react-hyperscript": "^3.0.0", + "react-input-autosize": "^2.0.1", "react-markdown": "^2.3.0", "react-redux": "^5.0.5", "react-select": "^1.0.0-rc.2", -- cgit From 7ec77e0b4580c52bbf1723ed52d647c9d7516bd5 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 11 Oct 2017 10:48:27 -0230 Subject: Refactor amount input: dynamic input width with vanilla js. --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7e4386cbd..20a1fa8ea 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,6 @@ "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.5.4", "react-hyperscript": "^3.0.0", - "react-input-autosize": "^2.0.1", "react-markdown": "^2.3.0", "react-redux": "^5.0.5", "react-select": "^1.0.0-rc.2", -- cgit From 56e9f98bd05de8ae26f653d15eec4304f0c72155 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 2 Nov 2017 09:45:59 -0230 Subject: More lint fixes --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 28f35914f..1fea3656c 100644 --- a/package.json +++ b/package.json @@ -190,6 +190,7 @@ "enzyme": "^2.8.2", "eslint-plugin-chai": "0.0.1", "eslint-plugin-mocha": "^4.9.0", + "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.2.7", "fs-promise": "^2.0.3", "gulp": "github:gulpjs/gulp#4.0", -- cgit From b7653e82079b60078b921776b169518d13c7e806 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 2 Nov 2017 14:58:41 -0230 Subject: Get current NewUI-flat tests working. --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 1fea3656c..bbf4c772c 100644 --- a/package.json +++ b/package.json @@ -227,6 +227,7 @@ "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.5.4", "react-testutils-additions": "^15.2.0", + "redux-test-utils": "^0.1.3", "sinon": "^4.0.0", "stylelint-config-standard": "^17.0.0", "tape": "^4.5.1", -- cgit From acc973d543ac65f8db980c0007c248c509345411 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 2 Nov 2017 17:15:45 -0230 Subject: Update classnames for integration tests and add output/index.css to integration test for ci --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index bbf4c772c..12c839739 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "test": "npm run lint && npm run test:coverage && npm run test:integration", "test:unit": "METAMASK_ENV=test mocha --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"", "test:single": "METAMASK_ENV=test mocha --require test/helper.js", - "test:integration": "npm run test:flat && npm run test:mascara", + "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara", "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload", "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi", "test:flat": "npm run test:flat:build && karma start test/flat.conf.js", -- cgit From 90fc4812bc75857581e56eb6d63484dbc5c48cb1 Mon Sep 17 00:00:00 2001 From: "Clark, Jason (Contractor)" Date: Thu, 23 Nov 2017 18:33:44 -0700 Subject: incremental commit --- package.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 12c839739..c0e21ffa7 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "babel-runtime": "^6.23.0", "bignumber.js": "^4.0.4", "bip39": "^2.2.0", + "blockies": "0.0.2", "bluebird": "^3.5.0", "bn.js": "^4.11.7", "boron": "^0.2.3", @@ -77,8 +78,8 @@ "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", "eth-block-tracker": "^2.2.0", - "eth-hd-keyring": "^1.2.1", "eth-contract-metadata": "^1.1.5", + "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.4", "eth-keyring-controller": "^2.1.2", "eth-phishing-detect": "^1.1.4", @@ -101,7 +102,6 @@ "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", "fuse.js": "^3.1.0", - "gulp": "github:gulpjs/gulp#4.0", "gulp-autoprefixer": "^4.0.0", "gulp-eslint": "^4.0.0", "gulp-sass": "^3.1.0", @@ -144,12 +144,14 @@ "react-hyperscript": "^3.0.0", "react-markdown": "^2.3.0", "react-redux": "^5.0.5", - "react-select": "^1.0.0-rc.2", + "react-select": "^1.0.0", "react-simple-file-input": "^2.0.0", + "react-toggle": "^4.0.2", + "react-toggle-switch": "^3.0.3", "react-tooltip-component": "^0.3.0", "react-transition-group": "^2.2.0", - "reactify": "^1.1.1", "react-trigger-change": "^1.0.2", + "reactify": "^1.1.1", "readable-stream": "^2.3.3", "recompose": "^0.25.0", "redux": "^3.0.5", -- cgit From fc46a16a329df296cb565e3a0b04f268d2aeceb5 Mon Sep 17 00:00:00 2001 From: Jason Clark Date: Fri, 24 Nov 2017 10:35:17 -0700 Subject: toggle wired up to preferences property store --- package.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index c0e21ffa7..643e7c9a3 100644 --- a/package.json +++ b/package.json @@ -52,11 +52,11 @@ ] }, "dependencies": { - "abi-decoder": "^1.0.8", + "abi-decoder": "^1.0.9", "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", - "bignumber.js": "^4.0.4", + "bignumber.js": "^4.1.0", "bip39": "^2.2.0", "blockies": "0.0.2", "bluebird": "^3.5.0", @@ -101,7 +101,7 @@ "extensionizer": "^1.0.0", "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", - "fuse.js": "^3.1.0", + "fuse.js": "^3.2.0", "gulp-autoprefixer": "^4.0.0", "gulp-eslint": "^4.0.0", "gulp-sass": "^3.1.0", @@ -147,9 +147,10 @@ "react-select": "^1.0.0", "react-simple-file-input": "^2.0.0", "react-toggle": "^4.0.2", + "react-toggle-button": "^2.2.0", "react-toggle-switch": "^3.0.3", "react-tooltip-component": "^0.3.0", - "react-transition-group": "^2.2.0", + "react-transition-group": "^2.2.1", "react-trigger-change": "^1.0.2", "reactify": "^1.1.1", "readable-stream": "^2.3.3", -- cgit From dc7bd3c62897edfb642f215a71fbf7dd93faa350 Mon Sep 17 00:00:00 2001 From: Jason Clark Date: Fri, 24 Nov 2017 13:48:56 -0700 Subject: incremental commit of working blockie component --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 643e7c9a3..ea1489086 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "babel-runtime": "^6.23.0", "bignumber.js": "^4.1.0", "bip39": "^2.2.0", - "blockies": "0.0.2", "bluebird": "^3.5.0", "bn.js": "^4.11.7", "boron": "^0.2.3", @@ -87,6 +86,7 @@ "eth-sig-util": "^1.4.0", "eth-simple-keyring": "^1.2.0", "eth-token-tracker": "^1.1.4", + "ethereum-blockies": "^0.1.1", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", @@ -146,9 +146,7 @@ "react-redux": "^5.0.5", "react-select": "^1.0.0", "react-simple-file-input": "^2.0.0", - "react-toggle": "^4.0.2", "react-toggle-button": "^2.2.0", - "react-toggle-switch": "^3.0.3", "react-tooltip-component": "^0.3.0", "react-transition-group": "^2.2.1", "react-trigger-change": "^1.0.2", -- cgit From 1b89ceb63aa7d96912eb32c8766ef566479dde41 Mon Sep 17 00:00:00 2001 From: Jason Clark Date: Sat, 25 Nov 2017 14:33:42 -0700 Subject: swapped out ethereum-blockies lib for MEW blockies library, tightened up identicon.js code --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index ea1489086..087ff4ac8 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,6 @@ "eth-sig-util": "^1.4.0", "eth-simple-keyring": "^1.2.0", "eth-token-tracker": "^1.1.4", - "ethereum-blockies": "^0.1.1", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", -- cgit From cefe6cded6728ff95d951435430da311356c3b23 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Sat, 25 Nov 2017 18:37:12 -0600 Subject: Update to Enzyme 3.2.0 --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 12c839739..27fea1495 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,8 @@ "deep-freeze-strict": "^1.1.1", "del": "^3.0.0", "envify": "^4.0.0", - "enzyme": "^2.8.2", + "enzyme": "^3.2.0", + "enzyme-adapter-react-15": "^1.0.5", "eslint-plugin-chai": "0.0.1", "eslint-plugin-mocha": "^4.9.0", "eslint-plugin-react": "^7.4.0", -- cgit From 178b657c758229ccce0a13d9842197729847a9e0 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Sun, 26 Nov 2017 10:03:17 -0600 Subject: Update Qunit to QunitJS v2.4.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 27fea1495..3d4366fa7 100644 --- a/package.json +++ b/package.json @@ -224,7 +224,7 @@ "open": "0.0.5", "prompt": "^1.0.0", "qs": "^6.2.0", - "qunit": "^1.0.0", + "qunitjs": "^2.4.1", "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.5.4", "react-testutils-additions": "^15.2.0", -- cgit From 1ee91a51ccdaffd8990e56715f63fe2aca472398 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Sun, 26 Nov 2017 10:46:28 -0600 Subject: Update ethjs-query to v0.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3d4366fa7..8ca9b5211 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "ethjs": "^0.2.8", "ethjs-contract": "^0.1.9", "ethjs-ens": "^2.0.0", - "ethjs-query": "^0.2.9", + "ethjs-query": "^0.3.1", "express": "^4.15.5", "extension-link-enabler": "^1.0.0", "extensionizer": "^1.0.0", -- cgit From 109050817a3074c57eb273a556b2a7bff0f87759 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Mon, 27 Nov 2017 08:46:47 -0600 Subject: Update react, react-dom, and react-test-renderer to 15.6.2 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8ca9b5211..14090dffb 100644 --- a/package.json +++ b/package.json @@ -138,9 +138,9 @@ "pumpify": "^1.3.4", "qrcode-npm": "0.0.3", "ramda": "^0.24.1", - "react": "^15.0.2", + "react": "^15.6.2", "react-addons-css-transition-group": "^15.6.0", - "react-dom": "^15.5.4", + "react-dom": "^15.6.2", "react-hyperscript": "^3.0.0", "react-markdown": "^2.3.0", "react-redux": "^5.0.5", @@ -226,7 +226,7 @@ "qs": "^6.2.0", "qunitjs": "^2.4.1", "react-addons-test-utils": "^15.5.1", - "react-test-renderer": "^15.5.4", + "react-test-renderer": "^15.6.2", "react-testutils-additions": "^15.2.0", "redux-test-utils": "^0.1.3", "sinon": "^4.0.0", -- cgit From a34362b7765f48d24375c9953fa7c49cf3306491 Mon Sep 17 00:00:00 2001 From: Jason Clark Date: Mon, 27 Nov 2017 08:11:48 -0700 Subject: Fixes changes requested in pullrequestreview-79088534 --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 087ff4ac8..62ee7c0d3 100644 --- a/package.json +++ b/package.json @@ -102,6 +102,7 @@ "fast-levenshtein": "^2.0.6", "fuse.js": "^3.2.0", "gulp-autoprefixer": "^4.0.0", + "gulp": "github:gulpjs/gulp#4.0", "gulp-eslint": "^4.0.0", "gulp-sass": "^3.1.0", "hat": "0.0.3", -- cgit From 9b25f89728deabbdbeb7f7f0edd1b8cf4fd6e5bc Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Mon, 27 Nov 2017 12:35:19 -0600 Subject: Update babelify to 8.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 14090dffb..5b69587d9 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "babel-preset-react": "^6.24.1", "babel-preset-stage-0": "^6.24.1", "babel-register": "^6.7.2", - "babelify": "^7.2.0", + "babelify": "^8.0.0", "beefy": "^2.1.5", "brfs": "^1.4.3", "browserify": "^14.4.0", -- cgit From ec6c3c33bdbe2d90dc71649d0cc5fb3c07d96af7 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 5 Dec 2017 13:11:59 -0330 Subject: Merge branch 'master' into NewUI-flat-merge-with-master --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 39d5df75c..72b4951db 100644 --- a/package.json +++ b/package.json @@ -118,6 +118,7 @@ "lodash.debounce": "^4.0.8", "lodash.memoize": "^4.1.2", "lodash.shuffle": "^4.2.0", + "lodash.uniqby": "^4.7.0", "loglevel": "^1.4.1", "metamascara": "^1.3.1", "metamask-logo": "^2.1.2", @@ -126,7 +127,7 @@ "multiplex": "^6.7.0", "number-to-bn": "^1.7.0", "obj-multiplex": "^1.0.0", - "obs-store": "^2.3.1", + "obs-store": "^3.0.0", "once": "^1.3.3", "ping-pong-stream": "^1.0.0", "pojo-migrator": "^2.1.0", @@ -142,7 +143,7 @@ "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.6.2", "react-hyperscript": "^3.0.0", - "react-markdown": "^2.3.0", + "react-markdown": "^3.0.0", "react-redux": "^5.0.5", "react-select": "^1.0.0", "react-simple-file-input": "^2.0.0", @@ -160,6 +161,7 @@ "sandwich-expando": "^1.1.3", "semaphore": "^1.0.5", "shallow-copy": "0.0.1", + "semver": "^5.4.1", "sw-stream": "^2.0.0", "textarea-caret": "^3.0.1", "through2": "^2.0.3", -- cgit From dfb22471087f040d8345a5a17321e1462842045c Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Fri, 29 Dec 2017 12:46:32 -0800 Subject: Fix sign typed data --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 03f2ce779..c0d938484 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.4", "eth-json-rpc-infura": "^1.0.2", - "eth-keyring-controller": "^2.1.2", + "eth-keyring-controller": "^2.1.3", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", "eth-sig-util": "^1.4.0", @@ -102,8 +102,8 @@ "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", "fuse.js": "^3.2.0", - "gulp-autoprefixer": "^4.0.0", "gulp": "github:gulpjs/gulp#4.0", + "gulp-autoprefixer": "^4.0.0", "gulp-eslint": "^4.0.0", "gulp-sass": "^3.1.0", "hat": "0.0.3", @@ -161,8 +161,8 @@ "request-promise": "^4.2.1", "sandwich-expando": "^1.1.3", "semaphore": "^1.0.5", - "shallow-copy": "0.0.1", "semver": "^5.4.1", + "shallow-copy": "0.0.1", "sw-stream": "^2.0.0", "textarea-caret": "^3.0.1", "through2": "^2.0.3", -- cgit