Skip to content

Commit

Permalink
Update master branch (#6296)
Browse files Browse the repository at this point in the history
* Fixes the 'Percentages row tracks and gutters' decpracation warning. (#6244)

* Fix missing this reference in addtoken button onclick method (#6245)

* Only call onRecipient and onSender methods if defined in sender-to-recipient (#6247)

* Prevent advanced gas input arrows from setting value to < 0 (#6248)

* Add privacy policy link to modal metrics opt-in (#6250)

* Handle undefined gas limits and prices in transaction-breakdown.component (#6246)

* Uppercase and context fixes on Spanish translation.

* development - enhancement for sourcemap validator tool (#6277)

* Nonmultiple notifications for batch txs

* No longer check network when validating checksum addresses

* Version 6.2.1 (#6251)

* Remove line rather than comment out

* Fixes the use of the browser back button on the reveal seed screen

* GABA: Integrate AddressBookController (#5847)

* gaba: integrate AddressBookController

* pin gaba version and update lockfile

* ci: Use cache version from circle environment var (#6286)

* Allow npm to update the package-lock.json file

* npm i -D [email protected]

* mascara - remove from project (#6283)

* circleci - disable npm dep cache (#6288)

* Centre all notification popups

* ui - add missing PropTypes (#6287)

* Improve Korean translations (#6268)

* ci: Use npm ci for fast(er) installs

* build - babel - move config to babelrc (#6284)

* Patch/bump version (#6294)

* Update Node minor version

* ci: Skip updating npm@6 as it is default

* Allow seed phrases with a trailing newline

* Centre the notification in the current window (#6307)

* Fixes popups not showing when screen size is odd (#6312)

* Fix typos in English messages (#6317)

* Add rollback script, move auto-changelog script (#6252)

* Bump gaba version to avoid broken eth-contract-metadata

* Fixing spelling of Ethereum in MetaMetrics copy (#6329)

* Stop reloading dapps on network change allowing dapps to decide if it 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 (#6332)

* enable mobile sync

* remove mobile sync as a preference

* Fix typo

* Folder restructure (#6304)

* 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

* Hide gas price chart and prevent api call when not on ethereum networks. (#6300)

Add missing translations in gas customization modal

* Fix gas fee in the submitted step of the transaction details activity log. (#6301)

* Fix oversized loading overlay on gas customization modal. (#6326)

* Replaces the coinbase link in the deposit modal with one for wyre (#6302)

* New settings page rebased (#6333)

* 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

* Close transaction on close of notification window (#6340)

* Cancel error rebased (#6341)

* 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.

* E2E - Dont close window notifications (#6349)

* Dont close window notifications

* Remove commented out lines in beta spec

* Don't include tx value in calculation of balance sufficiency for cancel button disabling. (#6346)

* enable privacy mode for first time users (#6347)

* Version 6.3.0 (#6350)
  • Loading branch information
tmashuang authored and danfinlay committed Mar 26, 2019
1 parent b4bb6a8 commit b921c8f
Show file tree
Hide file tree
Showing 777 changed files with 4,609 additions and 3,786 deletions.
25 changes: 22 additions & 3 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
{
"presets": [["env", { "targets": { "browsers": [">0.25%", "not ie 11", "not op_mini all"] } } ], "react", "stage-0"],
"plugins": ["transform-runtime", "transform-async-to-generator", "transform-class-properties"]
}
"presets": [
[
"env",
{
"targets": {
"browsers": [
">0.25%",
"not ie 11",
"not op_mini all"
]
}
}
],
"react",
"stage-0"
],
"plugins": [
"transform-runtime",
"transform-async-to-generator",
"transform-class-properties"
]
}
68 changes: 17 additions & 51 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,28 +82,21 @@ workflows:
jobs:
prep-deps-npm:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- restore_cache:
keys:
- v1.0-dependency-cache-{{ checksum "package-lock.json" }}
- run:
name: Install npm 6 + deps via npm
name: Install deps via npm
command: |
sudo npm install -g npm@6 && npm install --no-save --no-audit
npm ci
- persist_to_workspace:
root: .
paths:
- node_modules
- save_cache:
key: v1.0-dependency-cache-{{ checksum "package-lock.json" }}
paths:
- node_modules

prep-build:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -122,7 +115,7 @@ jobs:

prep-docs:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -137,7 +130,7 @@ jobs:

prep-scss:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -156,7 +149,7 @@ jobs:

test-lint:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand Down Expand Up @@ -191,7 +184,7 @@ jobs:
# destination: test-artifacts
test-e2e-chrome:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -205,7 +198,7 @@ jobs:

test-e2e-firefox:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- run:
Expand All @@ -222,7 +215,7 @@ jobs:

job-screens:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -237,7 +230,7 @@ jobs:

job-publish-prerelease:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -257,7 +250,7 @@ jobs:

job-publish-release:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -274,7 +267,7 @@ jobs:
test-unit:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -284,7 +277,7 @@ jobs:
command: npm run test:coverage
test-mozilla-lint:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -295,7 +288,7 @@ jobs:

test-integration-flat-firefox:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -311,7 +304,7 @@ jobs:
environment:
browsers: '["Chrome"]'
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- checkout
- attach_workspace:
Expand All @@ -320,36 +313,9 @@ jobs:
name: test:integration:flat
command: npm run test:flat

test-integration-mascara-firefox:
docker:
- image: circleci/node:8.11.3-browsers
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Install Firefox
command: ./.circleci/scripts/firefox-install
- run:
name: test:integration:mascara
command: npm run test:mascara

test-integration-mascara-chrome:
environment:
browsers: '["Chrome"]'
docker:
- image: circleci/node:8.11.3-browsers
steps:
- checkout
- attach_workspace:
at: .
- run:
name: test:integration:mascara
command: npm run test:mascara

all-tests-pass:
docker:
- image: circleci/node:8.11.3-browsers
- image: circleci/node:8.15.1-browsers
steps:
- run:
name: All Tests Passed
Expand Down
3 changes: 0 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ app/vendor/**

ui/lib/blockies.js

mascara/src/app/first-time/spinner.js
mascara/test/jquery-3.1.0.min.js

test/integration/bundle.js
test/integration/jquery-3.1.0.min.js
test/integration/helpers.js
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.13
v8.15
1 change: 0 additions & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ dist/
docs/
fonts/
images/
mascara/
node_modules/
notices/
test/
26 changes: 25 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,30 @@

## Current Develop Branch

## 6.3.0 Mon Mar 25 2019

- [#6300](https://github.com/MetaMask/metamask-extension/pull/6300): Gas chart hidden on custom networks
- [#6301](https://github.com/MetaMask/metamask-extension/pull/6301): Fix gas fee in the submitted step of the transaction details activity log
- [#6302](https://github.com/MetaMask/metamask-extension/pull/6302): Replaces the coinbase link in the deposit modal with one for wyre
- [#6307](https://github.com/MetaMask/metamask-extension/pull/6307): Centre the notification in the current window
- [#6312](https://github.com/MetaMask/metamask-extension/pull/6312): Fixes popups not showing when screen size is odd
- [#6326](https://github.com/MetaMask/metamask-extension/pull/6326): Fix oversized loading overlay on gas customization modal.
- [#6330](https://github.com/MetaMask/metamask-extension/pull/6330): Stop reloading dapps on network change allowing dapps to decide if it should refresh or not
- [#6332](https://github.com/MetaMask/metamask-extension/pull/6332): Enable mobile sync
- [#6333](https://github.com/MetaMask/metamask-extension/pull/6333): Redesign of the settings screen
- [#6340](https://github.com/MetaMask/metamask-extension/pull/6340): Cancel transactions and signature requests on the closing of notification windows
- [#6341](https://github.com/MetaMask/metamask-extension/pull/6341): Disable transaction "Cancel" button when balance is insufficient
- [#6347](https://github.com/MetaMask/metamask-extension/pull/6347): Enable privacy mode by default for first time users

## 6.2.2 Tue Mar 12 2019

- [#6271](https://github.com/MetaMask/metamask-extension/pull/6271): Centre all notification popups
- [#6268](https://github.com/MetaMask/metamask-extension/pull/6268): Improve Korean translations
- [#6279](https://github.com/MetaMask/metamask-extension/pull/6279): Nonmultiple notifications for batch txs
- [#6280](https://github.com/MetaMask/metamask-extension/pull/6280): No longer check network when validating checksum addresses

## 6.2.1 Wed Mar 06 2019

## 6.2.0 Tue Mar 05 2019
- [#6192](https://github.com/MetaMask/metamask-extension/pull/6192): Improves design and UX of onboarding flow
- [#6195](https://github.com/MetaMask/metamask-extension/pull/6195): Fixes gas estimation when sending to contracts
Expand All @@ -12,7 +36,7 @@

- [#6182](https://github.com/MetaMask/metamask-extension/pull/6182): Change "Token Address" to "Token Contract Address"
- [#6177](https://github.com/MetaMask/metamask-extension/pull/6177): Fixes #6176
- [#6146](https://github.com/MetaMask/metamask-extension/pull/6146): * Add Copy Tx ID button to transaction-list-item-details
- [#6146](https://github.com/MetaMask/metamask-extension/pull/6146): * Add Copy Tx ID button to transaction-list-item-details
- [#6133](https://github.com/MetaMask/metamask-extension/pull/6133): Checksum address before slicing it for the confirm screen
- [#6147](https://github.com/MetaMask/metamask-extension/pull/6147): Add button to force edit token symbol when adding custom token
- [#6124](https://github.com/MetaMask/metamask-extension/pull/6124): recent-blocks - dont listen for block when on infura providers
Expand Down
25 changes: 0 additions & 25 deletions Dockerfile

This file was deleted.

Loading

0 comments on commit b921c8f

Please sign in to comment.