aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2019-03-30 02:27:16 +0800
committerGitHub <noreply@github.com>2019-03-30 02:27:16 +0800
commit87f393eb31c5172a246db6be37331f8bed9d096e (patch)
treef0f06ea848f02c0137b3d9774b7cae4a3c9cd982
parentadcf03eacc4ec5b6dc0e753ce81b2df6071e1f75 (diff)
parent57bcf1449cccbe5f0fe81ebe475da7a25b29c18b (diff)
downloadtangerine-wallet-browser-87f393eb31c5172a246db6be37331f8bed9d096e.tar.gz
tangerine-wallet-browser-87f393eb31c5172a246db6be37331f8bed9d096e.tar.zst
tangerine-wallet-browser-87f393eb31c5172a246db6be37331f8bed9d096e.zip
Merge pull request #6375 from MetaMask/Version-6.3.1v6.3.1
Version 6.3.1
-rw-r--r--CHANGELOG.md6
-rw-r--r--app/manifest.json2
-rw-r--r--ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js4
-rw-r--r--ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.container.js6
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bada9b8b5..98ed6ac69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
## Current Develop Branch
+## 6.3.1 Fri Mar 26 2019
+
+- [#6353](https://github.com/MetaMask/metamask-extension/pull/6353): Open restore vault in full screen when clicked from popup
+- [#6372](https://github.com/MetaMask/metamask-extension/pull/6372): Prevents duplicates of account addresses from showing in send screen "To" dropdown
+- [#6374](https://github.com/MetaMask/metamask-extension/pull/6374): Ensures users are placed on correct confirm screens even when registry service fails
+
## 6.3.0 Mon Mar 25 2019
- [#6300](https://github.com/MetaMask/metamask-extension/pull/6300): Gas chart hidden on custom networks
diff --git a/app/manifest.json b/app/manifest.json
index 6837adf61..941842636 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
- "version": "6.3.0",
+ "version": "6.3.1",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "__MSG_appDescription__",
diff --git a/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js b/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
index cd471b822..25f2402f1 100644
--- a/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
+++ b/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
@@ -25,6 +25,7 @@ export default class ConfirmTransactionSwitch extends Component {
methodData: PropTypes.object,
fetchingData: PropTypes.bool,
isEtherTransaction: PropTypes.bool,
+ isTokenMethod: PropTypes.bool,
}
redirectToTransaction () {
@@ -33,6 +34,7 @@ export default class ConfirmTransactionSwitch extends Component {
methodData: { name },
fetchingData,
isEtherTransaction,
+ isTokenMethod,
} = this.props
const { id, txParams: { data } = {} } = txData
@@ -45,7 +47,7 @@ export default class ConfirmTransactionSwitch extends Component {
return <Redirect to={{ pathname }} />
}
- if (isEtherTransaction) {
+ if (isEtherTransaction && !isTokenMethod) {
const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_SEND_ETHER_PATH}`
return <Redirect to={{ pathname }} />
}
diff --git a/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.container.js b/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.container.js
index 7f2c36af2..8213f0964 100644
--- a/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.container.js
+++ b/ui/app/pages/confirm-transaction-switch/confirm-transaction-switch.container.js
@@ -1,5 +1,10 @@
import { connect } from 'react-redux'
import ConfirmTransactionSwitch from './confirm-transaction-switch.component'
+import {
+ TOKEN_METHOD_TRANSFER,
+ TOKEN_METHOD_APPROVE,
+ TOKEN_METHOD_TRANSFER_FROM,
+} from '../../helpers/constants/transactions'
const mapStateToProps = state => {
const {
@@ -16,6 +21,7 @@ const mapStateToProps = state => {
methodData,
fetchingData,
isEtherTransaction: !toSmartContract,
+ isTokenMethod: [TOKEN_METHOD_APPROVE, TOKEN_METHOD_TRANSFER, TOKEN_METHOD_TRANSFER_FROM].includes(methodData.name && methodData.name.toLowerCase()),
}
}