fix merge in package-lock

MetaMask · Jan 24, 2019 · b72329c · b72329c
2 parents 083670f + 2d7c9b3
commit b72329c
Show file tree

Hide file tree

Showing 162 changed files with 4,155 additions and 3,394 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,10 +28,10 @@ workflows:
           requires:
             - prep-deps-npm
             - prep-build
-      - test-e2e-beta-drizzle:
-          requires:
-            - prep-deps-npm
-            - prep-build
+      # - test-e2e-beta-drizzle:
+      #     requires:
+      #       - prep-deps-npm
+      #       - prep-build
       - test-unit:
           requires:
             - prep-deps-npm
@@ -54,7 +54,7 @@ workflows:
             - test-mozilla-lint
             - test-e2e-beta-chrome
             - test-e2e-beta-firefox
-            - test-e2e-beta-drizzle
+            # - test-e2e-beta-drizzle
             - test-integration-flat-chrome
             - test-integration-flat-firefox
       - job-screens:
@@ -176,19 +176,19 @@ jobs:
           name: Test
           command: sudo npm install -g npm@6 && npm audit
 
-  test-e2e-beta-drizzle:
-    docker:
-      - image: circleci/node:8.11.3-browsers
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: test:e2e:drizzle:beta
-          command: npm run test:e2e:drizzle:beta
-      - store_artifacts:
-          path: test-artifacts
-          destination: test-artifacts
+  # test-e2e-beta-drizzle:
+  #   docker:
+  #     - image: circleci/node:8.11.3-browsers
+  #   steps:
+  #     - checkout
+  #     - attach_workspace:
+  #         at: .
+  #     - run:
+  #         name: test:e2e:drizzle:beta
+  #         command: npm run test:e2e:drizzle:beta
+  #     - store_artifacts:
+  #         path: test-artifacts
+  #         destination: test-artifacts
   test-e2e-beta-chrome:
     docker:
       - image: circleci/node:8.11.3-browsers

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ## Current Develop Branch
 
