Skip to content

Commit

Permalink
Merge pull request MetaMask#6242 from MetaMask/develop
Browse files Browse the repository at this point in the history
Deploy v6.2.0
  • Loading branch information
tmashuang authored Mar 5, 2019
2 parents 160f196 + dc79456 commit b4bb6a8
Show file tree
Hide file tree
Showing 292 changed files with 5,145 additions and 21,172 deletions.
46 changes: 23 additions & 23 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ workflows:
- test-lint:
requires:
- prep-deps-npm
- test-deps:
requires:
- prep-deps-npm
- test-e2e-beta-chrome:
# - test-deps:
# requires:
# - prep-deps-npm
- test-e2e-chrome:
requires:
- prep-deps-npm
- prep-build
- test-e2e-beta-firefox:
- test-e2e-firefox:
requires:
- prep-deps-npm
- prep-build
Expand Down Expand Up @@ -52,8 +52,8 @@ workflows:
- test-lint
- test-unit
- test-mozilla-lint
- test-e2e-beta-chrome
- test-e2e-beta-firefox
- test-e2e-chrome
- test-e2e-firefox
# - test-e2e-beta-drizzle
- test-integration-flat-chrome
- test-integration-flat-firefox
Expand Down Expand Up @@ -165,16 +165,16 @@ jobs:
name: Test
command: npm run lint

test-deps:
docker:
- image: circleci/node:8.11.3-browsers
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Test
command: sudo npm install -g npm@6 && npm audit
# test-deps:
# docker:
# - image: circleci/node:8.11.3-browsers
# steps:
# - checkout
# - attach_workspace:
# at: .
# - run:
# name: Test
# command: sudo npm install -g npm@6 && npm audit

# test-e2e-beta-drizzle:
# docker:
Expand All @@ -189,21 +189,21 @@ jobs:
# - store_artifacts:
# path: test-artifacts
# destination: test-artifacts
test-e2e-beta-chrome:
test-e2e-chrome:
docker:
- image: circleci/node:8.11.3-browsers
steps:
- checkout
- attach_workspace:
at: .
- run:
name: test:e2e:chrome:beta
command: npm run test:e2e:chrome:beta
name: test:e2e:chrome
command: npm run test:e2e:chrome
- store_artifacts:
path: test-artifacts
destination: test-artifacts

test-e2e-beta-firefox:
test-e2e-firefox:
docker:
- image: circleci/node:8.11.3-browsers
steps:
Expand All @@ -214,8 +214,8 @@ jobs:
- attach_workspace:
at: .
- run:
name: test:e2e:firefox:beta
command: npm run test:e2e:firefox:beta
name: test:e2e:firefox
command: npm run test:e2e:firefox
- store_artifacts:
path: test-artifacts
destination: test-artifacts
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Current Develop Branch

