Skip to content

Commit

Permalink
Version Bump (#5909)
Browse files Browse the repository at this point in the history
* Adds new gas customization modal container (without content)

* Adds the content of the advanced tab - w/o chart or dynamic content - to gas customize modal.

* Use correct message key in gas-modal-page-container.component.js

* Use BEM for css in gas-modal-page-container

* Split advanced-tab-content.component.js  render() method into smaller pieces; add translations to the same file.

* Remove gas slider from advance-tab-content.component

* Add tests for advanced-tab-component.js and subcomponents.

* Improve styling of advanced-tab-content gasInput row

* Adds basic tab content to gas customizer, with styled button group (static, for now).

* Connect the gas-button-group component to redux and a live api.

* Improvements to propdefaults in button-group.component and basic-tab-content.component

* Styling fixes for gas customization advanced tab content.

* Adds gas-duck.test.js tests.

* Connects remained of the gas customization component to redux.

* Integrate gas buttons with the send screen.

* Test updates and additions for button integration with send screen.

* Adds redesign for the customize gas advanced tab.

* Adds not yet functional gas price chart.

* Gas price chart improvements, redesign, bug fixes, and set up to receive external data

* Read only connection of gas price chart to redux

* Clean up for advanced gas tab customization changes.

* Complete integration of gas chart with redux.

* Add control arrows to advanced gas tab inputs.

* Lint and unit test fixes.

* Clean up gas chart code.

* Update tests, plus some lint fixes, for gas-price-chart

* Improve data management and tests for gas-modal-page-container price estimates.

* Clean up for mmui-i11-custom-gas-price-chart branch

* Redesign of gas customization basic tab.

* Adds createSpeedUpTransaction to txController

* Connect gas price chart to gas station api.

* Adds speed up slide-in gas customization sidebar

* Update e2e tests for new gas customization modal.

* Fixes for components that break e2e gas customization tests, plus unit test updates.

* Remove gas customization integration tests (in favour of e2e tests)

* Add gas data to integration test json data set.

* Add c3 and d3 to the separate dependencies bundle.

* Make gas customization modal responsive.

* Fix "fastest" translation message; change to sentence case

* Uses more reliable api on main send screen; caches basic api results in modal

* Add loading spinners when waiting for APIs in the gas customization modal

* Modify results of API data to better fit gas chart: remove outliers, pad data

* Clear custom gas data on hiding of gas customization modal.

* Improve responsiveness of customize speed up slider.

* Final gas customization fixes

* Fix styling of send screen in extension view when hex data on.

* Replace height: 100% rule with workaround for flexbox quirks

* Fill in more Polish message translations

* Update lockfile to fix errors

npm has informed me that the lockfile has "errors":

    npm ERR! code ELOCKVERIFY
    npm ERR! Errors were found in your package-lock.json, run  npm install  to fix them.
    npm ERR!     Missing: c3@^0.6.7
    npm ERR!     Invalid: lock file's d3@3.5.17 does not satisfy d3@^5.7.0

* circleci: Disable npm audit when installing packages

Auditing packages when installing here doesn't help anyone as the summary
isn't visible and vulnerabilities don't produce a non-zero exit code. We
will have `npm audit` as an extra CI job.

* npm audit fix

* circleci: Replace nsp with npm audit

Refs #4751

* Remove beefy dependency and its usages

Refs #4768
Refs #5389

This changeset removes the beefy package that:

1. Was last published 2 yrs ago
2. Brought with it 1 moderate and 1 critical vulnerability
3. Was only used in scripts that no longer work

* npm uninstall open

* Update ganache-core to mitigate vuln

                       === npm audit security report ===

> # Run  npm install --save-dev ganache-core@2.3.1  to resolve 1 vulnerability
┌───────────────┬──────────────────────────────────────────────────────────────┐
│ Moderate      │ Memory Exposure                                              │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ Package       │ bl                                                           │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ Dependency of │ ganache-core [dev]                                           │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ Path          │ ganache-core > level-sublevel > levelup > bl                 │
├───────────────┼──────────────────────────────────────────────────────────────┤
│ More info     │ https://nodesecurity.io/advisories/596                       │
└───────────────┴──────────────────────────────────────────────────────────────┘

* Deduplicate package.json file

From `npm install`:

> npm WARN The package css-loader is included as both a dev and production dependency.
> npm WARN The package eslint-plugin-react is included as both a dev and production dependency.
> npm WARN The package file-loader is included as both a dev and production dependency.
> npm WARN The package gulp is included as both a dev and production dependency.

It's also worth noting that the Gulp version we were using was inconsistent and there is
a published v4 release on GitHub.

* Fix race condition in network controller lookup() method.

* Group transactions by nonce (#5886)

* fix formatting of 32-byte strings in personal_sign (#5878)

* Bump json-rpc-engine to v4.0.0

* Bump package lock, mostly to https links

* Improve ux for low gas price set (#5862)

* Show user warning if they set gas price below safelow minimum, error if 0.

* Properly cache basic price estimate data.

* Default retry price to recommended price if original price was 0x0

* Use mock fetch in send-new-ui integration tests.

* Show Failed transaction in the browser notification for on-chain failures (#5904)

* Changelog and version bump for 5.2.0
  • Loading branch information
tmashuang authored and danfinlay committed Dec 11, 2018
1 parent ed9bfdc commit 2f5abd9
Show file tree
Hide file tree
Showing 153 changed files with 11,753 additions and 3,109 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 0 additions & 7 deletions .nsprc

This file was deleted.

10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
93 changes: 84 additions & 9 deletions app/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
},
Expand Down Expand Up @@ -65,6 +68,9 @@
"address": {
"message": "Address"
},
"advancedOptions": {
"message": "Advanced Options"
},
"addCustomToken": {
"message": "Add custom token"
},
Expand All @@ -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"
Expand Down Expand Up @@ -115,6 +127,9 @@
"available": {
"message": "Available"
},
"average": {
"message": "Average"
},
"back": {
"message": "Back"
},
Expand All @@ -127,6 +142,9 @@
"balanceIsInsufficientGas": {
"message": "Insufficient balance for current gas total"
},
"basic": {
"message": "Basic"
},
"beta": {
"message": "BETA"
},
Expand Down Expand Up @@ -170,6 +188,9 @@
"cancellationGasFee": {
"message": "Cancellation Gas Fee"
},
"cancelled": {
"message": "Cancelled"
},
"cancelN": {
"message": "Cancel all $1 transactions"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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."
},
Expand Down Expand Up @@ -689,6 +725,9 @@
"missingYourTokens": {
"message": "Don't see your tokens?"
},
"minutesShorthand": {
"message": "Min"
},
"myAccounts": {
"message": "My Accounts"
},
Expand Down Expand Up @@ -755,6 +794,12 @@
"optionalNickname": {
"message": "Nickname (optional)"
},
"newTotal": {
"message": "New Total"
},
"newTransactionFee": {
"message": "New Transaction Fee"
},
"next": {
"message": "Next"
},
Expand Down Expand Up @@ -820,6 +865,9 @@
"parameters": {
"message": "Parameters"
},
"originalTotal": {
"message": "Original Total"
},
"password": {
"message": "Password"
},
Expand Down Expand Up @@ -993,6 +1041,9 @@
"save": {
"message": "Save"
},
"slow": {
"message": "Slow"
},
"saveAsCsvFile": {
"message": "Save as CSV File"
},
Expand All @@ -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"
},
Expand All @@ -1039,6 +1093,9 @@
"send": {
"message": "Send"
},
"sendAmount": {
"message": "Send Amount"
},
"sendETH": {
"message": "Send ETH"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand All @@ -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"
},
Expand Down Expand Up @@ -1293,9 +1371,6 @@
"unknown": {
"message": "Unknown"
},
"unknownFunction": {
"message": "Unknown Function"
},
"unknownNetwork": {
"message": "Unknown Private Network"
},
Expand Down
9 changes: 9 additions & 0 deletions app/_locales/pl/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@
"clickCopy": {
"message": "Kliknij żeby skopiować"
},
"clickToAdd": {
"message": "Przycisnij $1, aby dodać go do swojego konta"
},
"close": {
"message": "Zamknij"
},
Expand Down Expand Up @@ -337,6 +340,9 @@
"exchangeRate": {
"message": "Kurs wymiany"
},
"expandView": {
"message": "Rozwiń widok"
},
"exportPrivateKey": {
"message": "Eksportuj klucz prywatny"
},
Expand Down Expand Up @@ -596,6 +602,9 @@
"min": {
"message": "Minimum"
},
"missingYourTokens": {
"message": "Nie widzisz swoich token?"
},
"myAccounts": {
"message": "Moje konta"
},
Expand Down
3 changes: 3 additions & 0 deletions app/images/icons/cancelled.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/images/icons/confirm.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/icons/error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/images/icons/new.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2f5abd9

Please sign in to comment.