diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | README.md | 25 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | docs/README.md | 11 | ||||
| -rw-r--r-- | notices/archive/notice_4.md | 3 | ||||
| -rw-r--r-- | ui/app/components/transaction-list/transaction-list.component.js | 6 |
6 files changed, 25 insertions, 28 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 06a4321b3..7fc182db0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Current Develop Branch +## 5.2.2 Wed Dec 12 2018 + +- [#5925](https://github.com/MetaMask/metamask-extension/pull/5925): Fix speed up button not showing for transactions with the lowest nonce +- [#5923](https://github.com/MetaMask/metamask-extension/pull/5923): Update the Phishing Warning notice text to not use inline URLs +- [#5919](https://github.com/MetaMask/metamask-extension/pull/5919): Fix some styling and translations in the gas customization modal + ## 5.2.1 Wed Dec 12 2018 - [#5917] bugfix: Ensures that advanced tab gas limit reflects tx gas limit @@ -1,30 +1,13 @@ # MetaMask Browser Extension [](https://circleci.com/gh/MetaMask/metamask-extension) [](https://coveralls.io/github/MetaMask/metamask-extension?branch=master) [](https://waffle.io/MetaMask/metamask-extension) -## Support +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). -If you're a user seeking support, [here is our 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. -## Introduction +To learn how to develop MetaMask-compatible applications, visit our [Developer Docs](https://metamask.github.io/metamask-docs/). -[Mission Statement](./MISSION.md) - -[Documentation](https://metamask.github.io/metamask-docs/) - -[Internal Code Documentation](./docs#documentation) - -## Developing Compatible Dapps - -If you're a web dapp developer, we've got two types of guides for you: - -### New Dapp Developers - -- We recommend this [Learning Solidity](https://karl.tech/learning-solidity-part-1-deploy-a-contract/) tutorial series by Karl Floersch. -- We wrote a (slightly outdated now) gentle introduction on [Developing Dapps with Truffle and MetaMask](https://medium.com/metamask/developing-ethereum-dapps-with-truffle-and-metamask-aa8ad7e363ba). - -### Current Dapp Developers - -- If you have a Dapp, and you want to ensure compatibility, [here is our guide on building MetaMask-compatible Dapps](https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md) +To learn how to contribute to the MetaMask project itself, visit our [Internal Docs](https://github.com/MetaMask/metamask-extension/tree/develop/docs). ## Building locally diff --git a/app/manifest.json b/app/manifest.json index 047a1db43..4f4598a18 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "5.2.1", + "version": "5.2.2", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", diff --git a/docs/README.md b/docs/README.md index 0739cfa46..fd26b0c20 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,5 +1,14 @@ # Documentation +These docs relate to how to contribute to the MetaMask project itself. + +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. + +To learn how to develop MetaMask-compatible applications, visit our [Developer Docs](https://metamask.github.io/metamask-docs/). - [How to add custom build to Chrome](./add-to-chrome.md) - [How to add custom build to Firefox](./add-to-firefox.md) @@ -10,4 +19,4 @@ - [How to add new networks to the Provider Menu](./adding-new-networks.md) - [How to manage notices that appear when the app starts up](./notices.md) - [How to port MetaMask to a new platform](./porting_to_new_environment.md) -- [How to generate a visualization of this repository's development](./development-visualization.md)
\ No newline at end of file +- [How to generate a visualization of this repository's development](./development-visualization.md) diff --git a/notices/archive/notice_4.md b/notices/archive/notice_4.md index afe29eed2..6493237cf 100644 --- a/notices/archive/notice_4.md +++ b/notices/archive/notice_4.md @@ -2,5 +2,4 @@ Dear MetaMask Users, There have been several instances of high-profile legitimate websites such as BTC Manager and Games Workshop that have had their websites temporarily compromised. This involves showing a fake MetaMask window on the page asking for user's seed phrases. MetaMask will never open itself to ask you for your seed phrase, and users are encouraged to report these instances immediately to either [our phishing blacklist](https://github.com/MetaMask/eth-phishing-detect/issues) or our support email at [support@metamask.io](mailto:support@metamask.io). -Please read our full article on this ongoing issue at [https://medium.com/metamask/new-phishing-strategy-becoming-common-1b1123837168](https://medium.com/metamask/new-phishing-strategy-becoming-common-1b1123837168). - +[Please read our full article on this ongoing issue over at Medium.](https://medium.com/metamask/new-phishing-strategy-becoming-common-1b1123837168) diff --git a/ui/app/components/transaction-list/transaction-list.component.js b/ui/app/components/transaction-list/transaction-list.component.js index c1e3b3d1c..ddab3b290 100644 --- a/ui/app/components/transaction-list/transaction-list.component.js +++ b/ui/app/components/transaction-list/transaction-list.component.js @@ -62,7 +62,7 @@ export default class TransactionList extends PureComponent { </div> { pendingTransactions.map((transactionGroup, index) => ( - this.renderTransaction(transactionGroup, index, true, index === pendingLength - 1) + this.renderTransaction(transactionGroup, index, true) )) } </div> @@ -84,7 +84,7 @@ export default class TransactionList extends PureComponent { ) } - renderTransaction (transactionGroup, index, isPendingTx = false, isEarliestNonce = false) { + renderTransaction (transactionGroup, index, isPendingTx = false) { const { selectedToken, assetImages } = this.props const { transactions = [] } = transactionGroup @@ -98,7 +98,7 @@ export default class TransactionList extends PureComponent { <TransactionListItem transactionGroup={transactionGroup} key={`${transactionGroup.nonce}:${index}`} - showRetry={isPendingTx && this.shouldShowRetry(transactionGroup, isEarliestNonce)} + showRetry={isPendingTx && this.shouldShowRetry(transactionGroup, index === 0)} showCancel={isPendingTx && this.shouldShowCancel(transactionGroup)} token={selectedToken} assetImages={assetImages} |