1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-02 14:15:06 +01:00
Commit Graph

1475 Commits

Author SHA1 Message Date
Whymarrh Whitby
6bc1077880
Make Coveralls its own optional CI job (#7002)
* ci: Move Coveralls into optional step

* Split Coveralls step out of test:coverage npm script
2019-08-13 13:29:10 -02:30
Bruno Barbieri
835d4fbb13
Update mobile sync (#6967)
* update mobile sync

* update lockfile
2019-08-06 15:33:41 -04:00
Mark Stacey
6a0dbcdb31
Upgrade to Babel 7 (#6942)
Babel 7 moved to a new configuration format, and they've scoped all of
their packages under `@babel/`. This brings MetaMask in-line with
dependencies we use that _already_ use Babel 7, and it eliminates a
few unfortunate edge cases that can prevent dependencies from being
correctly transpiled.
2019-08-02 13:17:20 -02:30
Dan J Miller
3eff478775
I5849 incremental account security (#6874)
* Implements ability to defer seed phrase backup to later

* Adds incremental-security.spec.js, including test dapp that sends signed tx with stand alone localhost provider

* Update metamask-responsive-ui for incremental account security changes

* Update backup-notification style and fix responsiveness of seed phrase screen

* Remove uneeded files from send-eth-with-private-key-test/

* Apply linguist flags in .gitattributes for send-eth-with-private-key-test/ethereumjs-tx.js

* Improve docs in controllers/onboarding.js

* Clean up metamask-extension/test/e2e/send-eth-with-private-key-test/index.html

* Remove unnecessary newlines in a couple first-time-flow/ files

* Fix import of backup-notification in home.component

* Fix git attrs file
2019-08-02 01:27:26 -02:30
Whymarrh Whitby
e9a63d5d5b
Default Privacy Mode to ON, allow force sharing address (#6904) 2019-08-01 10:54:33 -02:30
Dan J Miller
e9c7df28ed
Address book send plus contact list (#6914)
* Style Send Header

* Move Send to-row to send view and restyle

* Add "Recents" group to select recipient view

* Rename SendToRow to AddRecipient

* Basic UI and Layout

* New ENSInput component

* wip - fuzzy search for input

* small refactor

* Add Dialog

* contact list initial

* initial error on invalid address

* clean up edit

* Click to open modal

* Create AddToAddressBookModal component

* Modal styling and layout

* modal i18n

* Add to Addressbook

* ens wip

* ens wip

* ENS Resolution

* Reset input

* Send to explicit address

* Happy Path Complete

* Add back error checking

* Reset send-to when emptying input

* Add back warning object

* Fix linter

* Fix unit test #1 - fix import paths

* Remove dead tests

* One more to go

* Fix all unit tests

* add unit test for reducers and actions

* test rendering AddRecipient

* Add tests for dialog boxes in AddRecipient

* Add test for validating

* Fix linter

* Fix e2e tests

* Token send e2e fix

* Style View Contact

* Style edit-contact

* Fix e2e

* Fix from-import-beta-ui e2e spec

* Make section header say "add recipient” by default

* Auto-focus add recipient input

* Update placeholder text

* Update input title font size

* Auto advance to next step if user paste a valid address

* Ellipsify address when recipient is selected

* Fix app header background color on desktop

* Give each form row a margin of 16px

* Use .container/.component naming pattern for ens-input

* Auto-focus on input when add to addressbook modal is opened; Save on Enter

* Fix and add unit test

* Fix selectors name in e2e tests

* Correct e2e test token amount for address-book-send changes

* Adds e2e test for editing a transaction

* Delete test/integration/lib/send-new-ui.js

* Add tests for amount max button and high value error on send screen to test/e2e/metamask-ui.spec.js

* lint and revert to address as object keys

* add chainId based on current network to address book entry

* fix test

* only display contacts for the current network

* Improve ENS message when not found on current network

* Add error to indicate when network does not support ENS

* bump gaba

* address book, resolve comments

* Move contact-list to its own component

* De-duplicate getaddressbook selector and refactor name selection logic in contact-list-tab/

* Use contact-list component in contact-list-tab.component (i.e. in settings)

* Improve/fix settings headers for popup and browser views

* Lint fixes related to address book updates

* Add 'My accounts' page to settings address book

* Update add new contact button in settings to match floating circular design

* Improve styles of view contact page

* Improve styles and labels of the add-contact.component

* Further lint fixes related to address book updates

* Update unit tests as per address book updates

* Ensure that contact list groups are sorted alphabetically

* Refactor settings component to use a container for connection to redux; allow display of addressbook name in settings header

* Decouple ens-input.component from send context

* Add ens resolution to add contact screen in settings

* Switching networks when an ens address is shown on send form removes the ens address.

* Resolve send screen search for ensAddress to matching address book entry if it exists

* Show resolved ens icon and address if exists (settings: add-contact.component)

* Make the displayed and copied address in view-contact.component the checksummed address

* Default alias state prop in AddToAddressBookModal to empty string

* Use keyCode to detect enter key in AddToAddressBookModal

* Ensure add-contact component properly updates after QR code detection

* Fix display of all recents after clicking 'Load More' in contact list

* Fix send screen contact searching after network switching

* Code cleanup related to address book changes

* Update unit tests for address book changes

* Update ENS name not found on network message

* Add ens registration error message

* Cancel on edit mode takes user back to view screen

* Adds support for memo to settings contact list view and edit screens

* Modify designs of edit and view contact in popup environment

* Update settings content list UX to show split columns in fullscreen and proper internal navigation

* Correct background address book API usages in UI
2019-07-31 17:26:44 -02:30
Mark Stacey
1fd3dc9ecf
Switch from npm to yarn (#6843)
As a solution to the constant lockfile churn issues we've had with
`npm`, the project now uses `yarn` to manage dependencies.

The `package-lock.json` file has been replaced with `yarn.lock`, which
was created using `yarn import`. It should approximate the contents of
`package-lock.json` fairly well, though there may be some changes due to
deduplication. The codeowners file has been updated to reference this
new lockfile.

All documentation and npm scripts have been updated to reference `yarn`
rather than `npm`. Note that running scripts using `npm run` still works
fine, but it seemed better to switch those to `yarn` as well to avoid
confusion.

The `npm-audit` Bash script has been replaced with `yarn-audit`. The
output of `yarn audit` is a bit different than `npm audit` in that it
returns a bitmask to describe which severity issues were found. This
made it simpler to check the results directly from the Bash script, so
the associated `npm-audit-check.js` script was no longer required. The
output should be exactly the same, and the information is still sourced
from the same place (the npm registry).

The new `yarn-audit` script does have an external dependency: `jq`.
However, `jq` is already assumed to be present by another CI script, and
is present on all CI images we use. `jq` was not added to `package.json`
as a dependency because there is no official package on the npm
registry, just wrapper scripts. We don't need it anywhere exept on CI
anyway.

The section in `CONTRIBUTING` about how to develop inside the
`node_modules` folder was removed, as the advice was a bit dated, and
wasn't specific to this project anyway.
2019-07-30 15:36:23 -03:00
Alessandro Ricottone
e81aa6073d Resolve onion addresses (#6869)
* Resolve onion address
* npm i content-hash@latest
2019-07-23 16:59:20 -02:30
Whymarrh Whitby
2788a9463f Bump eth-sig-util to 2.3.0 (#6896)
* Bump eth-sig-util to 2.3.0

* Bump eth-keyring-controller to 4.x
2019-07-23 12:23:42 -07:00
Mark Stacey
0f8a9a5d49
Serve CSS as an external file (#6894)
The CSS is now served as an external file instead of being injected.
This was done to improve performance. Ideally we would come to a middle
ground between this and the former behaviour by injecting only the CSS
that was required for the initial page load, then lazily loading the
rest. However that change would be more complex. The hope was that
making all CSS external would at least be a slight improvement.

Performance metrics were collected before and after this change to
determine whether this change actually helped. The metrics collected
were the timing events provided by Chrome DevTools:

* DOM Content Loaded (DCL) [1]
* Load (L) [2]
* First Paint (FP) [3]
* First Contentful Paint (FCP) [3]
* First Meaningful Paint (FMP) [3]

Here are the results (units in milliseconds):

Injected CSS:

| Run | DCL | L | FP | FCP | FMP |
| :--- | ---: | ---: | ---: | ---: | ---: |
| 1 | 1569.45 | 1570.97 | 1700.36 | 1700.36 | 1700.36 |
| 2 | 1517.37 | 1518.84 | 1630.98 | 1630.98 | 1630.98 |
| 3 | 1603.71 | 1605.31 | 1712.56 | 1712.56 | 1712.56 |
| 4 | 1522.15 | 1523.72 | 1629.3 | 1629.3 | 1629.3 |
| **Min** | 1517.37 | 1518.84 | 1629.3 | 1629.3 | 1629.3 |
| **Max** | 1603.71 | 1605.31 | 1712.56 | 1712.56 | 1712.56 |
| **Mean** | 1553.17 | 1554.71 | 1668.3 | 1668.3 | 1668.3 |
| **Std. dev.** | 33.41 | 33.43 | 38.16 | 38.16 | 38.16 |

External CSS:

| Run | DCL | L | FP | FCP | FMP |
| :--- | ---: | ---: | ---: | ---: | ---: |
| 1 | 1595.4 | 1598.91 | 284.97 | 1712.86 | 1712.86 |
| 2 | 1537.55 | 1538.99 | 199.38 | 1633.5 | 1633.5 |
| 3 | 1571.28 | 1572.74 | 268.65 | 1677.03 | 1677.03 |
| 4 | 1510.98 | 1512.33 | 206.72 | 1607.03 | 1607.03 |
| **Min** | 1510.98 | 1512.33 | 199.38 | 1607.03 | 1607.03 |
| **Max** | 1595.4 | 1598.91 | 284.97 | 1712.86 | 1712.86 |
| **Mean** | 1553.8025 | 1555.7425 | 239.93 | 1657.605 | 1657.605 |
| **Std. dev.** | 29.5375 | 30.0825 | 36.88 | 37.34 | 37.34 |

Unfortunately, using an external CSS file made no discernible improvement
to the overall page load time. DCM and L were practically identical, and
FCP and FMP were marginally better (well within error margins).

However, the first paint time was _dramatically_ improved. This change
seems worthwhile for the first paint time improvement alone. It also
allows us to delete some code and remove a dependency.

The old `css.js` module included two third-party CSS files as well, so
those have been imported into the main Sass file. This was easier than
bundling them in the gulpfile.

The resulting CSS bundle needs to be served from the root because we're
using a few `@include` rules that make this assumption. We could move
this under `/css/` if desired, but we'd need to update each of these
`@include` rules.

Relates to #6646

[1]: https://developer.mozilla.org/en-US/docs/Web/Events/DOMContentLoaded
[2]: https://developer.mozilla.org/en-US/docs/Web/Events/load
[3]: https://developers.google.com/web/fundamentals/performance/user-centric-performance-metrics
2019-07-23 14:10:13 -03:00
Mark Stacey
2a7278eb7e
Remove Babel transformations for older browser versions (#6812)
The Babel config had previously supported all browsers with greater than
0.25% global usage (according to `browserlist`). This resulted in
`babel-preset-env` including plugins sufficient to support the following
minimum browser versions:

```
{
  "chrome": "49",
  "android": "4.4",
  "edge": "16",
  "firefox": "52",
  "ios": "9.3",
  "safari": "11"
}
```

Instead, the babel config now explicitly supports chrome >= 58 and
firefox >= 53. Chrome and Firefox are the only browsers we currently
publish to, and these were the minimum versions with no additional Babel
transformations.

The minimum browser versions we support should be re-evaluated later,
when we have added tests and documentation.

The plugin 'transform-async-to-generator' has also been removed. It was
used to translate async/await, but our browser targets all support
async/await.

Removing some of these transformations exposed bugs in `uglify-es` that
only presented themselves in the production build. `gulp-uglify-es` has
been updated to a version that uses `terser` instead of `uglify-es`,
which has resolved these issues.

Relates to #6805
2019-07-18 18:17:20 -03:00
Mark Stacey
32fffe53f5
Remove Drizzle tests (#6855)
The Drizzle tests have not been used for some time. They were used to
ensure compatibility with newer versions of `web3` v1. If we want to
re-add tests to ensure compatibility with newer `web3` versions, we
should find some way of doing that more reliably than was done here -
these tests were somewhat flaky and unreliable.
2019-07-15 17:10:46 -03:00
Mark Stacey
04ae92a2c0
Lint .json files (#6852)
We've been using the `eslint-plugin-json` plugin for some time, but we
haven't been visiting `.json` files in the lint script. The lint script
has now been updated to incude `.json` files, which means any invalid
JSON will result in a lint error.

Unfortunately this JSON plugin doesn't seem to apply the other eslint
rules (such as `key-spacing`) to the JSON files. I wasn't able to find a
way to get that to work. Instead I manually auto-formatted each of the
locale `message.json` files, which fixed many whitespace
inconsistencies.

The `states.json` file was deleted completely, as it appears to be
unused. It wasn't a valid JSON file anyway, it was JavaScript. It looks
like a `states.js` file is automatically generated, but an old copy was
accidentally saved as `states.json` and included in the repo.

Many duplicate key errors were found and fixed in the
`development/states/` JSON files.

`package-lock.json` was added to `.eslintignore` because it was very
slow to lint, and linting it doesn't provide much value.
2019-07-15 11:03:22 -03:00
Mark Stacey
270d1d0fa9
Add eslint dependency (#6842)
We had forgotten to add `eslint` as a dependency, even though we use it
directly. It had always worked because we have dependencies that also
depend upon it.

`eslint` has also been updated to v6, which necessitated two minor
changes.
2019-07-15 10:15:49 -03:00
Erik Marks
9be7fd39ba Sync lockfile (#6833) 2019-07-12 15:22:27 -02:30
Mark Stacey
ea7ba5dd5f
Remove unused AppVeyor configuration (#6840)
The AppVeyor configuration appears to be unused - this project is not
connected to AppVeyor.

After deleting the AppVeyor config, the JSDoc config was the last thing
in the `development/tools` directory. That felt a little silly, so I
moved it up to `development`.
2019-07-12 12:42:36 -03:00
Whymarrh Whitby
830c801ec3
Add React and Redux DevTools (#6793)
* Add React and Redux DevTools

* Conditionally load react-devtools

* Add start:dev npm script to run the app with devtools

Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
2019-07-11 12:27:06 -02:30
Whymarrh Whitby
caa40912ac
Replace deprecated shell-parallel with concurrently (#6807)
* Replace shell-parallel with concurrently

* Update ganache-cli
2019-07-09 14:09:31 -02:30
Whymarrh Whitby
b7f3f26ebf
Remove job-screens CI job (#6823)
* Remove job-screens CI job
* Remove unused dependencies, now that job-screens is gone
2019-07-08 17:02:15 -02:30
Mark Stacey
6df65069a2
Replace react-addons-css-transition-group (#6816)
This package is deprecated, and is incompatible with React v16. It has
been replaced by `react-test-renderer`, which has a drop-in replacement
for `react-addons-css-transition-group`.

Strangely, `react-test-renderer` was already listed as a dependency
despite not being used. I had to downgrade it, as the version already
listed was for React v16, and we're still using React v15.
2019-07-08 10:12:00 -03:00
Mark Stacey
47544110a2
Remove unused babel-polyfill dependency (#6814)
The lockfile hasn't changed because this package is a dependency of
`fetch-mock`.
2019-07-05 18:57:19 -03:00
Mark Stacey
7f7517b9e6
Remove unused Babel transformations (#6811)
The `stage-0` Babel preset has been replaced with the specific Babel
plugins that we depend upon. We don't use most of `stage-0`, so this
allowed us to remove many unnecessary transformations. We had to remove
this preset soon anyway, because all of the stage presets are
deprecated in Babel 7.

The `stage-0` preset consisted of these plugins:
```
"transform-do-expressions"
"transform-function-bind"
"transform-class-constructor-call"
"transform-export-extensions"
"transform-class-properties"
"transform-decorators"
"syntax-dynamic-import"
"syntax-trailing-function-commas"
"transform-async-generator-functions"
"transform-async-to-generator"
"transform-exponentiation-operator"
"transform-object-rest-spread"
```

Of that list, only 'transform-class-properties', 'transform-object-
rest-spread', and 'transform-async-to-generator' were being used.
2019-07-05 16:08:11 -03:00
Mark Stacey
7a5d0f7e7f
Remove unused gulp-uglify dependency (#6810)
The switch was made to `gulp-uglify-es` some time ago, but `gulp-uglify`
was never removed.
2019-07-05 15:30:08 -03:00
Mark Stacey
c7608e6fe9
Remove disc (#6801)
The `disc` gulp command no longer works. I wasn't able to fix this
easily, so instead it has been removed. We can probably find something
better to replace it with.
2019-07-04 11:54:10 -03:00
Mark Stacey
714cf72fc3
Omit integration tests from default test script (#6803)
The integration tests are slow, and rather inconvenient to run in
development on a regular basis (they break if you move the mouse). They
have been removed from the `test` script, to make running `test`
frequently during development less painful.
2019-07-04 11:50:24 -03:00
Whymarrh Whitby
5737df249d
Move e2e tests out of beta dir (#6785) 2019-07-02 23:19:59 -02:30
Whymarrh Whitby
8b5ef5b45e
Update eth-contract-metadata to use published registry version (#6784) 2019-07-02 22:48:23 -02:30
Mark Stacey
865321d269
Update asmcrypto.js to latest version (#6767)
This silences a warning message that was printed to the console whenever
this module was loaded during tests.

The API changes between these two versions were reviewed carefully for
differences. The only difference made was to `PBKDF2_HMAC_SHA256.bytes`,
which was replaced by `Pbkdf2HmacSha256`.

The length argument no longer has a default value, so it has been set
to match what the default value was in the previous version we used,
which is 32 (the SHA256 hash size).
2019-07-02 22:16:20 -03:00
Mark Stacey
9fd8a3d46e
Move Browserify transforms to gulpfile (#6768)
The flat tests also rely upon these transformations, yet invoke
browserify from the command line rather than using the gulpfile. The
transformations have been specified on the command line for those
instead.

Of course it's not ideal to have the same transformations listed in two
different places, but the plan is to delete the flat tests soon anyway,
so this should suffice until then.

Closes #4538
2019-07-01 21:26:24 -03:00
Mark Stacey
b9f69b535f
Generate complete source maps (#6756)
The source maps generated previously were mapping the bundled files to
the post-Babel files - they weren't showing mapping to the source files
as written.

It looks like this was a result of `reactify` being used in addition to
babel - that transformation must have dropped the source maps.

`reactify` still needs to be listed as a dependency because it is
an unlisted requirement of the `boron` package, which we use. We don't
need to use it to create our bundles though, as Babel already performs
the transformations we need.
2019-06-27 11:28:29 -03:00
Whymarrh Whitby
a6246f38f5
Merge pull request #6736 from whymarrh/unused-deps
Remove unused dependencies
2019-06-24 18:09:36 -02:30
Mark Stacey
225eaa65cc Fix 'watch' npm script
The `watch` npm script did not work - it must have gone unused for some
time. The following changes were required for it to work:
* Use the `--watch` flag, rather than the `watch` command (which appears
to not exist)
* Set the `METAMASK_ENV` environment variable to "test"
* Include the tests in the `ui` directory
* require the `test/setup.js` file before running the tests

The reporter was also changed to `min`, which is generally recommended
for use with the `--watch` flag.
2019-06-24 17:11:50 -03:00
Whymarrh Whitby
487508276e Uninstall unused jshint-stylish 2019-06-20 21:28:01 -02:30
Whymarrh Whitby
13c40eb1eb Uninstall unused prompt 2019-06-20 21:28:01 -02:30
Whymarrh Whitby
8039c8edc9 Sort deps correctly 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
1994f33913 Uninstall unused react-addons-test-utils & react-testutils-additions 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
7acc6d991c Uninstall unused sandwich-expando, semaphore, semver, & shallow-copy 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
579f491e55 Uninstall unused react-markdown dependency 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
7574f3df1e Uninstall unused pumpify 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
35e2b7a1de Uninstall unused pojo-migrator 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
5236fb733e Uninstall unused multiplex 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
1866f4b4af Uninstall unused fast-levenshtein 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
4d4ce8a2a5 Uninstall unused lodash.uniqby 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
6c511f8fd0 Uninstall unused eth-hd-keyring 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
5821e8e16b Uninstall unused lodash.memoize 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
c8d3c39383 Uninstall unused hat 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
9c13d74e7e Uninstall unused identicon.js 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
77a515fbc4 Uninstall unused extension-link-enabler 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
d2711513c0 Uninstall unused eth-bin-to-ops 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
61d75bedea Uninstall unused ensnare 2019-06-20 21:27:47 -02:30
Whymarrh Whitby
748801f417 4byte fallback (#6551)
* Adds 4byte registry fallback to getMethodData() (#6435)

* Adds fetchWithCache to guard against unnecessary API calls

* Add custom fetch wrapper with abort on timeout

* Use opts and cacheRefreshTime in fetch-with-cache util

* Use custom fetch wrapper with timeout for fetch-with-cache

* Improve contract method data fetching (#6623)

* Remove async call from getTransactionActionKey()

* Stop blocking confirm screen rendering on method data loading, and base screen route on transactionCategory

* Remove use of withMethodData, fix use of knownMethodData, in relation to transaction-list-item.component

* Load data contract method data progressively, making it non-blocking; requires simplifying conf-tx-base lifecycle logic.

* Allow editing of gas price while loading on the confirm screen.

* Fix transactionAction component and its unit tests.

* Fix confirm transaction components for cases of route transitions within metamask.

* Only call toString on id if truthy in getNavigateTxData()

* Fix knownMethodData retrieval and data fetching from fourbyte
2019-06-18 09:47:14 -02:30
Thomas Huang
f897f414fe pin ethereumjs-tx (#6706) 2019-06-11 17:24:47 +02:00
Whymarrh Whitby
569a8e5945 Successful `npm audit' with all required pkgs 2019-06-06 13:33:38 -02:30
Whymarrh Whitby
a1848983f8 npm audit: Works with gaba but w/o ganache-core 2019-06-06 13:33:32 -02:30
Whymarrh Whitby
1ad52a878d npm audit: Break karma, 1 less low, 1 less high 2019-06-06 13:33:16 -02:30
Whymarrh Whitby
84a949b298 npm audit: Use eth-json-rpc-infura@3 2019-06-06 13:33:04 -02:30
Whymarrh Whitby
c36662f3b0 Move eth-json-rpc-middleware into prod dependencies 2019-06-06 13:32:47 -02:30
Whymarrh Whitby
13feeb25d5 Break Storybook-related pkgs to reduce listed vulnerabilities 2019-06-06 13:32:08 -02:30
Whymarrh Whitby
6239d189cb npm audit fix 2019-06-06 13:32:08 -02:30
Whymarrh Whitby
acfd438329 npm audit: Works with eth-trezor-keyring 2019-06-06 13:32:43 -02:30
Whymarrh Whitby
41ebc2e127 npm audit: Works with eth-ledger-bridge-keyring 2019-06-06 13:32:38 -02:30
Whymarrh Whitby
d52f319a32 npm audit: Works with eth-json-rpc-middleware 2019-06-06 13:32:34 -02:30
Whymarrh Whitby
3dd19bd834 npm audit: Works with eth-json-rpc-filters 2019-06-06 13:32:30 -02:30
Whymarrh Whitby
048ac8af10 npm audit: Works with eth-json-rpc-infura 2019-06-06 13:32:22 -02:30
Whymarrh Whitby
d961454949 Add ethereumjs-tx dependency back 2019-06-06 13:32:08 -02:30
Whymarrh Whitby
95be7d5def Successful `npm audit' run w/o some packages
The following packages have been removed as I work to figure out what is causing
npm audit to produce errors:

eth-json-rpc-filters
eth-json-rpc-infura
eth-json-rpc-middleware
eth-ledger-bridge-keyring
eth-trezor-keyring
ethereumjs-tx
gaba

These packages will slowly be added back in forthcoming commits.
2019-06-06 13:30:14 -02:30
Paul Bouchon
47024fd9a5
feature: integrate gaba/CurrencyRateController (#6570) 2019-05-31 18:14:22 -04:00
pldespaigne
9a658ee53d merge 2019-05-30 18:22:55 +02:00
pldespaigne
9b87aaae19 update package 2019-05-30 12:21:45 +02:00
Frankie
2b5c7b82a9
transactions/deps - use broken out nonce-tracker module (#6555) 2019-05-21 17:17:09 +02:00
bitpshr
77d3bc252d feature: integrate gaba/PhishingController 2019-05-08 17:56:52 -04:00
Chi Kei Chan
56ed189aeb
Auto logout after specific time (#6558)
* Add i18n strings

* Finish Auto timeout

* Fix linter

* Fix copies

* Add unit test to Advanced Tab component

* Add back actions and container

* Add basic test to ensure container completeness

* No zero, fix linters

* restrict negative in input
2019-05-08 11:57:21 -07:00
Thomas
d8a96e6898 Bump eth-json-rpc-filters and eth-contract-metadata 2019-05-08 09:20:53 -07:00
Chi Kei Chan
581128503c Allow dragging seed phrase during Confirm Seed Phrase (#6557)
* Add basic drag and drop functionality

* Refactor seed phrase data structure

* Insert to list when drop

* Save before refactor

* Finish DND

* Fix linter

* update package-lock.json

* Address styling feedbacks

* Add box shadow on hover

* Finish adding unit tests

* Remove describe.only
2019-05-07 12:33:26 -02:30
Dan J Miller
64ae8131de
Adds NPM scripts for running a dapp, and dapp + chain, locally. (#6565) 2019-05-06 12:01:34 -02:30
pldespaigne
8cb6bd34e0 update content-hash 2019-05-04 18:56:26 +02:00
kumavis
2845398c3d Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410)
* Ensure home screen does not render if there are unapproved txs (#6501)

* Ensure that the confirm screen renders before the home screen if there are unapproved txs.

* Only render confirm screen before home screen on mount.

* inpage - revert _metamask api to isEnabled isApproved isUnlocked
2019-05-03 13:32:05 -04:00
Dan J Miller
7d59e892e3 Update to eth-method-registry@1.2.0 (#6403) 2019-04-17 15:51:21 -02:30
Sneh Koul
fb22fb12ca Adds e2e test for most web3 methods that dapps use (#6160)
* schema added

* ui for the dapp added and schema.js changed according to the comments in PR

* added tests for all web3 methods

* Update run-all.sh

* Update web3.spec.js to work with new onboarding flow

* changes made according to the comments

* Create stand alone script for web3 e2e tests.

* Lint fixes for web3 e2e tests.
2019-04-16 15:29:11 -02:30
Esteban Mino
7c38ad9356 bump contract metadata 2019-04-12 12:26:39 -04:00
Esteban Miño
55cb4bf907
pin eth-contract-metadata to last commit hash (#6396) 2019-04-04 15:49:10 -03:00
pldespaigne
dc4c40414e issue#5742 2019-04-04 17:15:57 +02:00
Bruno Barbieri
fee0da1ca3
bump ledger and trezor keyring (#6395) 2019-04-03 16:05:52 -04:00
Whymarrh Whitby
7fc84f3cc0 ci: Add build:test Gulp task for e2e build 2019-03-29 11:13:39 -02:30
Dan Miller
a44f2bb6eb Use webRequest to cancel all requests to infura in e2e tests. 2019-03-28 16:20:11 -02:30
Whymarrh Whitby
a702ade3fe Bump gaba version to avoid broken eth-contract-metadata 2019-03-20 17:01:15 -02:30
Dan Finlay
823007121d Add rollback script, move auto-changelog script (#6252) 2019-03-20 09:48:50 -02:30
kumavis
e072a3d993 build - babel - move config to babelrc (#6284) 2019-03-12 13:25:28 -02:30
kumavis
48047f8194 mascara - remove from project (#6283) 2019-03-12 11:17:21 -02:30
Whymarrh Whitby
0c52199007 npm i -D ganache-core@2.5.3 2019-03-12 09:59:27 -02:30
Paul Bouchon
daae155ce2 GABA: Integrate AddressBookController (#5847)
* gaba: integrate AddressBookController

* pin gaba version and update lockfile
2019-03-11 18:40:41 -10:00
Bruno Barbieri
82713983e3 bump trezor-connect to v7 (#6224) 2019-03-04 10:17:44 -08:00
kumavis
fc1655eecb
Merge pull request #6190 from whymarrh/tmp.RvdXXs4i
Remove public property from package.json file
2019-02-26 21:41:15 +08:00
Dan Finlay
f507f2a927 Feature Flag + Mobile Sync (#5955) 2019-02-25 15:40:13 -03:30
Whymarrh Whitby
dc007178e3 Remove public property from package.json file
As per the package.json documentation [1] setting `"private": true` in the
package.json file is enough for npm to refuse to publish it. The docs don't
specify that a `public` key is respected.

  [1]:https://docs.npmjs.com/files/package.json#private
2019-02-20 14:30:08 -03:30
Whymarrh Whitby
38bb1d3979 Remove unused CI jobs, rename e2e beta jobs 2019-02-20 14:20:39 -03:30
Jonathan Smirnoff
8dddf48904 Fixed issue #5838 (#6001)
Update changelog file
2019-02-13 10:30:46 -10:00
Bruno Barbieri
2cfea0b788 fix asset detection (#6049) 2019-01-22 10:23:11 -08:00
Alexander Tseung
435fdae84a
Fix displayed time and date in the activity log. Remove vreme library, add luxon library. (#5932) 2018-12-13 12:48:15 -08:00
Dan Finlay
0d8fa9290c Bump json-rpc-engine to v4.0.0 2018-12-10 10:47:36 -08:00
Whymarrh Whitby
d7c8a3048f Deduplicate package.json file
From `npm install`:

> npm WARN The package css-loader is included as both a dev and production dependency.
> npm WARN The package eslint-plugin-react is included as both a dev and production dependency.
> npm WARN The package file-loader is included as both a dev and production dependency.
> npm WARN The package gulp is included as both a dev and production dependency.

It's also worth noting that the Gulp version we were using was inconsistent and there is
a published v4 release on GitHub.
2018-12-06 12:40:57 -03:30
Whymarrh Whitby
ac6b0bd31c Update ganache-core to mitigate vuln
=== npm audit security report ===

> # Run  npm install --save-dev ganache-core@2.3.1  to resolve 1 vulnerability
┌───────────────┬──────────────────────────────────────────────────────────────┐
│ Moderate      │ Memory Exposure                                              │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ Package       │ bl                                                           │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ Dependency of │ ganache-core [dev]                                           │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ Path          │ ganache-core > level-sublevel > levelup > bl                 │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ More info     │ https://nodesecurity.io/advisories/596                       │
└───────────────┴──────────────────────────────────────────────────────────────┘
2018-12-06 12:40:57 -03:30
Whymarrh Whitby
855c8b209c npm uninstall open 2018-12-06 12:40:57 -03:30
Whymarrh Whitby
b6789a6e2f Remove beefy dependency and its usages
Refs #4768
Refs #5389

This changeset removes the beefy package that:

1. Was last published 2 yrs ago
2. Brought with it 1 moderate and 1 critical vulnerability
3. Was only used in scripts that no longer work
2018-12-06 12:40:57 -03:30
Whymarrh Whitby
c804185081 circleci: Replace nsp with npm audit
Refs #4751
2018-12-06 12:40:57 -03:30
Whymarrh Whitby
c7f46f77ca npm audit fix 2018-12-06 11:46:05 -03:30
Dan Miller
0ba6f7d9bb Adds not yet functional gas price chart. 2018-12-04 00:06:05 -03:30
Dan Finlay
486f9931c4 Pin two module versions to avoid flatmap-stream hack (#5839)
The flatmap-stream module was compromised. MetaMask was NOT affected,
but two of our dependencies could include it if they updated, so I am
temporarily pinning those versions until they can be updated
consciously.

Related to
https://github.com/dominictarr/event-stream/issues/116
2018-11-26 12:35:18 -10:00
Bruno Barbieri
ae8626eceb
Merge pull request #5797 from MetaMask/trezor-v6
Add Firefox and Brave support for Trezor
2018-11-21 14:45:55 -05:00
brunobar79
b4d48ea3fc bump eth-trezor-keyring 2018-11-21 13:11:24 -05:00
brunobar79
738ed90640 update package-lock.json 2018-11-20 21:16:03 -05:00
brunobar79
7fb9f91d27 trezor v6 2018-11-20 19:12:11 -05:00
brunobar79
9b1df386de fix merge conflicts 2018-11-20 17:44:28 -05:00
Dan Finlay
5956f8d260 Version 5.0.3 (#5785)
* Version 5.0.3

Includes a fix to the `version:bump` script that now correctly updates
the changelog header.

* Include inpage provider events
2018-11-20 08:34:14 -10:00
Frankie
ce147bf6d8 Tx controller now uses safe event emitter (#5769)
* transactions - use safe-event-emitter over events

* tests - pass a platform object on init with a noop showTransactionNotification

* test - fix for tx-state-history-helper trying to reduce an empty array

* deps - safe-event-emitter

* lint
2018-11-16 10:34:08 -08:00
Esteban MIno
6dce32fc1e provide automatic changelog since last tag for linux 2018-11-15 10:12:11 -08:00
Bruno Barbieri
592e6bddfb Update npm dependencies to reduce vulnerabilities (#5556) 2018-11-15 13:32:28 -03:30
brunobar79
c651212025 fix merge conflicts 2018-11-06 20:21:19 -05:00
kumavis
ccbc233282 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-29 20:25:05 -04:00
kumavis
1bb4a8428c
Merge pull request #5596 from MetaMask/validateSignTypedData
Validate signTypedData signer/address in eth-json-rpc-middleware
2018-10-29 20:11:04 -04:00
kumavis
715c309d68 deps - bump eth-json-rpc-middleware for signTypedData version bump 2018-10-29 19:20:35 -04:00
kumavis
231dabb94a deps - bump eth-block-tracker for fix (#5614) 2018-10-26 08:18:26 +02:00
brunobar79
9c1b2108f6 fix merge conflicts 2018-10-21 01:59:53 -04:00
kumavis
f0602ca354 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-20 23:51:00 -04:00
kumavis
539597cb13 deps - fix gulp ref to gulp#v4.0.0 2018-10-20 04:01:50 -04:00
kumavis
73ec4e66cb sentry - include app state in ui errors 2018-10-20 03:14:59 -04:00
kumavis
e3fda83ab2 sentry - replace raven-js with sentry/browser 2018-10-20 02:22:50 -04:00
kumavis
0b12c4efb1 deps - bump eth-json-rpc-middleware for bugfix 2018-10-19 05:18:47 -04:00
kumavis
fb1b8d42ac sentry - update raven-js 2018-10-19 04:40:23 -04:00
brunobar79
13820b6cc1 fix conflicts 2018-10-16 14:01:54 -04:00
kumavis
febf214ee8 deps - bump eth-token-tracker for ethjs-rpc bug in deps 2018-10-14 23:00:13 -04:00
kumavis
5504c8b965 deps - bump eth-json-rpc-middleware for pending blockRef bugfix 2018-10-11 20:10:36 -07:00
Thomas Huang
b45479934d test - add actions unit tests (#5369)
* Actions.spec.js

* Error handling tests

* Lint
2018-10-10 10:32:26 -04:00
Bruno Barbieri
ccab4ee1a4 tests - integration - Add Drizzle tests (#5467)
* added drizzle app for testing

* working

* clean up

* clean up script

* make build step required

* add drizzle-tests to .eslintignore

* clean up drizzle run script

* lint

* use truffle unbox

* undo eslintignore changes

* revert change

* dont use global

* dont need this steps

* use the new account flow

* restore package-lock.json
2018-10-10 01:12:43 -04:00
brunobar79
3293911351 bump eth-json-rpc-middleware 2018-10-09 15:29:51 -07:00
kumavis
9bce0ae84d deps - bump inpage-provider for drizzle workaround 2018-10-08 14:37:52 -04:00
kumavis
a0700de62c deps - bump metamask-inpage-provider for bug fix 2018-10-08 13:23:58 -04:00
kumavis
fe82c4a9fb provider - network - restore block-ref-rewrite middleware references 2018-10-08 12:39:18 -04:00
kumavis
354f8c0d7d provider - enable subscription support (newHeads, logs) 2018-10-08 11:55:07 -04:00
kumavis
c500ef4a58 deps - bump eth-block-tracker for safe-event-emitter 2018-10-04 00:21:45 -04:00
kumavis
1b8326fd95 bugfix - bump provider for url auth support 2018-10-02 05:06:41 -04:00
Whymarrh Whitby
9b1dbb64a9 npm uninstall dot-only-hunter 2018-10-01 12:53:19 -02:30
Whymarrh Whitby
910f674535 Remove dot-only-hunter from test:unit script 2018-10-01 12:53:19 -02:30
Dan Finlay
bdc7116885
Merge pull request #5325 from sam-aldis/patch-1
Debounce was breaking in update
2018-09-30 13:32:51 -07:00
bitpshr
c068f55ee0 bugfix: bump version of inpage provider 2018-09-26 10:26:15 -07:00
kumavis
54de60ff84 deps - eth-block-tracker@4.0.2 for safe-eventemitter (#5363) 2018-09-25 21:59:45 -07:00
Paul Bouchon
88b5f82e13 Bugfix: Upgrade json-rpc-engine (#5348)
* Bugfix: bump version of json-rpc-engine

* Increase delay

* Update lockfile

* deps - json-rpc-engine@3.7.4
2018-09-25 21:16:01 -07:00
brunobar79
678d174e1e add mozilla lint job 2018-09-25 20:44:57 -04:00
Dan Finlay
4f135132d7 Add build step to mozilla-lint 2018-09-25 14:30:53 -07:00
Dan Finlay
32a40641eb Add mozilla linter to dist script instead of main test 2018-09-25 14:28:57 -07:00
Dan Finlay
4d9ca132a3 Add mozilla addon linter to test suite 2018-09-25 14:26:37 -07:00
UKJP Design
981b48c754
Debounce was breaking in update
As found in issue here: https://github.com/MetaMask/metamask-extension/issues/5064
Pinned the version at 1.1.0 until the new version with breaking changes can be intergrated.
2018-09-23 10:42:13 +01:00
bitpshr
36dd0354e7 Implement latest EIP-712 protocol 2018-09-13 15:40:57 -04:00
Dan Finlay
5a709306e4 Add jsdoc gh-pages script 2018-09-12 14:10:38 -07:00
Whymarrh Whitby
f157d5371a Add html reporter to test coverage output 2018-09-11 09:39:16 -07:00
Connor Christie
ee568d5f5a Upgrade obs-store and fix memory leaks 2018-09-09 19:33:51 -05:00
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
Dan J Miller
5b2864d070
Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0
Update enzyme to the latest version 🚀
2018-09-04 11:25:40 -02:30
Dan Finlay
45cbe6b5b3 Bump human-standard-token-abi version for DAI support 2018-08-30 12:31:24 -07:00
greenkeeper[bot]
012fb0e3e6 chore(package): update enzyme-adapter-react-15 to version 1.0.6 2018-08-25 00:55:45 +00:00
greenkeeper[bot]
41a13bb341 chore(package): update enzyme to version 3.4.4 2018-08-25 00:51:40 +00:00
Alexander Tseung
d1de5ae94f Add react-media package to prevent rendering wallet-view twice in the popup view 2018-08-23 16:44:43 -07:00
Antoine Nauleau
3854650546 Minimum Browsers Supported (#4873)
* Minimum supported browsers and version standard: add browsers and targets to .babelrc and package.json

* Regenerate package.json, fix issue with comma in merge

* Resolve merge conflicts

* Regenerate package-lock.json

* Revert to previous package-lock.json
2018-08-22 20:20:24 -02:30
brunobar79
055e0f8dac fix merge conflicts 2018-08-22 13:37:47 -04:00
Dan Finlay
babd59a2dc
Merge pull request #5109 from MetaMask/MoveOutInpageProvider
Move inpage-provider and port-stream outside
2018-08-21 14:38:47 -07:00
kumavis
13dfea7f2d bugfix - prevents old blocktracker from getting internal hooks migrated 2018-08-21 14:13:23 -07:00
brunobar79
ab7eb73ecc fix merge conflicts 2018-08-20 21:51:35 -04:00
Dan Finlay
6ce119d1fb Move inpage-provider and port-stream outside
With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream.

To reduce the size of its dependencies, I have moved the
[metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream).

This allows them to be more easily depended & iterated on by external
projects.
2018-08-20 15:45:50 -07:00
brunobar79
992e7f1b5a fix merge conflicts 2018-08-17 12:56:07 -04:00
brunobar79
e54b8507d2 use eth-ledger-bridge-keyring from npm 2018-08-14 23:02:01 -04:00
brunobar79
4e1d8ba19d good progress adding paths 2018-08-13 19:29:43 -04:00
brunobar79
77ad856730 remove ledger lib 2018-08-12 01:46:09 -04:00
brunobar79
0b9b892c6b this should be ready to go 2018-08-12 01:34:01 -04:00
brunobar79
5ef80495cf refactor to support multiple hw wallets 2018-08-10 21:54:34 -04:00
brunobar79
656afeefad fix merge conflicts 2018-08-08 15:40:04 -04:00
brunobar79
286bde606f fix merge conflicts 2018-08-08 14:30:49 -04:00
Paul Bouchon
8ac4b586eb
Update eth-keyring-controller and eth-hd-keyring versions (#4989) 2018-08-08 13:17:48 -04:00
bitpshr
365e349ec4 Reestablish old versions of eth-keyring-controller and eth-hd-keyring 2018-08-08 08:17:16 -04:00
brunobar79
2e0916d8ff fix merge conflicts 2018-08-08 02:32:35 -04:00
Whymarrh Whitby
46046c6915 Update chromedriver pkg 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
29488b2c53 Add static-server devDependency 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
6132238302 Remove superstatic package
Install and uninstalling superstatic doesn't work on Node 8 at the time of
writing:

    $ npm install -D superstatic@6
    npm ERR! code ENOTSUP
    npm ERR! notsup Unsupported engine for got@5.7.1: wanted: {"node":">=0.10.0 <7"} (current: {"node":"8.11.3","npm":"6.3.0"})
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Required: {"node":">=0.10.0 <7"}
    npm ERR! notsup Actual:   {"npm":"6.3.0","node":"8.11.3"}

This commit removes the package (using Node 6!) and it will have to be replaced.
2018-08-06 15:47:57 -02:30
brunobar79
710b4e294f added crossbrowser support and error handling 2018-07-31 18:30:56 -04:00
brunobar79
4de8f5b0d4 fix dependencies 2018-07-26 21:37:43 -04:00
brunobar79
69f4c8c336 fix merge conflicts 2018-07-26 21:04:03 -04:00
brunobar79
d4a15f22c2 added webrtc-adapter for browser compat 2018-07-26 21:00:48 -04:00
brunobar79
ea028e7506 fully working without tweaking ext. permission 2018-07-26 20:56:58 -04:00
brunobar79
6cd4bc9f4e working without permission issues 2018-07-26 20:24:39 -04:00
Antoine Nauleau
653e42cf79 Update Babel to Current Standard "babel-preset-env" (#4812)
* Update .babelrc and package.json to babel-preset-env standard

* Install babel-preset-env babel-stage-0

* Regenerate package-lock.json by running npm install --package-lock-only && npm audit fix

* Resolve PR #4812 merge conflicts

* Merge #4847 Solves previous cache issues with cirlce-ci
2018-07-24 15:21:32 -02:30
brunobar79
2e50348241 added instascan pkg 2018-07-23 17:11:51 -04:00
brunobar79
cde91fac16 added node version requirements 2018-07-21 12:43:35 -04:00
brunobar79
de21a49265 use latest keyring packages 2018-07-16 15:31:05 -04:00
brunobar79
5710e648bd remove account modal updated 2018-07-12 18:19:33 -04:00
brunobar79
4b528405ea catching up with develop 2018-07-12 13:19:51 -04:00
brunobar79
07d8bfaec5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-12 12:54:08 -04:00
brunobar79
89cc48789a update to temp dependencies 2018-07-11 20:01:44 -04:00
Alexander Tseung
7d691c7398 Fix existing unit tests 2018-07-07 18:53:00 -07:00
brunobar79
64e397a6f1 update package-lock.json 2018-07-06 20:04:31 -04:00
Alexander Tseung
9cde5ab11b Use eth-method-registry to get method data 2018-07-06 16:27:08 -07:00
Alexander Tseung
ea9d51e427 Refactor and redesign confirm transaction views 2018-07-06 16:27:08 -07:00
brunobar79
7c9d942ba1 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-06 19:21:18 -04:00
brunobar79
986bb74501 package.json updated and tests passing 2018-07-03 20:24:21 -04:00
brunobar79
d382f89989 tests are passing 2018-07-03 20:21:01 -04:00
brunobar79
595447ccac Merge remote-tracking branch 'upstream/develop' into HEAD 2018-07-03 14:21:17 -04:00
brunobar79
3290421e2f fix merge conflicts 2018-07-03 13:31:30 -04:00
kumavis
1f0cf11af1
Merge pull request #4712 from MetaMask/lint-fix
Lint - Lint all the things (without conflicts!)
2018-07-03 09:40:25 -07:00
brunobar79
cc11a62397 remove gulp eslint and cleanup gulpfile 2018-07-02 18:35:53 -04:00
Esteban MIno
4b45dd4ed0 point eth-contract-metadata to repo master 2018-07-02 18:29:22 -04:00
brunobar79
85fd75c21f update package-lock.json 2018-07-02 17:03:20 -04:00
brunobar79
9b0bc67066 fix merge conflicts 2018-07-02 15:29:26 -04:00
Bruno Barbieri
4c86f25f5b npm 6 fresh lock + node 8 (#4675)
* run npm install with npm 6 and node 8
* npm audit fix --force
* bump node version on circleci docker img
* bump lodash
2018-07-02 10:30:56 -07:00
brunobar79
66b3b72c98 use latest eth-keyring-controller 2018-07-01 12:00:04 -10:00
brunobar79
1494cc5e6c fix merge conflicts 2018-07-01 11:41:34 -10:00
Dan
f824a2982a Use supersonic instead of httpserver to serve local dapp (e2e beta tests) 2018-06-28 10:16:36 -02:30
Dan
c343a12543 Use locally served dapp to test contract calls in e2e beta tests 2018-06-27 11:08:15 -02:30
brunobar79
6e563acd93 use latest eth-trezor-keyring 2018-06-25 12:24:58 -10:00
brunobar79
87dfca0767 fixes 2018-06-23 02:52:11 -04:00
brunobar79
4381d3e71d point to new version of eth-trezor-keyring 2018-06-22 23:25:19 -04:00
kumavis
ac8b56a00d notices - notices collection is now manually edited 2018-06-13 22:56:46 -07:00
Bruno
bb4cc72646 fix merge conflicts 2018-06-13 02:01:47 -04:00
Bruno
fe3d81cfd8 upgrade eth-trezor-keyring 2018-06-13 01:44:53 -04:00
Bruno
8763ea898e move TrezorKeyring to its own package 2018-06-13 01:32:13 -04:00
Dan Finlay
9c77af1ce6
Add script for auto-re-running tests on change
`npm run watch:test:unit` will re-run the unit test suite whenever a
file in `app`, `ui`, or `test` changes.
2018-06-12 11:13:44 -07:00
Bruno
8c4d58aa45 initial trezor support 2018-06-10 03:52:32 -04:00
PhyrexTsai
f90d070190
Merge branch 'develop' into portal-metamask 2018-06-01 15:41:18 +08:00
Dan
5091b03e4b Merge branch 'develop' into i3725-refactor-send-component- 2018-05-31 15:28:03 -02:30
kumavis
b69da50095 deps - bump eth-keyring-controller for bugfix 2018-05-30 14:29:14 -07:00
kumavis
77c55ecd83
Merge pull request #4403 from MetaMask/bugfix-keyring-controller
deps - bump eth-keyring-controller + update package-lock
2018-05-29 22:31:58 -07:00
kumavis
4789e981c2
Merge pull request #4374 from MetaMask/test-unit-fail-on-only
test - unit - fail if tests contain a .only call
2018-05-29 21:40:28 -07:00
kumavis
d6965c7cdb deps - bump eth-keyring-controller + update package-lock 2018-05-29 17:38:00 -07:00
MikeCheng1208
695b157e7b Intergrate ENS with IPFS 2018-05-29 12:38:25 +08:00
kumavis
1cd4b03b37 test - unit - fail if tests contain a .only call 2018-05-25 12:58:16 -07:00
Whymarrh Whitby
715624227a Add basic e2e tests for the new UI 2018-05-24 23:23:42 -02:30
kumavis
8e672a82e2
Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0
Update ethjs to the latest version 🚀
2018-05-23 16:41:26 -07:00
Dan
440905125d Merge branch 'develop' into i3725-refactor-send-component- 2018-05-23 16:03:15 -02:30
kumavis
cee55b47d0
Merge pull request #4321 from MetaMask/testing
MM controller tests and reorganizing test files
2018-05-22 13:02:41 -07:00
kumavis
b5bbfd3264
Merge pull request #4308 from MetaMask/i4232-addtoken
Update designs for Add Token screen
2018-05-22 12:53:59 -07:00
kumavis
1fbf59cdd3 ci - screens - continue screenshots through account creation + export account 2018-05-22 01:56:52 -07:00
tmashuang
238f2eb179 Merge branch 'develop' into testing 2018-05-21 16:36:48 -07:00
tmashuang
848f8f805b Merge branch 'develop' into testing 2018-05-21 15:14:47 -07:00
kumavis
7a65c22a02
Merge branch 'develop' into ci-publish-release 2018-05-21 14:58:37 -07:00
tmashuang
58b9afff4f Merge branch 'develop' into testing 2018-05-21 14:57:57 -07:00
kumavis
d45fe6fc72 Merge branch 'develop' of https://github.com/Jabher/metamask-extension into Jabher-develop 2018-05-21 13:59:23 -07:00
kumavis
08d95bbafa
Merge pull request #4034 from whymarrh/account-nicknames
Move account names out of KeyringController
2018-05-21 13:44:07 -07:00
tmashuang
554a10f17e Merge branch 'develop' into testing 2018-05-21 13:05:24 -07:00
Alexander Tseung
4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
kumavis
59c9852999 ci - add docs publish to job-publish-release 2018-05-18 14:03:02 -07:00
Whymarrh Whitby
805c6158a4 Update eth-keyring-controller dependency 2018-05-17 12:57:39 -02:30
Thomas
5e80bc4cb9 Merge branch 'develop' into testing 2018-05-16 22:47:07 -07:00
Dan
759bc17388 Merge branch 'develop' into i3725-refactor-send-component- 2018-05-15 11:21:15 -02:30
Thomas
517be35ab6 Merge branch 'develop' into e2e-tests 2018-05-14 17:19:44 -07:00
Thomas
cd42d18203 Merge e2e tests into one 2018-05-14 17:17:36 -07:00
Whymarrh Whitby
b5a445139d Bail after the first e2e test failure
Where the tests are sequential, every test after the first failure is bound
for failure as well so we can bail after the first.
2018-05-14 13:55:33 -02:30
Dan
6bc8cc819a Merge branch 'develop' into i3725-refactor-send-component- 2018-05-14 11:44:50 -02:30
Alexander Tseung
2381c0e0f4 Add new unlock screen design 2018-05-11 12:49:17 -07:00
greenkeeper[bot]
f7205e5cc7 fix(package): update ethjs to version 0.4.0 2018-05-11 18:15:10 +00:00
Thomas
3632ea29cc Merge branch 'develop' into e2e-tests 2018-05-11 10:13:44 -07:00
Alexander Tseung
f98aec5f50 Update deep-extend and sshpk 2018-05-09 18:52:35 -07:00
Thomas
26c6bddebf Merge branch 'develop' into e2e-tests 2018-05-08 13:10:26 -07:00
jabher
28126f60f3 bump extensionizer version to 1.0.1 (see https://github.com/MetaMask/extensionizer/pull/4) 2018-05-08 16:47:18 +03:00
Thomas
8250fd9d6d Merge branch 'develop' into testing 2018-05-07 14:30:43 -07:00
Dan
7c49009854 Unit tests for containers, utils and selectors in send_/ 2018-05-05 11:58:14 -04:00
Thomas
f900821a42 Merge branch 'develop' into e2e-tests 2018-05-03 14:10:26 -07:00
Alexander Tseung
d5759cf4a8 Add storybook integration 2018-05-03 10:51:15 -07:00
Alexander Tseung
3b229775a8 Remove eth-block-tracker package 2018-05-02 14:06:34 -07:00
Alexander Tseung
3e4f158b34 Pin chromedriver version to 2.36.0 2018-05-02 13:10:21 -07:00
Alexander Tseung
65253e114f Adds nsp check to CircleCI tests 2018-05-02 12:01:03 -07:00
Alexander Tseung
2c95390229 Adds sass-loader and style-loader packages for storybook integration 2018-05-01 20:05:14 -07:00
Alexander Tseung
a70da53340 Adds path and resolve-url-loader packages for storybook integration 2018-05-01 19:32:20 -07:00
Alexander Tseung
4a54deadf9 Adds css-loader and file-loader needed for storybook integration 2018-05-01 14:28:33 -07:00
Thomas
9dfe4f410d Firefox 2018-05-01 12:18:22 -07:00
Frankie
9b1c07c750
Merge pull request #4111 from MetaMask/build-fix-sourcemaps
Build - fix sourcemaps
2018-04-30 10:44:38 -07:00
kumavis
f4fe3e81c1 development - add sourcemap debug tool 2018-04-27 18:17:21 -07:00
kumavis
5c9cb0b787 build - minify via gulp-uglify-es instead of uglifyify 2018-04-27 18:15:50 -07:00
kumavis
b487dab2e7 test - unit - use ganache instead of deprecated block-tracker test util 2018-04-27 17:11:44 -07:00
kumavis
1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -07:00
Dan Finlay
91161739a5 Move uglifyify to MetaMask org 2018-04-25 10:46:01 -07:00
Dan Finlay
0c5add59f7 Make minified builds more determinstic
May fix #3999, but will need to see if Mozilla can reproduce the build
with this updated repo.

Switches our `uglifyify` dependency from the production one
(under-maintained) to one that I've merged a critical patch into.

I'm open to discussion of how else we might approach this problem here.
Maybe we should use a different minification module entirely, remove
minification, or maybe refactor our build system!
2018-04-24 15:01:02 -07:00
Thomas
629457ea54 setupUntrustedCommunication and setupTrustedCommunication 2018-04-24 13:33:31 -07:00
Dan Finlay
f5f5100da7
Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0
Update ethjs-contract to the latest version 🚀
2018-04-23 17:06:46 -07:00
Dan Finlay
9ae2558d20
Merge pull request #3934 from MetaMask/node-engines
package.json - update engines field to require node v8.x.x
2018-04-23 16:42:39 -07:00
kumavis
c120fbdfb9 deps - bump sentry for more detailed fetch failure 2018-04-23 10:20:40 -07:00
greenkeeper[bot]
49e02baea0 fix(package): update ethjs-contract to version 0.2.0 2018-04-18 22:09:40 +00:00
frankiebee
e77dbaa0dc deps - update keyring controller and other eth-dependinces 2018-04-17 14:39:02 -07:00
Dan Finlay
6ee57dcad7
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-17 13:36:21 -07:00
Thomas Huang
7b70804aa0
Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage
Add JSDocs Page and Script
2018-04-17 10:01:09 -07:00
bitpshr
4780f825b1 Add ComposableObservableStore for subscription management 2018-04-13 10:20:44 -04:00
Dan Finlay
136caa2034 Add JSDocs Page and Script
Includes new script `npm run doc` for generating docs page.
2018-04-12 14:46:05 -07:00
kumavis
f15b81089e
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-10 02:13:05 -07:00
kumavis
df1f891585
Merge branch 'master' into i3621-LogoPerformance 2018-04-09 13:56:59 -07:00
kumavis
e201ebaf58
Merge pull request #3895 from MetaMask/greenkeeper/gulp-sass-4.0.0
Update gulp-sass to the latest version 🚀
2018-04-09 13:40:35 -07:00
kumavis
2a3e634ab9 package.json - update engines field to require node v8.x.x 2018-04-09 13:40:15 -07:00
kumavis
5d7f300af7
Merge pull request #3925 from MetaMask/greenkeeper/ethjs-0.3.4
Update ethjs to the latest version 🚀
2018-04-09 13:14:50 -07:00
Dan
2c4426e4de Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-09 16:52:26 -02:30
greenkeeper[bot]
743fb13472 fix(package): update ethjs to version 0.3.4 2018-04-06 23:04:44 +00:00
greenkeeper[bot]
2bfd3de52b fix(package): update gulp-sass to version 4.0.0 2018-04-05 15:51:26 +00:00
Alexander Tseung
34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -07:00
Dan Finlay
74049c19fc Internationalize currency
Fixes #3580
2018-04-03 13:58:26 -07:00
Dan Finlay
931ce12073 Improve fox logo performance
By including metamask-logo@2.1.4

Fixes #3621
2018-04-03 13:53:02 -07:00
kumavis
92dd2b3218 ci - job-publish - publish source+sourcemaps to sentry if new release 2018-04-03 12:36:46 -07:00
kumavis
00657e14a8 build - correctly set METAMASK_ENV via envify 2018-04-03 09:51:33 -07:00
Alexander Tseung
2e9273d2ac Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 01:03:51 -07:00
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -07:00
kumavis
655593ea62 Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf 2018-04-02 16:28:33 -07:00
kumavis
eb7bafc914 deps - update shell-parallel 2018-04-02 15:50:26 -07:00
kumavis
0ff4a1bece Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 15:04:48 -07:00
kumavis
2b6557a024 lint - lint json files in app/ 2018-04-02 14:47:47 -07:00
kumavis
98e0fc1ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 14:13:45 -07:00
kumavis
bd6f554766 build - use uglifyify and gulp-multi-process for better performance 2018-03-30 22:19:02 -07:00
Alexander Tseung
51ad2b03c8 Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-03-30 16:34:57 -07:00
Alexander Tseung
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
kumavis
e99a707e3d
Merge pull request #3808 from MetaMask/txMeta-origin
transactions - add origin to txMeta
2018-03-30 16:09:00 -07:00
frankiebee
5ec4286966 deps - bump proviedr-engine 2018-03-30 15:24:32 -07:00
kumavis
80839eebe4 build - properly set GULP_METAMASK_DEBUG on dev 2018-03-30 15:09:25 -07:00
kumavis
a3f7cd1cfc development - ci-screens - remove mocha wrapper that was losing exit code 2018-03-30 15:03:49 -07:00
kumavis
7dde948c45 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-03-30 13:57:50 -07:00
kumavis
a9391ea2ef ci - e2e+screens - add sleep to make sure ganache is ready 2018-03-30 13:50:19 -07:00
kumavis
2997067ca0 ci - e2e+screens - use shell-parallel to run ganache 2018-03-30 13:48:46 -07:00
Thomas
43c402227d Ganache:start script with seed phrase 2018-03-30 11:51:51 -07:00
kumavis
5945c8cf67 development - create selenium screen shotter 2018-03-30 00:09:39 -07:00
kumavis
8277c662de npm scripts - rewrite default scripts to new task names 2018-03-29 22:58:26 -07:00
kumavis
592c2e5948 test - add auto screen shotter 2018-03-29 17:02:40 -07:00
Alexander Tseung
ef61ef2ce8 Fix i18n merge conflicts 2018-03-29 09:37:29 -07:00
kumavis
e7f655ec6d npm scripts - simplify and speed up dist builds 2018-03-28 23:45:33 -07:00
kumavis
d2874cf89a deps - update package-lock 2018-03-28 23:12:41 -07:00
kumavis
c9a4792304 mascara - use sw-controller and other cleanups 2018-03-28 21:33:04 -07:00
kumavis
c171ea0632 deps - bump ethjs-query to fix unhandled promise rejections 2018-03-28 09:40:11 -07:00
kumavis
871edfe12a
Merge pull request #3713 from MetaMask/greenkeeper/eslint-plugin-mocha-5.0.0
Update eslint-plugin-mocha to the latest version 🚀
2018-03-27 19:25:51 -07:00
kumavis
4758a3ef22
Merge pull request #3652 from MetaMask/greenkeeper/sinon-5.0.0
Update sinon to the latest version 🚀
2018-03-27 19:22:59 -07:00
kumavis
9e1bdcb09d test - integration - add locale build step 2018-03-27 17:17:34 -07:00
kumavis
914a098c8a Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-27 14:28:37 -07:00
kumavis
5a309328f1 ci - run e2e jobs 2018-03-27 13:36:09 -07:00
Thomas Huang
8648aee907
Merge branch 'master' into selenium-e2e 2018-03-27 13:28:58 -07:00
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
Dan
4f0881e41b Merge branch 'master' into i18n-translator-redux 2018-03-26 16:13:49 -02:30
greenkeeper[bot]
cecc5c48a7 chore(package): update eslint-plugin-mocha to version 5.0.0 2018-03-24 13:20:46 +00:00
kumavis
079ba3e6ee sentry - npm scripts for uploading source maps 2018-03-23 18:39:10 -07:00
kumavis
e3d7062e9b sentry - rewrite report urls + use raven-js from npm 2018-03-23 17:22:44 -07:00
Dan
b9309f689b Use extension api to get initial locale. 2018-03-22 12:49:19 -02:30
Lazaridis
19621fe879 changes test to unit-integration-lint, closes #3650 2018-03-22 04:44:30 +02:00
Thomas
775275e138 Merge branch 'master' into selenium-e2e 2018-03-21 12:28:03 -07:00
Thomas
d646f37741 Merge branch 'master' into selenium-e2e 2018-03-21 12:25:41 -07:00
Thomas Huang
6a428bbef7
Revert "Issue 3505 | Transpile to ES5" 2018-03-21 12:22:15 -07:00
greenkeeper[bot]
9094af8319 chore(package): update sinon to version 5.0.0 2018-03-21 17:39:53 +00:00
kumavis
de5dee51b1
Merge pull request #3605 from lazaridiscom/master
use mkdirp for cross-platform, re #3426
2018-03-20 10:40:15 -07:00
Ryan Rowland
faa2849082 Issue 3505 | Transpile to ES5 2018-03-19 23:11:48 -07:00
Lazaridis
7f00fdcd14 use mkdirp for cross-platform, re #3426 2018-03-18 12:15:29 +02:00
Thomas
6306c7b190 Merge branch 'master' into selenium-e2e 2018-03-14 13:29:47 -07:00
kumavis
e48934dc04 Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead 2018-03-13 14:49:26 -07:00
Lazaridis
af4116cf39 use 'cross-env' for env-variables within npm scripts, re #3426 2018-03-13 11:31:11 -07:00
Vincent
0e28e8fa3d Moved mock-dev.js and ui-dev.js to development folder. 2018-03-14 00:15:19 +11:00
Thomas
a3af225e49 Merge branch 'master' into selenium-e2e 2018-03-09 23:58:56 -08:00
kumavis
ddc85354d3
Merge pull request #3501 from MetaMask/circleci-2.0
ci - introduce circle ci 2.0
2018-03-09 16:07:28 -08:00
Thomas
d5b1d6182b Merge branch 'master' into selenium-e2e 2018-03-09 15:01:48 -08:00
kumavis
3580196650 test - breakout npm script for building for integration tests 2018-03-09 13:48:48 -08:00
greenkeeper[bot]
ce139db99b chore(package): update gulp-stylelint to version 7.0.0 2018-03-09 11:57:55 -08:00
greenkeeper[bot]
16050f4aeb chore(package): update stylelint-config-standard to version 18.2.0 2018-03-09 11:57:26 -08:00
greenkeeper[bot]
c05b220024 fix(package): update gulp-autoprefixer to version 5.0.0 2018-03-09 11:56:52 -08:00
kumavis
85d48b4fb7 deps - remove unused missippi dep 2018-03-09 11:53:59 -08:00
greenkeeper[bot]
c4f697d87f chore(package): update browserify to version 16.1.1
Closes #2861
2018-03-09 11:51:10 -08:00
kumavis
b4a686a5c6 deps - bump pump 2018-03-09 11:51:03 -08:00
Dan Finlay
d0ba2d2d94 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-07 13:39:44 -08:00
Thomas Huang
a74439a1a7
Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0
Update karma to the latest version 🚀
2018-03-07 13:50:41 -05:00
kumavis
8a444ec96f
Merge pull request #3259 from MetaMask/controllerStubs
Offline testing
2018-03-06 17:21:36 -08:00
Dan Finlay
423f084cb4 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-06 14:59:09 -08:00
Dan Finlay
dd9cac69ae
Merge pull request #3309 from scsaba/edge-support
Add Edge Support
2018-03-06 09:39:57 -08:00
Csaba Solya
d8038c0de0 add browserify-unibabel to package.json 2018-03-06 09:23:43 +01:00
Dan Finlay
bf17d7e115 Add version bumping script
One step towards automating our deploy process is automating our version
bumping scheme. This PR does that.
2018-03-02 13:55:56 -08:00
Dan Finlay
81fa0742f7 Fix inpage provider name regression
Fixes #3372 by not minifying the name of our inpage provider, which some
people were using to identify MetaMask (not our preferred, supported
method of web3.currentProvider.isMetaMask).
2018-03-02 10:32:53 -08:00
Frankie
2b8cfcb73c
Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0
Update metamascara to the latest version 🚀
2018-02-27 11:31:17 -08:00
Csaba S
2f34630486
Merge branch 'master' into edge-support 2018-02-22 14:55:46 +01:00
Csaba Solya
5ec311ba3e add edge support 2018-02-22 14:39:32 +01:00
Thomas Huang
33182efb13 Offline testing 2018-02-15 08:34:31 -08:00
Dan Finlay
e422294ad1 Add node-sass to dev dependencies
To fix build
2018-02-13 11:35:30 -08:00
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00
Dan J Miller
78bce55858 [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)
* Use tooltip for display of helper text in wallet views copy to clipboard feature.

* Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change.

* Remove unnecessary tabIndex attribute from wallet view address element.
2018-01-31 16:27:35 -08:00
Thomas
a193ba60c6 Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to deps 2018-01-30 13:34:21 -08:00
Alexander Tseung
ecc39c5a7a Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 2018-01-29 18:22:52 -08:00
Thomas Huang
b991ac0422
Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0
Update gulp-watch to the latest version 🚀
2018-01-29 10:09:51 -08:00
Thomas Huang
ea68a5d22a
Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0
Update mocha to the latest version 🚀
2018-01-29 10:04:41 -08:00
Thomas Huang
5b24ef023a
Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0
Update testem to the latest version 🚀
2018-01-29 09:56:57 -08:00
Dan Finlay
ceebc6caa4 Debounce storage to avoid crashing pump 2018-01-25 13:01:03 -08:00
kumavis
fe6b11eb50 deps - bump eth-json-rpc-infura for kovan fix 2018-01-25 11:03:50 -08:00
greenkeeper[bot]
145db2906d chore(package): update testem to version 2.0.0 2018-01-24 20:15:48 +00:00
Thomas
97ca86733c Merge branch 'master' into uat 2018-01-23 01:12:50 -08:00
Thomas
baba179ccb Remove duplicate eth-contract-metadata 2018-01-22 16:08:00 -08:00
Kevin Serrano
0373a3840b
Merge pull request #3047 from MetaMask/fix-provider-json-parse
Fix providers retry logic and retries expired error messages
2018-01-22 15:12:56 -08:00
kumavis
2b7542054e deps - bump json rpc engine for bugfix 2018-01-22 12:52:15 -08:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
kumavis
4670aad291 deps - bump provider engine and infura-middleware for better retry and error messages 2018-01-19 14:07:38 -08:00
kumavis
02df9a6bd1 deps - bump providers for better JSON parse error messages 2018-01-19 12:16:53 -08:00
Dan Finlay
98b5a62fa7
Merge pull request #3023 from MetaMask/build-lock-gulp
build - lock pre-release gulp dep to commit
2018-01-18 13:12:41 -08:00
kumavis
9f3183ccf3 deps - bump infura provider for uri length limit fix 2018-01-18 11:51:39 -08:00
Thomas Huang
e561740133
Merge branch 'master' into build-lock-gulp 2018-01-18 10:13:31 -08:00
Thomas
0db4ba1086 chromedriver, changed extension id(might need zip/crx file) 2018-01-18 08:10:53 -08:00
Thomas
d317f7aaab Update 2018-01-18 07:43:42 -08:00
kumavis
ab3423d00d deps - re-add eth-block-tracker 2018-01-17 22:07:08 -08:00
kumavis
899e839e7c test - createTestProviderTools includes block tracker layer 2018-01-17 21:43:34 -08:00
kumavis
b70d3a9b6e deps - bump json-rpc-engine for better errors 2018-01-17 20:02:43 -08:00
greenkeeper[bot]
899ddf0179 chore(package): update mocha to version 5.0.0 2018-01-18 02:21:45 +00:00
kumavis
29a6da0d01 build - lock pre-release gulp dep to commit 2018-01-17 17:50:55 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Dan J Miller
77eb7b2db6 [NewUI-flat] Fix gulp build (#2975)
* Only run uglify when building for prod; set environment when building for prod; use gulp-uglify-es.

* Revert change of dist script.
2018-01-15 19:00:07 -08:00
Dan Finlay
5fb2cfed6a
Merge branch 'master' into i2826-SignBytes 2018-01-15 14:20:50 -08:00
Dan Finlay
93d4b22363 Bump keyringController version 2018-01-15 14:11:59 -08:00
kumavis
bfa10e29a1
Merge pull request #2900 from MetaMask/infura-rest-api
Provider - Use Infura rest api for infura networks
2018-01-15 12:13:59 -08:00
Dan Finlay
6df3261deb Fix signTypedData bytes signing
Fixes #2826
2018-01-13 13:39:21 -08:00
Dan J Miller
41057a76c5 [NewUI] Build mascara with uglification and gzipping. (#2735)
* Adds uglification and gzipping.

* Build mascara with uglification and gzipping.

* Remove gzipping from extension build.
2018-01-11 18:15:22 -08:00
Dan Finlay
7ba9ed922a
Merge pull request #2926 from MetaMask/gulp-npmls
build - add 'deps' step that records output of 'npm ls' into build
2018-01-11 15:06:36 -08:00
kumavis
cf60b23eec
Merge branch 'master' into infura-rest-api 2018-01-11 11:40:56 -08:00
kumavis
9a603606a6 deps - gulp in dev deps only 2018-01-10 13:51:25 -08:00
kumavis
cc49e637dd deps - bump eth-json-infura 2018-01-09 08:18:58 -08:00
Dan Finlay
dcbecdc1fd
Merge pull request #2796 from MetaMask/filter-case-sensitive
bugfix: deps - eth-json-rpc-filters@1.2.5
2018-01-08 15:40:39 -08:00
kumavis
ab7701efb3 provider - infura - use infura REST api 2018-01-08 14:57:57 -08:00
kumavis
2147b8a59a
Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackage
Update vinyl-buffer to version 1.0.1
2018-01-08 12:40:54 -08:00
greenkeeper[bot]
d12c289e91 chore(package): update gulp-watch to version 5.0.0 2018-01-07 05:53:33 +00:00
Dan Finlay
4bca98d588 Derive gas price estimate from previous transactions
Return the 50th percentile lowest gas price of the previous 20 blocks.
2018-01-05 21:24:20 -08:00
Thomas Huang
a6760fca25 Update vinyl-buffer to version 1.0.1 2018-01-04 06:40:38 -06:00
Alexander Tseung
be398500de
Merge pull request #2848 from MetaMask/NewUI-flat
[NewUI] Merge NewUI-flat into uat
2018-01-03 13:24:17 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
Alexander Tseung
dfb2247108 Fix sign typed data 2017-12-29 13:17:26 -08:00
greenkeeper[bot]
37789f2dba chore(package): update vinyl-source-stream to version 2.0.0 2017-12-23 05:35:28 +00:00
Alexander Tseung
409d1d30e9
Merge pull request #2799 from MetaMask/NewUI-flat
Update UAT to version 4.0.5
2017-12-22 11:40:20 -08:00
kumavis
023b5c84c4
deps - eth-json-rpc-filters@1.2.5
fix case sensitive address check in filters
2017-12-22 10:15:38 -08:00
greenkeeper[bot]
e81ba29359 chore(package): update karma to version 2.0.0 2017-12-21 16:45:03 +00:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
Thomas Huang
c6e7bc0a5d Add exit flag to mocha to exit after tests run 2017-12-15 14:41:58 -06:00
Alexander Tseung
d905b86ba7 Add prop-types to package.json, redirect from create-password screen when isInitialized 2017-12-14 14:11:23 -08:00
Alexander Tseung
e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
kumavis
161aa66cb4 Revert "Revert "network - for infura networks use the infura block tracker provider""
This reverts commit 5df7dcd758.
2017-12-13 18:57:27 -08:00
kumavis
adb3de5283 Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-block-tracker 2017-12-13 18:56:27 -08:00
kumavis
222e80dbbe deps - bump eth-json-rpc-infura 2017-12-13 18:43:12 -08:00
Frankie
5df7dcd758
Revert "network - for infura networks use the infura block tracker provider" 2017-12-13 17:46:56 -08:00
kumavis
33e6befdaa network - for infura networks use the infura block tracker provider 2017-12-13 13:51:36 -08:00
Dan Finlay
1ebd5140aa Version 3.13.2 2017-12-09 20:00:54 -05:00
Dan
ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Thomas Huang
c30b543a80
Merge pull request #2630 from MetaMask/i2624-VersionedNotices
Versioned notices
2017-11-29 17:25:10 -06:00
kumavis
327651e7fb Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix 2017-11-29 08:27:47 -10:00
Dan Finlay
f0f6bb28e0 Get notice version filtering working nicely 2017-11-28 15:16:04 -08:00
kumavis
f64bc3c01a deps - obs-store@3 + migrate stream plumbing 2017-11-28 11:09:18 -10:00
Thomas Huang
2b1f2557c7
Merge pull request #2615 from jpclark/NewUI-flat
Provide blockie identicon option
2017-11-28 13:58:06 -06:00
Dan Finlay
e89f82399f Add optional version field to notices
Allows notices to only show to users who are on a certain version.
2017-11-28 11:14:57 -08:00
Thomas Huang
698e9ba441 Update greenkeeper deps for master 2017-11-27 13:49:49 -06:00
Thomas Huang
9b25f89728 Update babelify to 8.0.0 2017-11-27 12:35:19 -06:00
Jason Clark
a34362b776 Fixes changes requested in pullrequestreview-79088534 2017-11-27 08:11:48 -07:00
Thomas Huang
109050817a Update react, react-dom, and react-test-renderer to 15.6.2 2017-11-27 08:46:47 -06:00
Thomas Huang
1ee91a51cc Update ethjs-query to v0.3.1 2017-11-26 10:46:28 -06:00
Thomas Huang
178b657c75 Update Qunit to QunitJS v2.4.1 2017-11-26 10:03:17 -06:00
Thomas Huang
cefe6cded6 Update to Enzyme 3.2.0 2017-11-25 18:37:12 -06:00
Jason Clark
1b89ceb63a swapped out ethereum-blockies lib for MEW blockies library, tightened up identicon.js code 2017-11-25 14:33:42 -07:00
Jason Clark
dc7bd3c628 incremental commit of working blockie component 2017-11-24 13:48:56 -07:00
Jason Clark
fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)
90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
greenkeeper[bot]
fac516e5eb fix(package): update react-markdown to version 3.0.0 2017-11-20 09:08:48 +00:00
frankiebee
08867874cc Merge remote-tracking branch 'origin/uat' into mascara-first-screen 2017-11-07 12:29:47 -05:00
Dan
acc973d543 Update classnames for integration tests and add output/index.css to integration test for ci 2017-11-02 15:16:43 -07:00
Dan
b7653e8207 Get current NewUI-flat tests working. 2017-11-02 15:16:43 -07:00
Dan
56e9f98bd0 More lint fixes 2017-11-02 09:45:59 -02:30
frankiebee
5f7bc85c3d fix mascara build 2017-10-31 14:02:27 -05:00
Chi Kei Chan
301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Kevin Serrano
1767dceba4 Merge pull request #2422 from watilde/fixes-lint
Fixes lint warnings
2017-10-24 16:53:54 -07:00
Chi Kei Chan
7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
tmashuang
91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -07:00
Kevin Serrano
721019bc2b
Temporarily reversal of json-rpc-engine 2017-10-21 14:47:12 -07:00
Daijiro Wachi
c1eb8f16dc Add lint:fix command to gulp and npm-scripts 2017-10-21 21:04:24 +02:00
Chi Kei Chan
5484e68896 Add Integration Tests 2017-10-20 21:51:37 -07:00
Chi Kei Chan
ac50db52a9 Fix linter 2017-10-20 21:51:37 -07:00
Chi Kei Chan
5aaa2d679b Add ShapeShift UI 2017-10-20 21:51:37 -07:00
Chi Kei Chan
c6a3d00d80 Fix merge conflict; separate onboarding buy screen 2017-10-20 21:51:37 -07:00
Chi Kei Chan
e88baff2ee Add missing presets 2017-10-20 21:51:37 -07:00
Jacky Chan
638bbe0428 Shuffle tokens 2017-10-20 21:51:37 -07:00
Jacky Chan
1a9b217558 Add BackupPhraseScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
e1497fafa6 Add UniqueImageScreen 2017-10-20 21:51:37 -07:00
kumavis
61e1b821d4 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fix-maybe 2017-10-20 12:31:40 -07:00
kumavis
8472ca406a deps - bump eth-json-rpc-filters for log filter fix 2017-10-20 12:29:12 -07:00
Chi Kei Chan
344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Thomas Huang
c24e266118 Merge branch 'master' into i2348-SelectAccountOnNewVault 2017-10-20 09:04:57 -04:00
Chi Kei Chan
69d8359639 Update eth-keyring-controller dependency 2017-10-19 17:48:45 -07:00
Dan Finlay
942de9ba02 Patch sandwich-expando for security update 2017-10-19 09:47:48 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
kumavis
209db9ae5f deps - bump eth-json-rpc-filters 2017-10-18 19:53:48 -07:00
Dan Finlay
21bde66e16 Remove account-tracker from keyringController 2017-10-18 17:14:26 -07:00
Kevin Serrano
5bdee96e73 Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0
Update react-simple-file-input to the latest version 🚀
2017-10-18 17:10:30 -07:00
kumavis
8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Kevin Serrano
d9f5e6beb2 Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGeneration
Move etherscan link logic into module
2017-10-16 11:31:05 -07:00
Dan Finlay
c77bc5d408 Bump version on eth-simple-keyring
Fixes bug where imported accounts could not use the new `signTypedData` method.
2017-10-16 04:12:51 -07:00
Dan Finlay
06094c914b Move etherscan link logic into module 2017-10-14 11:23:44 -04:00
greenkeeper[bot]
970fbd797a fix(package): update react-simple-file-input to version 2.0.0 2017-10-14 12:05:00 +00:00
greenkeeper[bot]
19c375fa69 fix(package): update metamascara to version 2.0.0 2017-10-13 19:22:02 +00:00
Dan
7ec77e0b45 Refactor amount input: dynamic input width with vanilla js. 2017-10-12 11:09:05 -07:00
Dan
ea7926c211 Adds amount and gas field to sendV2. 2017-10-12 11:09:05 -07:00
kumavis
5c5f9297f7 deps - bump eth-rpc-client for fix 2017-10-11 18:36:25 -07:00
kumavis
4096ec9f69 deps - bump eth-json-rpc-middleware for fix 2017-10-10 20:20:12 -07:00
kumavis
0f8d7dacb1 network-controller - use obj-proxy for providerProxy 2017-10-10 17:26:44 -07:00
kumavis
efa92a7fc5 network controller - refactor to use eth-rpc-client 2017-10-10 14:13:12 -07:00
Sergey Ukustov
a1696f89a8 Validate data format for eth_signTypedData 2017-10-07 00:38:13 +03:00
Dan Finlay
c821a6b93a Bump provider-engine for better sender validations 2017-10-05 14:48:40 -07:00
Dan Finlay
176d03b2e8 Require keyring-controller 2.1.0 2017-10-05 14:39:23 -07:00
Dan Finlay
88686a3968 Enforce 0x prefix on accounts with new hd keyring 2017-10-04 15:35:46 -07:00
kumavis
23bc92a8f1 deps - bump eth-json-rpc-filters for log filter fix 2017-10-04 13:33:50 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Thomas Huang
f12504cd09 Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0
Update coveralls to the latest version 🚀
2017-10-03 12:35:25 -07:00
greenkeeper[bot]
98641f6f66 chore(package): update mocha to version 4.0.0 2017-10-03 04:33:04 +00:00
kumavis
e682611301 deps - bump pe for block cache fix 2017-10-02 11:35:26 -07:00
Chi Kei Chan
67ee5b21e6 Query for gas estimates 2017-09-28 17:39:53 -07:00
greenkeeper[bot]
f69cf1670f chore(package): update coveralls to version 3.0.0 2017-09-28 17:02:58 +00:00
Chi Kei Chan
5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
kumavis
cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara
require metamascara
2017-09-27 16:27:01 -07:00
Dan Finlay
112c223930 Merge pull request #2196 from MetaMask/express-bump
deps - bump express for security fix
2017-09-27 15:26:53 -07:00
kumavis
cd0f44e2d6 deps - bump express for security fix 2017-09-27 14:59:10 -07:00
greenkeeper[bot]
c0d7d44764 fix(package): update eth-keyring-controller to version 2.0.0 2017-09-27 21:54:46 +00:00
Dan Finlay
e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
kumavis
1877c0766c Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController 2017-09-26 21:42:30 -07:00
Thomas Huang
d135c3c9ca Merge pull request #2174 from MetaMask/i2162-TokenPrecision
Fix token precision bug
2017-09-26 11:32:32 -07:00
Dan Finlay
b46cb3ecb5 Fix token precision bug
Had fixed this before in the dependency, but hadn't merged in that version bump yet :(

Fixes #2162
2017-09-26 09:25:04 -07:00
greenkeeper[bot]
e52d52b22e chore(package): update sinon to version 4.0.0 2017-09-26 08:22:48 +00:00
frankiebee
4979f5902f bump metamascara version 2017-09-22 20:04:58 -07:00
kumavis
8ad74cf93a deps - bump filter deps and add random missing deps 2017-09-22 15:16:42 -07:00
Dan Finlay
443b1a8eb7 Remove keyring controller from project 2017-09-22 14:38:40 -07:00
kumavis
15195bca75 deps - bump provider engine for block tracker 2017-09-22 14:20:44 -07:00
kumavis
2ca2df1832 deps - bump eth-block-tracker 2017-09-22 13:58:46 -07:00
Dan Finlay
e9b7fd9018 Patch security update 2017-09-22 10:41:14 -07:00
Chi Kei Chan
0204aa2001 Add Add Token UI; Add Fuzzy search for tokens 2017-09-19 21:18:36 -07:00
frankiebee
418f01411e mascara: turn off background 2017-09-19 16:48:42 -07:00
frankiebee
daeb7f6ad3 update metamascara 2017-09-19 12:58:51 -07:00
kumavis
77e02d264a Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-engine-bump 2017-09-19 11:27:49 -07:00
kumavis
b979c6a2f3 deps - bump json-rpc-middleware-stream 2017-09-19 11:22:55 -07:00
kumavis
d2ded61cc9 deps - bump json-rpc-engine 2017-09-19 10:54:41 -07:00
frankiebee
90482934f1 Merge branch 'master' into breakout-mascara 2017-09-19 10:45:51 -07:00
frankiebee
29dd81d029 require metamascara 2017-09-18 19:08:02 -07:00
Chi Kei Chan
a67d3ecd46 Merge branch 'master' into NewUI-flat 2017-09-18 18:13:15 -07:00
Frankie
6204afb156 Merge pull request #2119 from MetaMask/mascara-tests2
tests - integration - re-add mascara to normal run
2017-09-18 14:33:40 -07:00
kumavis
eaa85f283d tests - integration - re-add mascara to normal run 2017-09-18 13:17:08 -07:00
Frankie
bbae8d975e Merge pull request #2098 from MetaMask/mascara-tests
Integration test suite improvements
2017-09-18 12:54:39 -07:00
kumavis
784510f89f tests - integration - remove failing mascara integration tests from normal run until fixed 2017-09-18 12:31:44 -07:00
Chi Kei Chan
6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
kumavis
d2d6f6a858 tests - integration - add mascara to integration test run 2017-09-15 12:20:43 -07:00
Chi Kei Chan
d722c1045f Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate 2017-09-13 19:57:33 -07:00
kumavis
610f09262d tests - refactor and rename npm scripts 2017-09-13 17:17:09 -07:00
kumavis
cbff5fd450 tests - mascara - move temp build files into dist/mascara 2017-09-13 16:52:38 -07:00
kumavis
56db3999ad tests - start migrating mascara tests to karma 2017-09-13 16:45:31 -07:00
kumavis
dd90e8e364 tests - break out coveralls npm script 2017-09-13 16:04:48 -07:00
kumavis
245c0f0c27 metamask controller - move middleware into seperate files 2017-09-13 15:17:26 -07:00
Dan
6fa1cd6225 Reapply conversion utility changes and fix calls to utility in pending-tx. 2017-09-13 14:22:30 -07:00
Chi Kei Chan
8b5f2a95df Improve styling in Confirmation Screen; Show decoded send token data 2017-09-12 23:04:01 -07:00
Chi Kei Chan
b64471833f Revert "Overhaul currency conversion utility and update calls to utility in pending-tx."
This reverts commit 080890a46e.
2017-09-12 23:04:01 -07:00
Dan
080890a46e Overhaul currency conversion utility and update calls to utility in pending-tx. 2017-09-12 16:05:59 -07:00
tmashuang
a79b4db06a E2E testing with selenium 2017-09-12 14:14:24 -07:00
kumavis
114dae5f80 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix3 2017-09-12 11:51:22 -07:00
kumavis
cafebb6417 Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0
Update babel-eslint to the latest version 🚀
2017-09-12 11:50:47 -07:00
greenkeeper[bot]
985fb7b07c chore(package): update babel-eslint to version 8.0.0 2017-09-12 14:10:26 +00:00
Chi Kei Chan
7eb6dae418 Added signTokenTx; Adding token confirmation screen 2017-09-12 02:22:23 -07:00
kumavis
0e70366e9c test - integration - drop testem for karma 2017-09-11 22:29:40 -07:00
kumavis
e9daf0eb28 test - integration - remove redundant testem scripts 2017-09-11 22:26:47 -07:00
kumavis
ca035743c2 ci - dont attempt to submit coveralls if not configured 2017-09-11 22:25:46 -07:00
Chi Kei Chan
062e67bff8 Add buttons; handle back; add yarn.lock 2017-09-11 22:14:09 -07:00
kumavis
671dafea9e Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix 2017-09-07 22:37:44 -07:00
kumavis
f5d0a0b07a deps - bump jsonrpc filters for log filter formate fix 2017-09-07 22:25:08 -07:00
kumavis
57e4805c62 streams - use pump and published obj-multiplex 2017-09-07 21:17:49 -07:00
kumavis
440a42bbc3 inpage - add idRemapMiddleware 2017-09-07 10:08:07 -07:00
Thomas Huang
33dfed15a6 Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0
Update sinon to the latest version 🚀
2017-09-01 12:05:08 -07:00
Dan
5452a26b36 Fixes lint errors and adds stylelint-config-standard to package.json 2017-08-31 04:16:07 -07:00
kumavis
cc56d0d2f6 inpage - use json-rpc-engine for inpage-provider 2017-08-24 15:44:40 -07:00
Dan Finlay
e0c35179c2 Merge pull request #1914 from MetaMask/history-diff
Move Tx State History to diff-based format
2017-08-18 13:14:17 -07:00
Dan Finlay
d7a34514b0 Fix token balance precision rendering
Fixes a bug where balances under 1 token could be mis-rendered by fixing it [here](https://github.com/MetaMask/eth-token-tracker/pull/9) then updating us to `eth-token-tracker@1.1.3`.

Fixes #1912
2017-08-17 14:53:08 -07:00
kumavis
fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -07:00
sdtsui
dbc539ac55 Merge remote-tracking branch 'mm/master' into NewUI-flat 2017-08-14 11:06:14 +02:00
sdtsui
b8aa529d29 [WIP] Add packages and tasks for linting scss 2017-08-14 10:03:16 +02:00
greenkeeper[bot]
a15599108e chore(package): update sinon to version 3.2.0 2017-08-10 14:35:53 +00:00
kumavis
fa6370c68a deps - bump ethjs-query 2017-08-09 16:18:38 -07:00
kumavis
0188e7b94d Merge branch 'master' into NewUI-flat 2017-08-08 23:30:58 -07:00
kumavis
6767430aa2 deps - bump watchify 2017-08-08 17:46:09 -07:00
kumavis
922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
frankiebee
88b84e3895 add json-rpc-engine && eth-json-rpc-middleware to devDependencies 2017-08-08 18:34:59 -04:00
sdtsui
da51f56df9 Add dependencies and JSX support (reactify), for global modal implementation 2017-08-08 13:36:54 -07:00
frankiebee
f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
kumavis
78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
sdtsui
5c7adc911d Merge branch 'NewUI' into feat/mm-ui-5-merged 2017-08-06 20:24:04 -07:00
sdtsui
02c2106c3b Merge branch 'master' into feat/mm-ui-5 2017-08-06 19:55:34 -07:00
sdtsui
3f222854e4 Migrate from css to scss + autoprefixer 2017-08-06 12:09:17 -07:00
kumavis
a456baea8b Merge branch 'master' into NewUI 2017-08-05 00:29:10 -07:00
kumavis
c62dad7248 blacklist - bump phishing detector 2017-08-04 14:11:40 -07:00
kumavis
1be8053cca blacklist - update phishing on boot and speed up polling to 4 min 2017-08-04 13:51:48 -07:00
sdtsui
4d967ebea9 Bring menu-droppo component into project, remove as a dependency 2017-08-04 11:47:36 -07:00
frankiebee
89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee
cddff73703 bring your own BN 2017-08-04 14:42:13 -04:00
kumavis
5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis
55f0187df7 deps - update 2017-08-03 16:38:44 -07:00
kumavis
026f8592d8 deps - bump eth-detect-phishing 2017-08-03 15:59:01 -07:00
kumavis
bb8a09375d Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:12:24 -07:00
kumavis
da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
kumavis
d4877cb4e2 blacklist - use module eth-phishing-detect 2017-08-03 14:25:02 -07:00
Kevin Serrano
81982d01c0
Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI 2017-08-03 13:10:46 -07:00
kumavis
8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 1: promises for everyone and more tests!
2017-08-02 19:57:16 -07:00
sdtsui
8a39ef03c2 Hook up css animation 2017-08-02 17:49:04 -07:00
kumavis
ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
sdtsui
96d3b2f35f Add dependejncy: react-burger-menu 2017-08-02 13:03:30 -07:00