Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master branch #6296

Merged
merged 58 commits into from
Mar 26, 2019
Merged

Update master branch #6296

merged 58 commits into from
Mar 26, 2019

Conversation

tmashuang
Copy link
Contributor

No description provided.

danjm and others added 30 commits March 6, 2019 11:18
Uppercase and context fixes on Spanish translation.
No longer check network when validating checksum addresses
Nonmultiple notifications for batch txs
* gaba: integrate AddressBookController

* pin gaba version and update lockfile
Allow npm to update package-lock.json file
Use npm ci for fast(er) installs on CI
whymarrh and others added 15 commits March 13, 2019 09:56
Allow seed phrases with a trailing newline
Update eth-contract-metadata dependency and sub-dependencies
… should refresh or not (#6330)

* feat: `inpageProvider.autoRefreshOnNetworkChange` to allow dapps to control if it refreshes or not

* feat: check the `autoRefreshOnNetworkChange` before a refresh

* fix linting error

* fix: use `window.ethereum` now `web3.ethereum`
* enable mobile sync

* remove mobile sync as a preference

* Fix typo
* Remove ui/app/keychains/

* Remove ui/app/img/ (unused images)

* Move conversion-util to helpers/utils/

* Move token-util to helpers/utils/

* Move /helpers/*.js inside /helpers/utils/

* Move util tests inside /helpers/utils/

* Renameand move confirm-transaction/util.js to helpers/utils/

* Move higher-order-components to helpers/higher-order-components/

* Move infura-conversion.json to helpers/constants/

* Move all utility functions to helpers/utils/

* Move pages directory to top-level

* Move all constants to helpers/constants/

* Move metametrics inside helpers/

* Move app and root inside pages/

* Move routes inside helpers/

* Re-organize ducks/

* Move reducers to ducks/

* Move selectors inside selectors/

* Move test out of test folder

* Move action, reducer, store inside store/

* Move ui components inside ui/

* Move UI components inside ui/

* Move connected components inside components/app/

* Move i18n-helper inside helpers/

* Fix unit tests

* Fix unit test

* Move pages components

* Rename routes component

* Move reducers to ducks/index

* Fix bad path in unit test
@danjm danjm requested a review from frankiebee as a code owner March 21, 2019 23:03
danjm and others added 11 commits March 22, 2019 12:20
…ks. (#6300)

Add missing translations in gas customization modal
* New setting tab

* Add InfoTab

* Add Advanced tab

* Add Security Tab

* Finish mobile view

* Make new setting page responsive

* Fix linter

* Fix y scrolling

* Update link in network dropdown

* Fix e2e tests

* Remove duplicate translation key

* Resolve merge conflict

* Only change settings header in popup view.

* Place mobile-sync button in advanced-tab of settings
* Check balance before showing cancel

* Fix linter

* Use existing helper methods for calculating increased cancel price

* Add tooltip for disabled button

* Lint fix for cancelError branch.

* Disabling of cancel button should account for value of tx.
* Dont close window notifications

* Remove commented out lines in beta spec
@danfinlay danfinlay merged commit b921c8f into master Mar 26, 2019
@danfinlay danfinlay mentioned this pull request Mar 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.