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

[FLASK] Fix some issues with installing snaps that request eth_accounts(#16365)

Browse Source
This commit is contained in:
Frederik Bolding 2022-11-04 12:50:20 +01:00 committed by GitHub
parent 348262f2ea
commit 121b6809f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/pages/permissions-connect/permissions-connect.component.js
View File

@ -164,11 +164,33 @@ export default class PermissionConnect extends Component {
} }
selectAccounts = (addresses) => { selectAccounts = (addresses) => {
const {
confirmPermissionPath,
///: BEGIN:ONLY_INCLUDE_IN(flask)
snapInstallPath,
snapUpdatePath,
isSnap,
permissionsRequest,
///: END:ONLY_INCLUDE_IN
} = this.props;
this.setState( this.setState(
{ {
selectedAccountAddresses: addresses, selectedAccountAddresses: addresses,
}, },
() => this.props.history.push(this.props.confirmPermissionPath), ///: BEGIN:ONLY_INCLUDE_IN(main,beta)
() => this.props.history.push(confirmPermissionPath),
///: END:ONLY_INCLUDE_IN
///: BEGIN:ONLY_INCLUDE_IN(flask)
() =>
this.props.history.push(
// eslint-disable-next-line no-nested-ternary
isSnap
? permissionsRequest.newPermissions
? snapUpdatePath
: snapInstallPath
: confirmPermissionPath,
),
///: END:ONLY_INCLUDE_IN
); );
}; };
@ -315,7 +337,7 @@ export default class PermissionConnect extends Component {
approveSnapInstall={(requestId) => { approveSnapInstall={(requestId) => {
approvePendingApproval(requestId, { approvePendingApproval(requestId, {
...permissionsRequest, ...permissionsRequest,
approvedAccounts: selectedAccountAddresses, approvedAccounts: [...selectedAccountAddresses],
}); });
this.redirect(true); this.redirect(true);
}} }}
@ -345,7 +367,7 @@ export default class PermissionConnect extends Component {
approveSnapUpdate={(requestId) => { approveSnapUpdate={(requestId) => {
approvePendingApproval(requestId, { approvePendingApproval(requestId, {
...permissionsRequest, ...permissionsRequest,
approvedAccounts: selectedAccountAddresses, approvedAccounts: [...selectedAccountAddresses],
}); });
this.redirect(true); this.redirect(true);
}} }}