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

Rename confusing permissions-connect variable (#8925)

Browse Source
This commit is contained in:
Erik Marks 2020-07-05 12:38:02 -07:00 committed by GitHub
parent 2f2cf07ef5
commit e20e42bb17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/pages/permissions-connect/permissions-connect.component.js
View File

@ -26,7 +26,7 @@ export default class PermissionConnect extends Component {
addressLastConnectedMap: PropTypes.object.isRequired, addressLastConnectedMap: PropTypes.object.isRequired,
lastConnectedInfo: PropTypes.object.isRequired, lastConnectedInfo: PropTypes.object.isRequired,
permissionsRequestId: PropTypes.string, permissionsRequestId: PropTypes.string,
hasPendingPermissionsRequests: PropTypes.bool.isRequired, hasAdditionalPermissionsRequests: PropTypes.bool.isRequired,
history: PropTypes.object.isRequired, history: PropTypes.object.isRequired,
connectPath: PropTypes.string.isRequired, connectPath: PropTypes.string.isRequired,
confirmPermissionPath: PropTypes.string.isRequired, confirmPermissionPath: PropTypes.string.isRequired,
@ -143,10 +143,10 @@ export default class PermissionConnect extends Component {
} }
_doRedirect () { _doRedirect () {
const { history, hasPendingPermissionsRequests } = this.props const { history, hasAdditionalPermissionsRequests } = this.props
if ( if (
!hasPendingPermissionsRequests && !hasAdditionalPermissionsRequests &&
getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION
) { ) {
global.platform.closeCurrentWindow() global.platform.closeCurrentWindow()

5
ui/app/pages/permissions-connect/permissions-connect.container.js
View File

@ -34,7 +34,8 @@ const mapStateToProps = (state, ownProps) => {
const permissionsRequest = permissionsRequests const permissionsRequest = permissionsRequests
.find((permissionsRequest) => permissionsRequest.metadata.id === permissionsRequestId) .find((permissionsRequest) => permissionsRequest.metadata.id === permissionsRequestId)
const hasPendingPermissionsRequests = permissionsRequest // used to determine whether to redirect or show the next permissions request
const hasAdditionalPermissionsRequests = permissionsRequest
? permissionsRequests.length > 1 ? permissionsRequests.length > 1
: permissionsRequests.length > 0 : permissionsRequests.length > 0
@ -82,7 +83,7 @@ const mapStateToProps = (state, ownProps) => {
return { return {
permissionsRequest, permissionsRequest,
permissionsRequestId, permissionsRequestId,
hasPendingPermissionsRequests, hasAdditionalPermissionsRequests,
accounts: accountsWithLabels, accounts: accountsWithLabels,
currentAddress, currentAddress,
origin, origin,