|
|
|
import React, { Component } from 'react';
|
|
|
|
import PropTypes from 'prop-types';
|
|
|
|
import { debounce } from 'lodash';
|
|
|
|
import Fuse from 'fuse.js';
|
|
|
|
import InputAdornment from '@material-ui/core/InputAdornment';
|
|
|
|
import classnames from 'classnames';
|
|
|
|
import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
|
|
|
|
import { EVENT } from '../../../../shared/constants/metametrics';
|
|
|
|
import { getEnvironmentType } from '../../../../app/scripts/lib/util';
|
|
|
|
import Identicon from '../../ui/identicon';
|
|
|
|
import SiteIcon from '../../ui/site-icon';
|
|
|
|
import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display';
|
|
|
|
import {
|
|
|
|
PRIMARY,
|
|
|
|
SUPPORT_LINK,
|
|
|
|
///: BEGIN:ONLY_INCLUDE_IN(beta,flask)
|
|
|
|
SUPPORT_REQUEST_LINK,
|
|
|
|
///: END:ONLY_INCLUDE_IN
|
|
|
|
} from '../../../helpers/constants/common';
|
|
|
|
import {
|
|
|
|
SETTINGS_ROUTE,
|
|
|
|
NEW_ACCOUNT_ROUTE,
|
|
|
|
IMPORT_ACCOUNT_ROUTE,
|
|
|
|
CONNECT_HARDWARE_ROUTE,
|
|
|
|
DEFAULT_ROUTE,
|
|
|
|
///: BEGIN:ONLY_INCLUDE_IN(flask)
|
|
|
|
NOTIFICATIONS_ROUTE,
|
|
|
|
///: END:ONLY_INCLUDE_IN
|
|
|
|
} from '../../../helpers/constants/routes';
|
|
|
|
import TextField from '../../ui/text-field';
|
|
|
|
import SearchIcon from '../../ui/search-icon';
|
|
|
|
import IconCheck from '../../ui/icon/icon-check';
|
|
|
|
import IconSpeechBubbles from '../../ui/icon/icon-speech-bubbles';
|
|
|
|
import IconConnect from '../../ui/icon/icon-connect';
|
|
|
|
import IconCog from '../../ui/icon/icon-cog';
|
|
|
|
import IconPlus from '../../ui/icon/icon-plus';
|
|
|
|
import IconImport from '../../ui/icon/icon-import';
|
|
|
|
|
|
|
|
import Button from '../../ui/button';
|
|
|
|
import KeyRingLabel from './keyring-label';
|
|
|
|
|
|
|
|
export function AccountMenuItem(props) {
|
|
|
|
const { icon, children, text, subText, className, onClick } = props;
|
|
|
|
|
|
|
|
const itemClassName = classnames('account-menu__item', className, {
|
|
|
|
'account-menu__item--clickable': Boolean(onClick),
|
|
|
|
});
|
|
|
|
return children ? (
|
|
|
|
<div className={itemClassName} onClick={onClick}>
|
|
|
|
{children}
|
|
|
|
</div>
|
|
|
|
) : (
|
|
|
|
<button className={itemClassName} onClick={onClick}>
|
|
|
|
{icon ? <div className="account-menu__item__icon">{icon}</div> : null}
|
|
|
|
{text ? <div className="account-menu__item__text">{text}</div> : null}
|
|
|
|
{subText ? (
|
|
|
|
<div className="account-menu__item__subtext">{subText}</div>
|
|
|
|
) : null}
|
|
|
|
</button>
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
AccountMenuItem.propTypes = {
|
|
|
|
icon: PropTypes.node,
|
|
|
|
children: PropTypes.node,
|
|
|
|
text: PropTypes.node,
|
|
|
|
subText: PropTypes.node,
|
|
|
|
onClick: PropTypes.func,
|
|
|
|
className: PropTypes.string,
|
|
|
|
};
|
|
|
|
|
|
|
|
export default class AccountMenu extends Component {
|
|
|
|
static contextTypes = {
|
|
|
|
t: PropTypes.func,
|
|
|
|
trackEvent: PropTypes.func,
|
|
|
|
};
|
|
|
|
|
|
|
|
static propTypes = {
|
|
|
|
shouldShowAccountsSearch: PropTypes.bool,
|
|
|
|
accounts: PropTypes.array,
|
|
|
|
history: PropTypes.object,
|
|
|
|
isAccountMenuOpen: PropTypes.bool,
|
|
|
|
keyrings: PropTypes.array,
|
|
|
|
lockMetamask: PropTypes.func,
|
|
|
|
selectedAddress: PropTypes.string,
|
|
|
|
showAccountDetail: PropTypes.func,
|
|
|
|
toggleAccountMenu: PropTypes.func,
|
Permission System 2.0 (#12243)
# Permission System 2.0
## Background
This PR migrates the extension permission system to [the new `PermissionController`](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions).
The original permission system, based on [`rpc-cap`](https://github.com/MetaMask/rpc-cap), introduced [`ZCAP-LD`](https://w3c-ccg.github.io/zcap-ld/)-like permissions to our JSON-RPC stack.
We used it to [implement](https://github.com/MetaMask/metamask-extension/pull/7004) what we called "LoginPerSite" in [version 7.7.0](https://github.com/MetaMask/metamask-extension/releases/tag/v7.7.0) of the extension, which enabled the user to choose which accounts, if any, should be exposed to each dapp.
While that was a worthwhile feature in and of itself, we wanted a permission _system_ in order to enable everything we are going to with Snaps.
Unfortunately, the original permission system was difficult to use, and necessitated the creation of the original `PermissionsController` (note the "s"), which was more or less a wrapper for `rpc-cap`.
With this PR, we shake off the yoke of the original permission system, in favor of the modular, self-contained, ergonomic, and more mature permission system 2.0.
Note that [the `PermissionController` readme](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions/README.md) explains how the new permission system works.
The `PermissionController` and `SubjectMetadataController` are currently shipped via `@metamask/snap-controllers`. This is a temporary state of affairs, and we'll move them to `@metamask/controllers` once they've landed in prod.
## Changes in Detail
First, the changes in this PR are not as big as they seem. Roughly half of the additions in this PR are fixtures in the test for the new migration (number 68), and a significant portion of the remaining ~2500 lines are due to find-and-replace changes in other test fixtures and UI files.
- The extension `PermissionsController` has been deleted, and completely replaced with the new `PermissionController` from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The original `PermissionsController` "domain metadata" functionality is now managed by the new `SubjectMetadataController`, also from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The permission activity and history log controller has been renamed `PermissionLogController` and has its own top-level state key, but is otherwise functionally equivalent to the existing implementation.
- Migration number 68 has been added to account for the new state changes.
- The tests in `app/scripts/controllers/permissions` have been migrated from `mocha` to `jest`.
Reviewers should focus their attention on the following files:
- `app/scripts/`
- `metamask-controller.js`
- This is where most of the integration work for the new `PermissionController` occurs.
Some functions that were internal to the original controller were moved here.
- `controllers/permissions/`
- `selectors.js`
- These selectors are for `ControllerMessenger` selector subscriptions. The actual subscriptions occur in `metamask-controller.js`. See the `ControllerMessenger` implementation for details.
- `specifications.js`
- The caveat and permission specifications are required by the new `PermissionController`, and are used to specify the `eth_accounts` permission and its JSON-RPC method implementation.
See the `PermissionController` readme for details.
- `migrations/068.js`
- The new state should be cross-referenced with the controllers that manage it.
The accompanying tests should also be thoroughly reviewed.
Some files may appear new but have just moved and/or been renamed:
- `app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js`
- This was previously implemented in `controllers/permissions/permissionsMethodMiddleware.js`.
- `test/mocks/permissions.js`
- A truncated version of `test/mocks/permission-controller.js`.
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
3 years ago
|
|
|
addressConnectedSubjectMap: PropTypes.object,
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
originOfCurrentTab: PropTypes.string,
|
|
|
|
///: BEGIN:ONLY_INCLUDE_IN(flask)
|
|
|
|
unreadNotificationsCount: PropTypes.number,
|
|
|
|
///: END:ONLY_INCLUDE_IN
|
|
|
|
};
|
|
|
|
|
|
|
|
accountsRef;
|
|
|
|
|
|
|
|
state = {
|
|
|
|
shouldShowScrollButton: false,
|
|
|
|
searchQuery: '',
|
|
|
|
};
|
|
|
|
|
|
|
|
addressFuse = new Fuse([], {
|
|
|
|
threshold: 0.55,
|
|
|
|
location: 0,
|
|
|
|
distance: 100,
|
|
|
|
maxPatternLength: 32,
|
|
|
|
minMatchCharLength: 1,
|
|
|
|
ignoreFieldNorm: true,
|
|
|
|
keys: [
|
|
|
|
{ name: 'name', weight: 0.5 },
|
|
|
|
{ name: 'address', weight: 0.5 },
|
|
|
|
],
|
|
|
|
});
|
|
|
|
|
|
|
|
componentDidUpdate(prevProps, prevState) {
|
|
|
|
const { isAccountMenuOpen: prevIsAccountMenuOpen } = prevProps;
|
|
|
|
const { searchQuery: prevSearchQuery } = prevState;
|
|
|
|
const { isAccountMenuOpen } = this.props;
|
|
|
|
const { searchQuery } = this.state;
|
|
|
|
|
|
|
|
if (!prevIsAccountMenuOpen && isAccountMenuOpen) {
|
|
|
|
this.setShouldShowScrollButton();
|
|
|
|
this.resetSearchQuery();
|
|
|
|
}
|
|
|
|
|
|
|
|
// recalculate on each search query change
|
|
|
|
// whether we can show scroll down button
|
|
|
|
if (isAccountMenuOpen && prevSearchQuery !== searchQuery) {
|
|
|
|
this.setShouldShowScrollButton();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
renderAccountsSearch() {
|
|
|
|
const handleChange = (e) => {
|
|
|
|
const val = e.target.value.length > 1 ? e.target.value : '';
|
|
|
|
this.setSearchQuery(val);
|
|
|
|
};
|
|
|
|
|
|
|
|
const inputAdornment = (
|
|
|
|
<InputAdornment
|
|
|
|
position="start"
|
|
|
|
style={{
|
|
|
|
maxHeight: 'none',
|
|
|
|
marginRight: 0,
|
|
|
|
marginLeft: '8px',
|
|
|
|
}}
|
|
|
|
>
|
|
|
|
<SearchIcon color="currentColor" />
|
|
|
|
</InputAdornment>
|
|
|
|
);
|
|
|
|
|
|
|
|
return [
|
|
|
|
<TextField
|
|
|
|
key="search-text-field"
|
|
|
|
id="search-accounts"
|
|
|
|
placeholder={this.context.t('searchAccounts')}
|
|
|
|
type="text"
|
|
|
|
onChange={handleChange}
|
|
|
|
startAdornment={inputAdornment}
|
|
|
|
fullWidth
|
|
|
|
theme="material-white-padded"
|
|
|
|
/>,
|
|
|
|
<div className="account-menu__divider" key="search-divider" />,
|
|
|
|
];
|
|
|
|
}
|
|
|
|
|
|
|
|
renderAccounts() {
|
|
|
|
const {
|
|
|
|
accounts,
|
|
|
|
selectedAddress,
|
|
|
|
keyrings,
|
|
|
|
showAccountDetail,
|
Permission System 2.0 (#12243)
# Permission System 2.0
## Background
This PR migrates the extension permission system to [the new `PermissionController`](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions).
The original permission system, based on [`rpc-cap`](https://github.com/MetaMask/rpc-cap), introduced [`ZCAP-LD`](https://w3c-ccg.github.io/zcap-ld/)-like permissions to our JSON-RPC stack.
We used it to [implement](https://github.com/MetaMask/metamask-extension/pull/7004) what we called "LoginPerSite" in [version 7.7.0](https://github.com/MetaMask/metamask-extension/releases/tag/v7.7.0) of the extension, which enabled the user to choose which accounts, if any, should be exposed to each dapp.
While that was a worthwhile feature in and of itself, we wanted a permission _system_ in order to enable everything we are going to with Snaps.
Unfortunately, the original permission system was difficult to use, and necessitated the creation of the original `PermissionsController` (note the "s"), which was more or less a wrapper for `rpc-cap`.
With this PR, we shake off the yoke of the original permission system, in favor of the modular, self-contained, ergonomic, and more mature permission system 2.0.
Note that [the `PermissionController` readme](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions/README.md) explains how the new permission system works.
The `PermissionController` and `SubjectMetadataController` are currently shipped via `@metamask/snap-controllers`. This is a temporary state of affairs, and we'll move them to `@metamask/controllers` once they've landed in prod.
## Changes in Detail
First, the changes in this PR are not as big as they seem. Roughly half of the additions in this PR are fixtures in the test for the new migration (number 68), and a significant portion of the remaining ~2500 lines are due to find-and-replace changes in other test fixtures and UI files.
- The extension `PermissionsController` has been deleted, and completely replaced with the new `PermissionController` from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The original `PermissionsController` "domain metadata" functionality is now managed by the new `SubjectMetadataController`, also from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The permission activity and history log controller has been renamed `PermissionLogController` and has its own top-level state key, but is otherwise functionally equivalent to the existing implementation.
- Migration number 68 has been added to account for the new state changes.
- The tests in `app/scripts/controllers/permissions` have been migrated from `mocha` to `jest`.
Reviewers should focus their attention on the following files:
- `app/scripts/`
- `metamask-controller.js`
- This is where most of the integration work for the new `PermissionController` occurs.
Some functions that were internal to the original controller were moved here.
- `controllers/permissions/`
- `selectors.js`
- These selectors are for `ControllerMessenger` selector subscriptions. The actual subscriptions occur in `metamask-controller.js`. See the `ControllerMessenger` implementation for details.
- `specifications.js`
- The caveat and permission specifications are required by the new `PermissionController`, and are used to specify the `eth_accounts` permission and its JSON-RPC method implementation.
See the `PermissionController` readme for details.
- `migrations/068.js`
- The new state should be cross-referenced with the controllers that manage it.
The accompanying tests should also be thoroughly reviewed.
Some files may appear new but have just moved and/or been renamed:
- `app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js`
- This was previously implemented in `controllers/permissions/permissionsMethodMiddleware.js`.
- `test/mocks/permissions.js`
- A truncated version of `test/mocks/permission-controller.js`.
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
3 years ago
|
|
|
addressConnectedSubjectMap,
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
originOfCurrentTab,
|
|
|
|
} = this.props;
|
|
|
|
const { searchQuery } = this.state;
|
|
|
|
|
|
|
|
let filteredIdentities = accounts;
|
|
|
|
if (searchQuery) {
|
|
|
|
this.addressFuse.setCollection(accounts);
|
|
|
|
filteredIdentities = this.addressFuse.search(searchQuery);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (filteredIdentities.length === 0) {
|
|
|
|
return (
|
|
|
|
<p className="account-menu__no-accounts">
|
|
|
|
{this.context.t('noAccountsFound')}
|
|
|
|
</p>
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
return filteredIdentities.map((identity) => {
|
|
|
|
const isSelected = identity.address === selectedAddress;
|
|
|
|
|
|
|
|
const simpleAddress = identity.address.substring(2).toLowerCase();
|
|
|
|
|
|
|
|
const keyring = keyrings.find((kr) => {
|
|
|
|
return (
|
|
|
|
kr.accounts.includes(simpleAddress) ||
|
|
|
|
kr.accounts.includes(identity.address)
|
|
|
|
);
|
|
|
|
});
|
Permission System 2.0 (#12243)
# Permission System 2.0
## Background
This PR migrates the extension permission system to [the new `PermissionController`](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions).
The original permission system, based on [`rpc-cap`](https://github.com/MetaMask/rpc-cap), introduced [`ZCAP-LD`](https://w3c-ccg.github.io/zcap-ld/)-like permissions to our JSON-RPC stack.
We used it to [implement](https://github.com/MetaMask/metamask-extension/pull/7004) what we called "LoginPerSite" in [version 7.7.0](https://github.com/MetaMask/metamask-extension/releases/tag/v7.7.0) of the extension, which enabled the user to choose which accounts, if any, should be exposed to each dapp.
While that was a worthwhile feature in and of itself, we wanted a permission _system_ in order to enable everything we are going to with Snaps.
Unfortunately, the original permission system was difficult to use, and necessitated the creation of the original `PermissionsController` (note the "s"), which was more or less a wrapper for `rpc-cap`.
With this PR, we shake off the yoke of the original permission system, in favor of the modular, self-contained, ergonomic, and more mature permission system 2.0.
Note that [the `PermissionController` readme](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions/README.md) explains how the new permission system works.
The `PermissionController` and `SubjectMetadataController` are currently shipped via `@metamask/snap-controllers`. This is a temporary state of affairs, and we'll move them to `@metamask/controllers` once they've landed in prod.
## Changes in Detail
First, the changes in this PR are not as big as they seem. Roughly half of the additions in this PR are fixtures in the test for the new migration (number 68), and a significant portion of the remaining ~2500 lines are due to find-and-replace changes in other test fixtures and UI files.
- The extension `PermissionsController` has been deleted, and completely replaced with the new `PermissionController` from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The original `PermissionsController` "domain metadata" functionality is now managed by the new `SubjectMetadataController`, also from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The permission activity and history log controller has been renamed `PermissionLogController` and has its own top-level state key, but is otherwise functionally equivalent to the existing implementation.
- Migration number 68 has been added to account for the new state changes.
- The tests in `app/scripts/controllers/permissions` have been migrated from `mocha` to `jest`.
Reviewers should focus their attention on the following files:
- `app/scripts/`
- `metamask-controller.js`
- This is where most of the integration work for the new `PermissionController` occurs.
Some functions that were internal to the original controller were moved here.
- `controllers/permissions/`
- `selectors.js`
- These selectors are for `ControllerMessenger` selector subscriptions. The actual subscriptions occur in `metamask-controller.js`. See the `ControllerMessenger` implementation for details.
- `specifications.js`
- The caveat and permission specifications are required by the new `PermissionController`, and are used to specify the `eth_accounts` permission and its JSON-RPC method implementation.
See the `PermissionController` readme for details.
- `migrations/068.js`
- The new state should be cross-referenced with the controllers that manage it.
The accompanying tests should also be thoroughly reviewed.
Some files may appear new but have just moved and/or been renamed:
- `app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js`
- This was previously implemented in `controllers/permissions/permissionsMethodMiddleware.js`.
- `test/mocks/permissions.js`
- A truncated version of `test/mocks/permission-controller.js`.
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
3 years ago
|
|
|
const addressSubjects =
|
|
|
|
addressConnectedSubjectMap[identity.address] || {};
|
|
|
|
const iconAndNameForOpenSubject = addressSubjects[originOfCurrentTab];
|
|
|
|
|
|
|
|
return (
|
|
|
|
<button
|
|
|
|
className="account-menu__account account-menu__item--clickable"
|
|
|
|
onClick={() => {
|
|
|
|
this.context.trackEvent({
|
|
|
|
category: EVENT.CATEGORIES.NAVIGATION,
|
|
|
|
event: 'Switched Account',
|
|
|
|
properties: {
|
|
|
|
action: 'Main Menu',
|
|
|
|
legacy_event: true,
|
|
|
|
},
|
|
|
|
});
|
|
|
|
showAccountDetail(identity.address);
|
|
|
|
}}
|
|
|
|
key={identity.address}
|
|
|
|
>
|
|
|
|
<div className="account-menu__check-mark">
|
|
|
|
{isSelected ? (
|
|
|
|
<IconCheck color="var(--color-success-default)" />
|
|
|
|
) : null}
|
|
|
|
</div>
|
|
|
|
<Identicon address={identity.address} diameter={24} />
|
|
|
|
<div className="account-menu__account-info">
|
|
|
|
<div className="account-menu__name">{identity.name || ''}</div>
|
|
|
|
<UserPreferencedCurrencyDisplay
|
|
|
|
className="account-menu__balance"
|
|
|
|
value={identity.balance}
|
|
|
|
type={PRIMARY}
|
|
|
|
/>
|
|
|
|
</div>
|
|
|
|
<KeyRingLabel keyring={keyring} />
|
Permission System 2.0 (#12243)
# Permission System 2.0
## Background
This PR migrates the extension permission system to [the new `PermissionController`](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions).
The original permission system, based on [`rpc-cap`](https://github.com/MetaMask/rpc-cap), introduced [`ZCAP-LD`](https://w3c-ccg.github.io/zcap-ld/)-like permissions to our JSON-RPC stack.
We used it to [implement](https://github.com/MetaMask/metamask-extension/pull/7004) what we called "LoginPerSite" in [version 7.7.0](https://github.com/MetaMask/metamask-extension/releases/tag/v7.7.0) of the extension, which enabled the user to choose which accounts, if any, should be exposed to each dapp.
While that was a worthwhile feature in and of itself, we wanted a permission _system_ in order to enable everything we are going to with Snaps.
Unfortunately, the original permission system was difficult to use, and necessitated the creation of the original `PermissionsController` (note the "s"), which was more or less a wrapper for `rpc-cap`.
With this PR, we shake off the yoke of the original permission system, in favor of the modular, self-contained, ergonomic, and more mature permission system 2.0.
Note that [the `PermissionController` readme](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions/README.md) explains how the new permission system works.
The `PermissionController` and `SubjectMetadataController` are currently shipped via `@metamask/snap-controllers`. This is a temporary state of affairs, and we'll move them to `@metamask/controllers` once they've landed in prod.
## Changes in Detail
First, the changes in this PR are not as big as they seem. Roughly half of the additions in this PR are fixtures in the test for the new migration (number 68), and a significant portion of the remaining ~2500 lines are due to find-and-replace changes in other test fixtures and UI files.
- The extension `PermissionsController` has been deleted, and completely replaced with the new `PermissionController` from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The original `PermissionsController` "domain metadata" functionality is now managed by the new `SubjectMetadataController`, also from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The permission activity and history log controller has been renamed `PermissionLogController` and has its own top-level state key, but is otherwise functionally equivalent to the existing implementation.
- Migration number 68 has been added to account for the new state changes.
- The tests in `app/scripts/controllers/permissions` have been migrated from `mocha` to `jest`.
Reviewers should focus their attention on the following files:
- `app/scripts/`
- `metamask-controller.js`
- This is where most of the integration work for the new `PermissionController` occurs.
Some functions that were internal to the original controller were moved here.
- `controllers/permissions/`
- `selectors.js`
- These selectors are for `ControllerMessenger` selector subscriptions. The actual subscriptions occur in `metamask-controller.js`. See the `ControllerMessenger` implementation for details.
- `specifications.js`
- The caveat and permission specifications are required by the new `PermissionController`, and are used to specify the `eth_accounts` permission and its JSON-RPC method implementation.
See the `PermissionController` readme for details.
- `migrations/068.js`
- The new state should be cross-referenced with the controllers that manage it.
The accompanying tests should also be thoroughly reviewed.
Some files may appear new but have just moved and/or been renamed:
- `app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js`
- This was previously implemented in `controllers/permissions/permissionsMethodMiddleware.js`.
- `test/mocks/permissions.js`
- A truncated version of `test/mocks/permission-controller.js`.
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
3 years ago
|
|
|
{iconAndNameForOpenSubject ? (
|
|
|
|
<div className="account-menu__icon-list">
|
|
|
|
<SiteIcon
|
Permission System 2.0 (#12243)
# Permission System 2.0
## Background
This PR migrates the extension permission system to [the new `PermissionController`](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions).
The original permission system, based on [`rpc-cap`](https://github.com/MetaMask/rpc-cap), introduced [`ZCAP-LD`](https://w3c-ccg.github.io/zcap-ld/)-like permissions to our JSON-RPC stack.
We used it to [implement](https://github.com/MetaMask/metamask-extension/pull/7004) what we called "LoginPerSite" in [version 7.7.0](https://github.com/MetaMask/metamask-extension/releases/tag/v7.7.0) of the extension, which enabled the user to choose which accounts, if any, should be exposed to each dapp.
While that was a worthwhile feature in and of itself, we wanted a permission _system_ in order to enable everything we are going to with Snaps.
Unfortunately, the original permission system was difficult to use, and necessitated the creation of the original `PermissionsController` (note the "s"), which was more or less a wrapper for `rpc-cap`.
With this PR, we shake off the yoke of the original permission system, in favor of the modular, self-contained, ergonomic, and more mature permission system 2.0.
Note that [the `PermissionController` readme](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions/README.md) explains how the new permission system works.
The `PermissionController` and `SubjectMetadataController` are currently shipped via `@metamask/snap-controllers`. This is a temporary state of affairs, and we'll move them to `@metamask/controllers` once they've landed in prod.
## Changes in Detail
First, the changes in this PR are not as big as they seem. Roughly half of the additions in this PR are fixtures in the test for the new migration (number 68), and a significant portion of the remaining ~2500 lines are due to find-and-replace changes in other test fixtures and UI files.
- The extension `PermissionsController` has been deleted, and completely replaced with the new `PermissionController` from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The original `PermissionsController` "domain metadata" functionality is now managed by the new `SubjectMetadataController`, also from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers).
- The permission activity and history log controller has been renamed `PermissionLogController` and has its own top-level state key, but is otherwise functionally equivalent to the existing implementation.
- Migration number 68 has been added to account for the new state changes.
- The tests in `app/scripts/controllers/permissions` have been migrated from `mocha` to `jest`.
Reviewers should focus their attention on the following files:
- `app/scripts/`
- `metamask-controller.js`
- This is where most of the integration work for the new `PermissionController` occurs.
Some functions that were internal to the original controller were moved here.
- `controllers/permissions/`
- `selectors.js`
- These selectors are for `ControllerMessenger` selector subscriptions. The actual subscriptions occur in `metamask-controller.js`. See the `ControllerMessenger` implementation for details.
- `specifications.js`
- The caveat and permission specifications are required by the new `PermissionController`, and are used to specify the `eth_accounts` permission and its JSON-RPC method implementation.
See the `PermissionController` readme for details.
- `migrations/068.js`
- The new state should be cross-referenced with the controllers that manage it.
The accompanying tests should also be thoroughly reviewed.
Some files may appear new but have just moved and/or been renamed:
- `app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js`
- This was previously implemented in `controllers/permissions/permissionsMethodMiddleware.js`.
- `test/mocks/permissions.js`
- A truncated version of `test/mocks/permission-controller.js`.
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
3 years ago
|
|
|
icon={iconAndNameForOpenSubject.icon}
|
|
|
|
name={iconAndNameForOpenSubject.name}
|
|
|
|
size={32}
|
|
|
|
/>
|
|
|
|
</div>
|
|
|
|
) : null}
|
|
|
|
</button>
|
|
|
|
);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
resetSearchQuery() {
|
|
|
|
this.setSearchQuery('');
|
|
|
|
}
|
|
|
|
|
|
|
|
setSearchQuery(searchQuery) {
|
|
|
|
this.setState({ searchQuery });
|
|
|
|
}
|
|
|
|
|
|
|
|
setShouldShowScrollButton = () => {
|
|
|
|
if (!this.accountsRef) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
const { scrollTop, offsetHeight, scrollHeight } = this.accountsRef;
|
|
|
|
const canScroll = scrollHeight > offsetHeight;
|
|
|
|
const atAccountListBottom = scrollTop + offsetHeight >= scrollHeight;
|
|
|
|
const shouldShowScrollButton = canScroll && !atAccountListBottom;
|
|
|
|
|
|
|
|
this.setState({ shouldShowScrollButton });
|
|
|
|
};
|
|
|
|
|
|
|
|
onScroll = debounce(this.setShouldShowScrollButton, 25);
|
|
|
|
|
|
|
|
handleScrollDown = (e) => {
|
|
|
|
e.stopPropagation();
|
|
|
|
|
|
|
|
const { scrollHeight } = this.accountsRef;
|
|
|
|
this.accountsRef.scroll({ left: 0, top: scrollHeight, behavior: 'smooth' });
|
|
|
|
|
|
|
|
this.setShouldShowScrollButton();
|
|
|
|
};
|
|
|
|
|
|
|
|
renderScrollButton() {
|
|
|
|
if (!this.state.shouldShowScrollButton) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (
|
|
|
|
<div
|
|
|
|
className="account-menu__scroll-button"
|
|
|
|
onClick={this.handleScrollDown}
|
|
|
|
>
|
|
|
|
<i className="fa fa-arrow-down" title={this.context.t('scrollDown')} />
|
|
|
|
</div>
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
render() {
|
|
|
|
const { t, trackEvent } = this.context;
|
|
|
|
const {
|
|
|
|
shouldShowAccountsSearch,
|
|
|
|
isAccountMenuOpen,
|
|
|
|
toggleAccountMenu,
|
|
|
|
lockMetamask,
|
|
|
|
history,
|
|
|
|
///: BEGIN:ONLY_INCLUDE_IN(flask)
|
|
|
|
unreadNotificationsCount,
|
|
|
|
///: END:ONLY_INCLUDE_IN
|
|
|
|
} = this.props;
|
|
|
|
|
|
|
|
if (!isAccountMenuOpen) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
|
|
|
|
let supportText = t('support');
|
|
|
|
let supportLink = SUPPORT_LINK;
|
|
|
|
///: BEGIN:ONLY_INCLUDE_IN(beta,flask)
|
|
|
|
supportText = t('needHelpSubmitTicket');
|
|
|
|
supportLink = SUPPORT_REQUEST_LINK;
|
|
|
|
///: END:ONLY_INCLUDE_IN
|
|
|
|
|
|
|
|
return (
|
|
|
|
<div className="account-menu">
|
|
|
|
<div className="account-menu__close-area" onClick={toggleAccountMenu} />
|
|
|
|
<AccountMenuItem className="account-menu__header">
|
|
|
|
{t('myAccounts')}
|
|
|
|
<Button
|
|
|
|
className="account-menu__lock-button"
|
|
|
|
type="secondary"
|
|
|
|
onClick={() => {
|
|
|
|
lockMetamask();
|
|
|
|
history.push(DEFAULT_ROUTE);
|
|
|
|
}}
|
|
|
|
>
|
|
|
|
{t('lock')}
|
|
|
|
</Button>
|
|
|
|
</AccountMenuItem>
|
|
|
|
<div className="account-menu__divider" />
|
|
|
|
<div className="account-menu__accounts-container">
|
|
|
|
{shouldShowAccountsSearch ? this.renderAccountsSearch() : null}
|
|
|
|
<div
|
|
|
|
className="account-menu__accounts"
|
|
|
|
onScroll={this.onScroll}
|
|
|
|
ref={(ref) => {
|
|
|
|
this.accountsRef = ref;
|
|
|
|
}}
|
|
|
|
>
|
|
|
|
{this.renderAccounts()}
|
|
|
|
</div>
|
|
|
|
{this.renderScrollButton()}
|
|
|
|
</div>
|
|
|
|
<div className="account-menu__divider" />
|
|
|
|
<AccountMenuItem
|
|
|
|
onClick={() => {
|
|
|
|
toggleAccountMenu();
|
|
|
|
trackEvent({
|
|
|
|
category: EVENT.CATEGORIES.NAVIGATION,
|
|
|
|
event: 'Clicked Create Account',
|
|
|
|
properties: {
|
|
|
|
action: 'Main Menu',
|
|
|
|
legacy_event: true,
|
|
|
|
},
|
|
|
|
});
|
|
|
|
history.push(NEW_ACCOUNT_ROUTE);
|
|
|
|
}}
|
|
|
|
icon={<IconPlus color="var(--color-icon-alternative)" />}
|
|
|
|
text={t('createAccount')}
|
|
|
|
/>
|
|
|
|
<AccountMenuItem
|
|
|
|
onClick={() => {
|
|
|
|
toggleAccountMenu();
|
|
|
|
trackEvent({
|
|
|
|
category: EVENT.CATEGORIES.NAVIGATION,
|
|
|
|
event: 'Clicked Import Account',
|
|
|
|
properties: {
|
|
|
|
action: 'Main Menu',
|
|
|
|
legacy_event: true,
|
|
|
|
},
|
|
|
|
});
|
|
|
|
history.push(IMPORT_ACCOUNT_ROUTE);
|
|
|
|
}}
|
|
|
|
icon={
|
|
|
|
<IconImport
|
|
|
|
color="var(--color-icon-alternative)"
|
|
|
|
ariaLabel={t('importAccount')}
|
|
|
|
/>
|
|
|
|
}
|
|
|
|
text={t('importAccount')}
|
|
|
|
/>
|
|
|
|
<AccountMenuItem
|
|
|
|
onClick={() => {
|
|
|
|
toggleAccountMenu();
|
|
|
|
trackEvent({
|
|
|
|
category: EVENT.CATEGORIES.NAVIGATION,
|
|
|
|
event: 'Clicked Connect Hardware',
|
|
|
|
properties: {
|
|
|
|
action: 'Main Menu',
|
|
|
|
legacy_event: true,
|
|
|
|
},
|
|
|
|
});
|
|
|
|
if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
|
|
|
|
global.platform.openExtensionInBrowser(CONNECT_HARDWARE_ROUTE);
|
|
|
|
} else {
|
|
|
|
history.push(CONNECT_HARDWARE_ROUTE);
|
|
|
|
}
|
|
|
|
}}
|
|
|
|
icon={
|
|
|
|
<IconConnect
|
|
|
|
color="var(--color-icon-alternative)"
|
|
|
|
ariaLabel={t('connectHardwareWallet')}
|
|
|
|
/>
|
|
|
|
}
|
|
|
|
text={t('connectHardwareWallet')}
|
|
|
|
/>
|
|
|
|
<div className="account-menu__divider" />
|
|
|
|
{
|
|
|
|
///: BEGIN:ONLY_INCLUDE_IN(flask)
|
|
|
|
<>
|
|
|
|
<AccountMenuItem
|
|
|
|
onClick={() => {
|
|
|
|
toggleAccountMenu();
|
|
|
|
history.push(NOTIFICATIONS_ROUTE);
|
|
|
|
}}
|
|
|
|
icon={
|
|
|
|
<div className="account-menu__notifications">
|
|
|
|
<i className="fa fa-bell fa-xl" />
|
|
|
|
{unreadNotificationsCount > 0 && (
|
|
|
|
<div className="account-menu__notifications__count">
|
|
|
|
{unreadNotificationsCount}
|
|
|
|
</div>
|
|
|
|
)}
|
|
|
|
</div>
|
|
|
|
}
|
|
|
|
text={t('notifications')}
|
|
|
|
/>
|
|
|
|
<div className="account-menu__divider" />
|
|
|
|
</>
|
|
|
|
///: END:ONLY_INCLUDE_IN
|
|
|
|
}
|
|
|
|
<AccountMenuItem
|
|
|
|
onClick={() => {
|
|
|
|
global.platform.openTab({ url: supportLink });
|
|
|
|
}}
|
|
|
|
icon={
|
|
|
|
<IconSpeechBubbles
|
|
|
|
color="var(--color-icon-alternative)"
|
|
|
|
ariaLabel={supportText}
|
|
|
|
/>
|
|
|
|
}
|
|
|
|
text={supportText}
|
|
|
|
/>
|
|
|
|
|
|
|
|
<AccountMenuItem
|
|
|
|
onClick={() => {
|
|
|
|
toggleAccountMenu();
|
|
|
|
history.push(SETTINGS_ROUTE);
|
|
|
|
this.context.trackEvent({
|
|
|
|
category: EVENT.CATEGORIES.NAVIGATION,
|
|
|
|
event: 'Opened Settings',
|
|
|
|
properties: {
|
|
|
|
action: 'Main Menu',
|
|
|
|
legacy_event: true,
|
|
|
|
},
|
|
|
|
});
|
|
|
|
}}
|
|
|
|
icon={
|
|
|
|
<IconCog
|
|
|
|
color="var(--color-icon-alternative)"
|
|
|
|
ariaLabel={t('settings')}
|
|
|
|
/>
|
|
|
|
}
|
|
|
|
text={t('settings')}
|
|
|
|
/>
|
|
|
|
</div>
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|