## 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
- [#6223](https://github.com/MetaMask/metamask-extension/pull/6223): Fixes display of notification windows when metamask is active in a tab
- [#6171](https://github.com/MetaMask/metamask-extension/pull/6171): Adds MetaMetrics usage analytics system

## 6.1.0 Tue Feb 19 2019

- [#6182](https://github.com/MetaMask/metamask-extension/pull/6182): Change "Token Address" to "Token Contract Address"
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MetaMask Browser Extension
[![Build Status](https://circleci.com/gh/MetaMask/metamask-extension.svg?style=shield&circle-token=a1ddcf3cd38e29267f254c9c59d556d513e3a1fd)](https://circleci.com/gh/MetaMask/metamask-extension) [![Coverage Status](https://coveralls.io/repos/github/MetaMask/metamask-extension/badge.svg?branch=master)](https://coveralls.io/github/MetaMask/metamask-extension?branch=master) [![Stories in Ready](https://badge.waffle.io/MetaMask/metamask-extension.png?label=in%20progress&title=waffle.io)](https://waffle.io/MetaMask/metamask-extension)

You can find the latest version of MetaMask on [our official website](https://metamask.io/).

For help using MetaMask, visit our [User Support Site](https://metamask.zendesk.com/hc/en-us).
You can find the latest version of MetaMask on [our official website](https://metamask.io/). For help using MetaMask, visit our [User Support Site](https://metamask.zendesk.com/hc/en-us).

For up to the minute news, follow our [Twitter](https://twitter.com/metamask_io) or [Medium](https://medium.com/metamask) pages.

Expand Down Expand Up @@ -65,11 +65,9 @@ To write tests that will be run in the browser using QUnit, add your test files

- [How to add custom build to Chrome](./docs/add-to-chrome.md)
- [How to add custom build to Firefox](./docs/add-to-firefox.md)
- [How to develop a live-reloading UI](./docs/ui-dev-mode.md)
- [How to add a new translation to MetaMask](./docs/translating-guide.md)
- [Publishing Guide](./docs/publishing.md)
- [The MetaMask Team](./docs/team.md)
- [How to develop an in-browser mocked UI](./docs/ui-mock-mode.md)
- [How to live reload on local dependency changes](./docs/developing-on-deps.md)
- [How to add new networks to the Provider Menu](./docs/adding-new-networks.md)
- [How to manage notices that appear when the app starts up](./docs/notices.md)
Expand Down
116 changes: 115 additions & 1 deletion app/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@
"advanced": {
"message": "Advanced"
},
"agreeTermsOfService": {
"message": "I agree to the Terms of Service"
},
"allDone": {
"message": "All Done"
},
"alreadyHaveSeedPhrase": {
"message": "No, I already have a seed phrase"
},
"amount": {
"message": "Amount"
},
Expand Down Expand Up @@ -239,6 +248,9 @@
"confirmTransaction": {
"message": "Confirm Transaction"
},
"congratulations": {
"message": "Congratulations"
},
"connectHardwareWallet": {
"message": "Connect Hardware Wallet"
},
Expand Down Expand Up @@ -326,6 +338,9 @@
"createAccount": {
"message": "Create Account"
},
"createAWallet": {
"message": "Create a Wallet"
},
"createDen": {
"message": "Create"
},
Expand Down Expand Up @@ -448,6 +463,30 @@
"encryptNewDen": {
"message": "Encrypt your new DEN"
},
"endOfFlowMessage1": {
"message": "You passed the test - keep your seedphrase safe, it's your responsibility!"
},
"endOfFlowMessage2": {
"message": "Tips on storing it safely"
},
"endOfFlowMessage3": {
"message": "Save a backup in multiple places."
},
"endOfFlowMessage4": {
"message": "Never share the phrase with anyone."
},
"endOfFlowMessage5": {
"message": "Be careful of phishing! MetaMask will never spontaneously ask for your seed phrase."
},
"endOfFlowMessage6": {
"message": "If you need to back your up seed phrase again, you can find it in Settings -> Security."
},
"endOfFlowMessage7": {
"message": "If you ever have questions or see something fishy, email [email protected]."
},
"endOfFlowMessage8": {
"message": "MetaMask cannot recover your seedphrase. Learn more."
},
"ensNameNotFound": {
"message": "ENS name not found"
},
Expand Down Expand Up @@ -581,10 +620,16 @@
"getHelp": {
"message": "Get Help."
},
"getStarted": {
"message": "Get Started"
},
"greaterThanMin": {
"message": "must be greater than or equal to $1.",
"description": "helper for inputting hex as decimal input"
},
"happyToSeeYou": {
"message": "We’re happy to see you."
},
"hardware": {
"message": "hardware"
},
Expand Down Expand Up @@ -647,6 +692,12 @@
"importDen": {
"message": "Import Existing DEN"
},
"importWallet": {
"message": "Import Wallet"
},
"importYourExisting": {
"message": "Import your existing wallet using a 12 word seed phrase"
},
"imported": {
"message": "Imported",
"description": "status showing that an account has been fully loaded into the keyring"
Expand Down Expand Up @@ -731,6 +782,9 @@
"message": "must be less than or equal to $1.",
"description": "helper for inputting hex as decimal input"
},
"letsGoSetUp": {
"message": "Yes, let’s get set up!"
},
"likeToAddTokens": {
"message": "Would you like to add these tokens?"
},
Expand Down Expand Up @@ -777,7 +831,7 @@
"message": "Message"
},
"metamaskDescription": {
"message": "MetaMask is a secure identity vault for Ethereum."
"message": "Connecting you to Ethereum and the Decentralized Web."
},
"metamaskSeedWords": {
"message": "MetaMask Seed Words"
Expand All @@ -794,6 +848,12 @@
"minutesShorthand": {
"message": "Min"
},
"mobileSyncTitle": {
"message": "Sync accounts with mobile"
},
"mobileSyncText": {
"message": "Please enter your password to confirm it's you!"
},
"myAccounts": {
"message": "My Accounts"
},
Expand Down Expand Up @@ -842,6 +902,21 @@
"newNetwork": {
"message": "New Network"
},
"newToMetaMask": {
"message": "New to MetaMask?"
},
"noAlreadyHaveSeed": {
"message": "No, I already have a seed phrase"
},
"protectYourKeys": {
"message": "Protect Your Keys!"
},
"protectYourKeysMessage1": {
"message": "Be careful with your seed phrase — there have been reports of websites that attempt to imitate MetaMask. MetaMask will never ask for your seed phrase!"
},
"protectYourKeysMessage2": {
"message": "Keep your phrase safe. If you see something fishy, or you’re uncertain about a website, email [email protected]"
},
"rpcURL": {
"message": "New RPC URL"
},
Expand Down Expand Up @@ -934,6 +1009,12 @@
"originalTotal": {
"message": "Original Total"
},
"participateInMetaMetrics": {
"message": "Participate in MetaMetrics"
},
"participateInMetaMetricsDescription": {
"message": "Participate in MetaMetrics to help us make MetaMask better"
},
"password": {
"message": "Password"
},
Expand Down Expand Up @@ -1231,6 +1312,12 @@
"showAdvancedGasInlineDescription": {
"message": "Select this to show gas price and limit controls directly on the send and confirm screens."
},
"showFiatConversionInTestnets": {
"message": "Show Conversion in Testnets"
},
"showFiatConversionInTestnetsDescription": {
"message": "Select this to show fiat conversion in when you are on Testnets"
},
"showPrivateKeys": {
"message": "Show Private Keys"
},
Expand Down Expand Up @@ -1333,6 +1420,27 @@
"symbolBetweenZeroTwelve": {
"message": "Symbol must be between 0 and 12 characters."
},
"syncWithMobile": {
"message": "Sync with mobile"
},
"syncWithMobileTitle": {
"message": "Sync with mobile"
},
"syncWithMobileDesc": {
"message": "You can sync your accounts and information with your mobile device. Open the MetaMask mobile app, go to \"Settings\" and tap on \"Sync from Browser Extension\""
},
"syncWithMobileDescNewUsers": {
"message": "If you just open the MetaMask Mobile app for the first time, just follow the steps in your phone."
},
"syncWithMobileScanThisCode": {
"message": "Scan this code with your MetaMask mobile app"
},
"syncWithMobileBeCareful": {
"message": "Make sure nobody else is looking at your screen when you scan this code"
},
"syncWithMobileComplete": {
"message": "Your data has been synced succesfully. Enjoy the MetaMask mobile app!"
},
"takesTooLong": {
"message": "Taking too long?"
},
Expand All @@ -1342,6 +1450,9 @@
"testFaucet": {
"message": "Test Faucet"
},
"thisWillCreate": {
"message": "This will create a new wallet and seed phrase"
},
"tips": {
"message": "Tips"
},
Expand Down Expand Up @@ -1576,6 +1687,9 @@
"yourUniqueAccountImageDescription2": {
"message": "You’ll see this image everytime you need to confirm a transaction."
},
"yourUniqueAccountImageDescription3": {
"message": "MetaMask will never ask for your seed phrase!"
},
"zeroGasPriceOnSpeedUpError": {
"message":"Zero gas price on speed up"
}
Expand Down
5 changes: 5 additions & 0 deletions app/images/download-alt.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/images/metrics-chart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/images/sleuth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/images/thin-plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
"version": "6.1.0",
"version": "6.2.0",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "__MSG_appDescription__",
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ function setupController (initState, initLangCode) {
function triggerUi () {
extension.tabs.query({ active: true }, tabs => {
const currentlyActiveMetamaskTab = Boolean(tabs.find(tab => openMetamaskTabsIDs[tab.id]))
if (!popupIsOpen && !currentlyActiveMetamaskTab && !notificationIsOpen) {
if (!popupIsOpen && !currentlyActiveMetamaskTab) {
notificationManager.showPopup()
notificationIsOpen = true
}
Expand Down
Loading

0 comments on commit b4bb6a8

Please sign in to comment.