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] Resolve snap_dialog approval on close (#16801)

Browse Source
This commit is contained in:
Guillaume Roux 2022-12-21 20:15:52 +01:00 committed by GitHub
parent f8881a01db
commit 3cfef11f71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/scripts/background.js
View File

@ -17,6 +17,9 @@ import {
ENVIRONMENT_TYPE_FULLSCREEN, ENVIRONMENT_TYPE_FULLSCREEN,
EXTENSION_MESSAGES, EXTENSION_MESSAGES,
PLATFORM_FIREFOX, PLATFORM_FIREFOX,
///: BEGIN:ONLY_INCLUDE_IN(flask)
MESSAGE_TYPE,
///: END:ONLY_INCLUDE_IN
} from '../../shared/constants/app'; } from '../../shared/constants/app';
import { SECOND } from '../../shared/constants/time'; import { SECOND } from '../../shared/constants/time';
import { import {
@ -721,10 +724,28 @@ function setupController(initState, initLangCode) {
), ),
); );
// Finally, reject all approvals managed by the ApprovalController // Finally, resolve snap dialog approvals on Flask and reject all the others managed by the ApprovalController.
controller.approvalController.clear( Object.values(controller.approvalController.state.pendingApprovals).forEach(
({ id, type }) => {
switch (type) {
///: BEGIN:ONLY_INCLUDE_IN(flask)
case MESSAGE_TYPE.SNAP_DIALOG_ALERT:
case MESSAGE_TYPE.SNAP_DIALOG_PROMPT:
controller.approvalController.accept(id, null);
break;
case MESSAGE_TYPE.SNAP_DIALOG_CONFIRMATION:
controller.approvalController.accept(id, false);
break;
///: END:ONLY_INCLUDE_IN
default:
controller.approvalController.reject(
id,
ethErrors.provider.userRejectedRequest(), ethErrors.provider.userRejectedRequest(),
); );
break;
}
},
);
updateBadge(); updateBadge();
} }