mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
do not display extension id in connection modal (#8699)
This commit is contained in:
parent
ad85382824
commit
e481166052
@ -452,6 +452,9 @@
|
|||||||
"currencyConversion": {
|
"currencyConversion": {
|
||||||
"message": "Currency Conversion"
|
"message": "Currency Conversion"
|
||||||
},
|
},
|
||||||
|
"currentExtension": {
|
||||||
|
"message": "Current extension page"
|
||||||
|
},
|
||||||
"currentLanguage": {
|
"currentLanguage": {
|
||||||
"message": "Current Language"
|
"message": "Current Language"
|
||||||
},
|
},
|
||||||
|
@ -20,6 +20,7 @@ export default class ConnectedAccounts extends PureComponent {
|
|||||||
addPermittedAccount: PropTypes.func.isRequired,
|
addPermittedAccount: PropTypes.func.isRequired,
|
||||||
connectedAccounts: PropTypes.array.isRequired,
|
connectedAccounts: PropTypes.array.isRequired,
|
||||||
permissions: PropTypes.array,
|
permissions: PropTypes.array,
|
||||||
|
isActiveTabExtension: PropTypes.bool.isRequired,
|
||||||
selectedAddress: PropTypes.string.isRequired,
|
selectedAddress: PropTypes.string.isRequired,
|
||||||
removePermittedAccount: PropTypes.func.isRequired,
|
removePermittedAccount: PropTypes.func.isRequired,
|
||||||
setSelectedAddress: PropTypes.func.isRequired,
|
setSelectedAddress: PropTypes.func.isRequired,
|
||||||
@ -34,6 +35,7 @@ export default class ConnectedAccounts extends PureComponent {
|
|||||||
const {
|
const {
|
||||||
accountToConnect,
|
accountToConnect,
|
||||||
activeTabOrigin,
|
activeTabOrigin,
|
||||||
|
isActiveTabExtension,
|
||||||
addPermittedAccount,
|
addPermittedAccount,
|
||||||
connectedAccounts,
|
connectedAccounts,
|
||||||
history,
|
history,
|
||||||
@ -50,7 +52,7 @@ export default class ConnectedAccounts extends PureComponent {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Popover
|
<Popover
|
||||||
title={activeTabOrigin}
|
title={isActiveTabExtension ? t('currentExtension') : activeTabOrigin}
|
||||||
subtitle={connectedAccounts.length ? connectedAccountsDescription : t('connectedAccountsEmptyDescription')}
|
subtitle={connectedAccounts.length ? connectedAccountsDescription : t('connectedAccountsEmptyDescription')}
|
||||||
onClose={() => history.push(DEFAULT_ROUTE)}
|
onClose={() => history.push(DEFAULT_ROUTE)}
|
||||||
footerClassName="connected-accounts__footer"
|
footerClassName="connected-accounts__footer"
|
||||||
|
@ -8,6 +8,8 @@ import {
|
|||||||
} from '../../selectors'
|
} from '../../selectors'
|
||||||
import { addPermittedAccount, removePermittedAccount, setSelectedAddress } from '../../store/actions'
|
import { addPermittedAccount, removePermittedAccount, setSelectedAddress } from '../../store/actions'
|
||||||
|
|
||||||
|
const EXT_PROTOCOLS = ['chrome-extension:', 'moz-extension:']
|
||||||
|
|
||||||
const mapStateToProps = (state) => {
|
const mapStateToProps = (state) => {
|
||||||
const { activeTab } = state
|
const { activeTab } = state
|
||||||
const accountToConnect = getAccountToConnectToActiveTab(state)
|
const accountToConnect = getAccountToConnectToActiveTab(state)
|
||||||
@ -15,8 +17,10 @@ const mapStateToProps = (state) => {
|
|||||||
const permissions = getPermissionsForActiveTab(state)
|
const permissions = getPermissionsForActiveTab(state)
|
||||||
const selectedAddress = getSelectedAddress(state)
|
const selectedAddress = getSelectedAddress(state)
|
||||||
|
|
||||||
|
const isActiveTabExtension = EXT_PROTOCOLS.includes(activeTab.protocol)
|
||||||
return {
|
return {
|
||||||
accountToConnect,
|
accountToConnect,
|
||||||
|
isActiveTabExtension,
|
||||||
activeTabOrigin: activeTab.origin,
|
activeTabOrigin: activeTab.origin,
|
||||||
connectedAccounts,
|
connectedAccounts,
|
||||||
permissions,
|
permissions,
|
||||||
|
Loading…
Reference in New Issue
Block a user