+## 5.3.1 Wed Jan 16 2019
+
+- [#5966](https://github.com/MetaMask/metamask-extension/pull/5966): Update Slovenian translation
+- [#6005](https://github.com/MetaMask/metamask-extension/pull/6005): Set auto conversion off for token/eth conversion
+- [#6008](https://github.com/MetaMask/metamask-extension/pull/6008): Fix confirm screen for sending ether tx with hex data
+- [#5999](https://github.com/MetaMask/metamask-extension/pull/5999): Refine app description
+- [#5997](https://github.com/MetaMask/metamask-extension/pull/5997): Harden Drizzle test runner script
+- [#5995](https://github.com/MetaMask/metamask-extension/pull/5995): Fix bug where MetaMask user calls non-standard ERC20 methods such as `mint`, `tokenData` will be `undefined` and an uncaught error will break the UI
+- [#5970](https://github.com/MetaMask/metamask-extension/pull/5970): Fixed a word in french translation (several occurrences of connection instead of connexion)
+- [#5977](https://github.com/MetaMask/metamask-extension/pull/5977): Fix Component#componentDidUpdate usage
+- [#5992](https://github.com/MetaMask/metamask-extension/pull/5992): Add scrolling button to account list
+- [#5989](https://github.com/MetaMask/metamask-extension/pull/5989): fix typo in phishing.html title
+
 ## 5.3.0 Wed Jan 02 2019
 
 - [#5978](https://github.com/MetaMask/metamask-extension/pull/5978): Fix etherscan links on notifications

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
@@ -206,6 +206,9 @@
   "clickToAdd": {
     "message": "Click on $1 to add them to your account"
   },
+  "clickToRevealSeed": {
+    "message": "Click here to reveal secret words"
+  },
   "close": {
     "message": "Close"
   },
@@ -227,6 +230,9 @@
   "confirmPassword": {
     "message": "Confirm Password"
   },
+  "confirmSecretBackupPhrase": {
+    "message": "Confirm your Secret Backup Phrase"
+  },
   "confirmTransaction": {
     "message": "Confirm Transaction"
   },
@@ -314,12 +320,15 @@
   "createDen": {
     "message": "Create"
   },
+  "createPassword": {
+    "message": "Create Password"
+  },
   "crypto": {
     "message": "Crypto",
     "description": "Exchange type (cryptocurrencies)"
   },
-  "currentConversion": {
-    "message": "Current Conversion"
+  "currencyConversion": {
+    "message": "Currency Conversion"
   },
   "currentLanguage": {
     "message": "Current Language"
@@ -403,6 +412,9 @@
   "downloadGoogleChrome": {
     "message": "Download Google Chrome"
   },
+  "downloadSecretBackup": {
+    "message": "Download this Secret Backup Phrase and keep it stored safely on an external encrypted hard drive or storage medium."
+  },
   "downloadStateLogs": {
     "message": "Download State Logs"
   },
@@ -611,6 +623,9 @@
   "importAccountMsg": {
     "message": " Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts "
   },
+  "importAccountSeedPhrase": {
+    "message": "Import an Account with Seed Phrase"
+  },
   "importAnAccount": {
     "message": "Import an account"
   },
@@ -624,6 +639,9 @@
   "importUsingSeed": {
     "message": "Import using account seed phrase"
   },
+  "importWithSeedPhrase": {
+    "message": "Import with seed phrase"
+  },
   "info": {
     "message": "Info"
   },
@@ -648,6 +666,9 @@
   "invalidAddressRecipient": {
     "message": "Recipient address is invalid"
   },
+  "knownAddressRecipient": {
+    "message": "Known contract address."
+  },
   "invalidGasParams": {
     "message": "Invalid Gas Parameters"
   },
@@ -728,6 +749,9 @@
   "mainnet": {
     "message": "Main Ethereum Network"
   },
+  "memorizePhrase": {
+    "message": "Memorize this phrase."
+  },
   "menu": {
     "message": "Menu"
   },
@@ -1093,12 +1117,24 @@
   "searchResults": {
     "message": "Search Results"
   },
+  "secretBackupPhrase": {
+    "message": "Secret Backup Phrase"
+  },
+  "secretBackupPhraseDescription": {
+    "message": "Your secret backup phrase makes it easy to back up and restore your account."
+  },
+  "secretBackupPhraseWarning": {
+    "message": "WARNING: Never disclose your backup phrase. Anyone with this phrase can take your Ether forever."
+  },
   "secretPhrase": {
     "message": "Enter your secret twelve word phrase here to restore your vault."
   },
   "secondsShorthand": {
     "message": "Sec"
   },
+  "seedPhrasePlaceholder": {
+    "message": "Separate each word with a single space"
+  },
   "seedPhraseReq": {
     "message": "Seed phrases are 12 words long"
   },
@@ -1108,6 +1144,9 @@
   "selectCurrency": {
     "message": "Select Currency"
   },
+  "selectEachPhrase": {
+    "message": "Please select each phrase in order to make sure it is correct."
+  },
   "selectLocale": {
     "message": "Select Locale"
   },
@@ -1255,6 +1294,9 @@
   "step3HardwareWalletMsg": {
     "message": "Use your hardware account like you would with any Ethereum account. Log in to dApps, send Eth, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties."
   },
+  "storePhrase": {
+    "message": "Store this phrase in a password manager like 1Password."
+  },
   "submit": {
     "message": "Submit"
   },
@@ -1276,6 +1318,9 @@
   "testFaucet": {
     "message": "Test Faucet"
   },
+  "tips": {
+    "message": "Tips"
+  },
   "to": {
     "message": "To"
   },
@@ -1474,6 +1519,9 @@
   "whatsThis": {
     "message": "What's this?"
   },
+  "writePhrase": {
+    "message": "Write this phrase on a piece of paper and store in a secure location. If you want even more security, write it down on multiple pieces of paper and store each in 2 - 3 different locations."
+  },
   "yesLetsTry": {
     "message": "Yes, let's try"
   },
@@ -1489,6 +1537,15 @@
   "yourPrivateSeedPhrase": {
     "message": "Your private seed phrase"
   },
+  "yourUniqueAccountImage": {
+    "message": "Your unique account image"
+  },
+  "yourUniqueAccountImageDescription1": {
+    "message": "This image was programmatically generated for you by your new account number."
+  },
+  "yourUniqueAccountImageDescription2": {
+    "message": "You’ll see this image everytime you need to confirm a transaction."
+  },
   "zeroGasPriceOnSpeedUpError": {
     "message":"Zero gas price on speed up"
   }