Version Bump

.circleci/config.yml

@@ -91,7 +91,7 @@ jobs:
       - run:
           name: Install npm 6 + deps via npm
           command: |
-           sudo npm install -g npm@6 && npm install --no-save
+           sudo npm install -g npm@6 && npm install --no-save --no-audit
       - persist_to_workspace:
           root: .
           paths:
@@ -174,7 +174,7 @@ jobs:
           at: .
       - run:
           name: Test
-          command: npx nsp check
+          command: sudo npm install -g npm@6 && npm audit
 
   test-e2e-beta-drizzle:
     docker:

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Current Develop Branch
 
+## 5.2.0 Mon Dec 11 2018
+
+- [#5704] Implements new gas customization features for sending, confirming and speeding up transactions
+- [#5886] Groups transactions - speed up, cancel and original - by nonce in the transaction history list
+- [#5892] bugfix: eliminates infinite spinner issues caused by switching quickly from a loading network that ultimately fails to resolve
+- [$5902] bugfix: provider crashes caused caching issues in `json-rpc-engine`. Fixed in (https://github.com/MetaMask/json-rpc-engine/commit/6de511afbd03ccef4550ea43ff4010b7d7a84039)
+
 ## 5.1.0 Mon Dec 03 2018
 
 - [#5860](https://github.com/MetaMask/metamask-extension/pull/5860): Fixed an infinite spinner bug.
@@ -11,12 +18,13 @@
 
 ## 5.0.4 Thu Nov 29 2018
 
+- [#5878](https://github.com/MetaMask/metamask-extension/pull/5878): Formats 32-length byte strings passed to personal_sign as hex, rather than UTF8.
 - [#5840](https://github.com/MetaMask/metamask-extension/pull/5840): transactions/tx-gas-utils - add the acctual response for eth_getCode for NO_CONTRACT_ERROR's && add a debug object to simulationFailed
 - [#5848](https://github.com/MetaMask/metamask-extension/pull/5848): Soften accusatory language on phishing warning
 - [#5835](https://github.com/MetaMask/metamask-extension/pull/5835): Open full-screen UI on install
 - Locked versions for some dependencies to avoid possible issues from event-stream hack.
 - [#5831](https://github.com/MetaMask/metamask-extension/pull/5831): Hide app-header when provider request pending
-- [#5786](https://github.com/MetaMask/metamask-extension/pull/5786): * transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump
+- [#5786](https://github.com/MetaMask/metamask-extension/pull/5786): * transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump
 - [#5801](https://github.com/MetaMask/metamask-extension/pull/5801): transactions - ensure err is defined when setting tx failed
 - [#5792](https://github.com/MetaMask/metamask-extension/pull/5792): Consider HW Wallets for signTypedMessage
 - [#5829](https://github.com/MetaMask/metamask-extension/pull/5829): Show disabled cursor in .network-disabled state

app/_locales/en/messages.json

@@ -17,6 +17,9 @@
   "confirmClear": {
     "message": "Are you sure you want to clear approved websites?"
   },
+  "contractInteraction": {
+    "message": "Contract Interaction"
+  },
   "clearApprovalDataSuccess": {
     "message": "Approved website data cleared successfully."
   },
@@ -65,6 +68,9 @@
   "address": {
     "message": "Address"
   },
+  "advancedOptions": {
+    "message": "Advanced Options"
+  },
   "addCustomToken": {
     "message": "Add custom token"
   },
@@ -80,12 +86,18 @@
   "addAcquiredTokens": {
     "message": "Add the tokens you've acquired using MetaMask"
   },
+  "advanced": {
+    "message": "Advanced"
+  },
   "amount": {
     "message": "Amount"
   },
   "amountPlusGas": {
     "message": "Amount + Gas"
   },
+  "amountPlusTxFee": {
+    "message": "Amount + TX Fee"
+  },
   "appDescription": {
     "message": "Ethereum Browser Extension",
     "description": "The description of the application"
@@ -115,6 +127,9 @@
   "available": {
     "message": "Available"
   },
+  "average": {
+    "message": "Average"
+  },
   "back": {
     "message": "Back"
   },
@@ -127,6 +142,9 @@
   "balanceIsInsufficientGas": {
     "message": "Insufficient balance for current gas total"
   },
+  "basic": {
+    "message": "Basic"
+  },
   "beta": {
     "message": "BETA"
   },
@@ -170,6 +188,9 @@
   "cancellationGasFee": {
     "message": "Cancellation Gas Fee"
   },
+  "cancelled": {
+    "message": "Cancelled"
+  },
   "cancelN": {
     "message": "Cancel all $1 transactions"
   },
@@ -303,6 +324,9 @@
   "customGas": {
     "message": "Customize Gas"
   },
+  "customGasSubTitle": {
+    "message": "Increasing fee may decrease processing times, but it is not guaranteed."
+  },
   "customToken": {
     "message": "Custom Token"
   },
@@ -427,6 +451,15 @@
   "failed": {
     "message": "Failed"
   },
+  "fast": {
+    "message": "Fast"
+  },
+  "fastest": {
+    "message": "Fastest"
+  },
+  "feeChartTitle": {
+    "message": "Live Transaction Fee Predictions"
+  },
   "fiat": {
     "message": "Fiat",
     "description": "Exchange type"
@@ -481,6 +514,9 @@
   "gasPrice": {
     "message": "Gas Price (GWEI)"
   },
+  "gasPriceNoDenom": {
+    "message": "Gas Price"
+  },
   "gasPriceCalculation": {
     "message": "We calculate the suggested gas prices based on network success rates."
   },
@@ -689,6 +725,9 @@
   "missingYourTokens": {
     "message": "Don't see your tokens?"
   },
+  "minutesShorthand": {
+    "message": "Min"
+  },
   "myAccounts": {
     "message": "My Accounts"
   },
@@ -755,6 +794,12 @@
   "optionalNickname": {
     "message": "Nickname (optional)"
   },
+  "newTotal": {
+    "message": "New Total"
+  },
+  "newTransactionFee": {
+    "message": "New Transaction Fee"
+  },
   "next": {
     "message": "Next"
   },
@@ -820,6 +865,9 @@
   "parameters": {
     "message": "Parameters"
   },
+  "originalTotal": {
+    "message": "Original Total"
+  },
   "password": {
     "message": "Password"
   },
@@ -993,6 +1041,9 @@
   "save": {
     "message": "Save"
   },
+  "slow": {
+    "message": "Slow"
+  },
   "saveAsCsvFile": {
     "message": "Save as CSV File"
   },
@@ -1018,6 +1069,9 @@
   "secretPhrase": {
     "message": "Enter your secret twelve word phrase here to restore your vault."
   },
+  "secondsShorthand": {
+    "message": "Sec"
+  },
   "seedPhraseReq": {
     "message": "Seed phrases are 12 words long"
   },
@@ -1039,6 +1093,9 @@
   "send": {
     "message": "Send"
   },
+  "sendAmount": {
+    "message": "Send Amount"
+  },
   "sendETH": {
     "message": "Send ETH"
   },
@@ -1126,6 +1183,12 @@
   "speedUpSubtitle": {
     "message": "Increase your gas price to attempt to overwrite and speed up your transaction"
   },
+  "speedUpCancellation": {
+    "message": "Speed up this cancellation"
+  },
+  "speedUpTransaction": {
+    "message": "Speed up this transaction"
+  },
   "status": {
     "message": "Status"
   },
@@ -1212,29 +1275,38 @@
     "message": "transaction"
   },
   "transactionConfirmed": {
-    "message": "Transaction confirmed on $2."
+    "message": "Transaction confirmed at $2."
   },
   "transactionCreated": {
-    "message": "Transaction created with a value of $1 on $2."
+    "message": "Transaction created with a value of $1 at $2."
   },
   "transactionWithNonce": {
     "message": "Transaction $1"
   },
   "transactionDropped": {
-    "message": "Transaction dropped on $2."
+    "message": "Transaction dropped at $2."
   },
   "transactionSubmitted": {
-    "message": "Transaction submitted on $2."
+    "message": "Transaction submitted with gas fee of $1 at $2."
+  },
+  "transactionResubmitted": {
+    "message": "Transaction resubmitted with gas fee increased to $1 at $2"
   },
   "transactionUpdated": {
-    "message": "Transaction updated on $2."
+    "message": "Transaction updated at $2."
   },
   "transactionUpdatedGas": {
-    "message": "Transaction updated with a gas price of $1 on $2."
+    "message": "Transaction updated with a gas fee of $1 at $2."
   },
   "transactionErrored": {
     "message": "Transaction encountered an error."
   },
+  "transactionCancelAttempted": {
+    "message": "Transaction cancel attempted with gas fee of $1 at $2"
+  },
+  "transactionCancelSuccess": {
+    "message": "Transaction successfully cancelled at $2"
+  },
   "transactions": {
     "message": "transactions"
   },
@@ -1244,12 +1316,18 @@
   "transactionErrorNoContract": {
     "message": "Trying to call a function on a non-contract address."
   },
+  "transactionFee": {
+    "message": "Transaction Fee"
+  },
   "transactionMemo": {
     "message": "Transaction memo (optional)"
   },
   "transactionNumber": {
     "message": "Transaction Number"
   },
+  "transactionTime": {
+    "message": "Transaction Time"
+  },
   "transfer": {
     "message": "Transfer"
   },
@@ -1293,9 +1371,6 @@
   "unknown": {
     "message": "Unknown"
   },
-  "unknownFunction": {
-    "message": "Unknown Function"
-  },
   "unknownNetwork": {
     "message": "Unknown Private Network"
   },

app/_locales/pl/messages.json

@@ -119,6 +119,9 @@
   "clickCopy": {
     "message": "Kliknij żeby skopiować"
   },
+  "clickToAdd": {
+    "message": "Przycisnij $1, aby dodać go do swojego konta"
+  },
   "close": {
     "message": "Zamknij"
   },
@@ -337,6 +340,9 @@
   "exchangeRate": {
     "message": "Kurs wymiany"
   },
+  "expandView": {
+    "message": "Rozwiń widok"
+  },
   "exportPrivateKey": {
     "message": "Eksportuj klucz prywatny"
   },
@@ -596,6 +602,9 @@
   "min": {
     "message": "Minimum"
   },
+  "missingYourTokens": {
+    "message": "Nie widzisz swoich token?"
+  },
   "myAccounts": {
     "message": "Moje konta"
   },