m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

do not display extension id in connection modal (#8699)

Browse Source
This commit is contained in:
Brad Decker 2020-05-29 12:12:14 -05:00 committed by GitHub
parent ad85382824
commit e481166052
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/_locales/en/messages.json
View File

@ -452,6 +452,9 @@
"currencyConversion": {
"message": "Currency Conversion"
},
"currentExtension": {
"message": "Current extension page"
},
"currentLanguage": {
"message": "Current Language"
},

4
ui/app/pages/connected-accounts/connected-accounts.component.js
View File

@ -20,6 +20,7 @@ export default class ConnectedAccounts extends PureComponent {
addPermittedAccount: PropTypes.func.isRequired,
connectedAccounts: PropTypes.array.isRequired,
permissions: PropTypes.array,
isActiveTabExtension: PropTypes.bool.isRequired,
selectedAddress: PropTypes.string.isRequired,
removePermittedAccount: PropTypes.func.isRequired,
setSelectedAddress: PropTypes.func.isRequired,
@ -34,6 +35,7 @@ export default class ConnectedAccounts extends PureComponent {
const {
accountToConnect,
activeTabOrigin,
isActiveTabExtension,
addPermittedAccount,
connectedAccounts,
history,
@ -50,7 +52,7 @@ export default class ConnectedAccounts extends PureComponent {
return (
<Popover
title={activeTabOrigin}
title={isActiveTabExtension ? t('currentExtension') : activeTabOrigin}
subtitle={connectedAccounts.length ? connectedAccountsDescription : t('connectedAccountsEmptyDescription')}
onClose={() => history.push(DEFAULT_ROUTE)}
footerClassName="connected-accounts__footer"

4
ui/app/pages/connected-accounts/connected-accounts.container.js
View File

@ -8,6 +8,8 @@ import {
} from '../../selectors'
import { addPermittedAccount, removePermittedAccount, setSelectedAddress } from '../../store/actions'
const EXT_PROTOCOLS = ['chrome-extension:', 'moz-extension:']
const mapStateToProps = (state) => {
const { activeTab } = state
const accountToConnect = getAccountToConnectToActiveTab(state)
@ -15,8 +17,10 @@ const mapStateToProps = (state) => {
const permissions = getPermissionsForActiveTab(state)
const selectedAddress = getSelectedAddress(state)
const isActiveTabExtension = EXT_PROTOCOLS.includes(activeTab.protocol)
return {
accountToConnect,
isActiveTabExtension,
activeTabOrigin: activeTab.origin,
connectedAccounts,
permissions,