Skip to content

Commit

Permalink
Merge branch 'develop' into rekmarks/reorder-permission-middleware
Browse files Browse the repository at this point in the history
  • Loading branch information
@rekmarks
rekmarks committed May 14, 2024
2 parents 611dac9 + 99b9480 commit 9c346cd
Show file tree
Hide file tree
Showing 30 changed files with 606 additions and 312 deletions.
6 changes: 6 additions & 0 deletions app/_locales/en/messages.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions app/scripts/controllers/app-state.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ export default class AppStateController extends EventEmitter {
'0x539': true,
},
surveyLinkLastClickedOrClosed: null,
newPrivacyPolicyToastClickedOrClosed: null,
newPrivacyPolicyToastShownDate: null,
signatureSecurityAlertResponses: {},
// States used for displaying the changed network toast
switchedNetworkDetails: null,
Expand Down Expand Up @@ -184,6 +186,18 @@ export default class AppStateController extends EventEmitter {
});
}

setNewPrivacyPolicyToastClickedOrClosed() {
this.store.updateState({
newPrivacyPolicyToastClickedOrClosed: true,
});
}

setNewPrivacyPolicyToastShownDate(time) {
this.store.updateState({
newPrivacyPolicyToastShownDate: time,
});
}

/**
* Record the timestamp of the last time the user has seen the recovery phrase reminder
*
Expand Down
2 changes: 2 additions & 0 deletions app/scripts/lib/setupSentry.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,8 @@ export const SENTRY_UI_STATE = {
///: END:ONLY_INCLUDE_IF
switchedNetworkDetails: false,
switchedNetworkNeverShowMessage: false,
newPrivacyPolicyToastClickedOrClosed: false,
newPrivacyPolicyToastShownDate: false,
},
unconnectedAccount: true,
};
Expand Down
8 changes: 8 additions & 0 deletions app/scripts/metamask-controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3159,6 +3159,14 @@ export default class MetamaskController extends EventEmitter {
appStateController.setSurveyLinkLastClickedOrClosed.bind(
appStateController,
),
setNewPrivacyPolicyToastClickedOrClosed:
appStateController.setNewPrivacyPolicyToastClickedOrClosed.bind(
appStateController,
),
setNewPrivacyPolicyToastShownDate:
appStateController.setNewPrivacyPolicyToastShownDate.bind(
appStateController,
),
///: BEGIN:ONLY_INCLUDE_IF(snaps)
setSnapsInstallPrivacyWarningShownStatus:
appStateController.setSnapsInstallPrivacyWarningShownStatus.bind(
Expand Down
43 changes: 13 additions & 30 deletions lavamoat/browserify/beta/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,29 +941,18 @@
"@metamask/ens-controller": {
"packages": {
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/ens-controller>@metamask/controller-utils": true,
"@metamask/controller-utils": true,
"@metamask/ens-controller>@metamask/base-controller": true,
"@metamask/utils": true,
"ethereum-ens-network-map": true,
"punycode": true
}
},
"@metamask/ens-controller>@metamask/controller-utils": {
"@metamask/ens-controller>@metamask/base-controller": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
"immer": true
}
},
"@metamask/eth-json-rpc-filters": {
Expand Down Expand Up @@ -1635,25 +1624,19 @@
},
"@metamask/obs-store": {
"packages": {
"@metamask/obs-store>@metamask/safe-event-emitter": true,
"@metamask/obs-store>through2": true,
"stream-browserify": true
}
},
"@metamask/obs-store>@metamask/safe-event-emitter": {
"globals": {
"setTimeout": true
},
"packages": {
"webpack>events": true
"@metamask/obs-store>readable-stream": true,
"@metamask/safe-event-emitter": true
}
},
"@metamask/obs-store>through2": {
"@metamask/obs-store>readable-stream": {
"packages": {
"browserify>browser-resolve": true,
"browserify>buffer": true,
"browserify>process": true,
"browserify>util": true,
"readable-stream": true,
"watchify>xtend": true
"browserify>string_decoder": true,
"pumpify>inherits": true,
"readable-stream>util-deprecate": true,
"webpack>events": true
}
},
"@metamask/permission-controller": {
Expand Down
46 changes: 15 additions & 31 deletions lavamoat/browserify/desktop/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1026,29 +1026,18 @@
"@metamask/ens-controller": {
"packages": {
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/ens-controller>@metamask/controller-utils": true,
"@metamask/controller-utils": true,
"@metamask/ens-controller>@metamask/base-controller": true,
"@metamask/utils": true,
"ethereum-ens-network-map": true,
"punycode": true
}
},
"@metamask/ens-controller>@metamask/controller-utils": {
"@metamask/ens-controller>@metamask/base-controller": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
"immer": true
}
},
"@metamask/eth-json-rpc-filters": {
Expand Down Expand Up @@ -1755,25 +1744,19 @@
},
"@metamask/obs-store": {
"packages": {
"@metamask/obs-store>@metamask/safe-event-emitter": true,
"@metamask/obs-store>through2": true,
"stream-browserify": true
}
},
"@metamask/obs-store>@metamask/safe-event-emitter": {
"globals": {
"setTimeout": true
},
"packages": {
"webpack>events": true
"@metamask/obs-store>readable-stream": true,
"@metamask/safe-event-emitter": true
}
},
"@metamask/obs-store>through2": {
"@metamask/obs-store>readable-stream": {
"packages": {
"browserify>browser-resolve": true,
"browserify>buffer": true,
"browserify>process": true,
"browserify>util": true,
"readable-stream": true,
"watchify>xtend": true
"browserify>string_decoder": true,
"pumpify>inherits": true,
"readable-stream>util-deprecate": true,
"webpack>events": true
}
},
"@metamask/permission-controller": {
Expand Down Expand Up @@ -1957,8 +1940,9 @@
"setTimeout": true
},
"packages": {
"@metamask/providers>@metamask/rpc-errors": true,
"@metamask/rate-limit-controller>@metamask/base-controller": true,
"eth-rpc-errors": true
"@metamask/utils": true
}
},
"@metamask/rate-limit-controller>@metamask/base-controller": {
Expand Down
46 changes: 15 additions & 31 deletions lavamoat/browserify/flask/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1026,29 +1026,18 @@
"@metamask/ens-controller": {
"packages": {
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/ens-controller>@metamask/controller-utils": true,
"@metamask/controller-utils": true,
"@metamask/ens-controller>@metamask/base-controller": true,
"@metamask/utils": true,
"ethereum-ens-network-map": true,
"punycode": true
}
},
"@metamask/ens-controller>@metamask/controller-utils": {
"@metamask/ens-controller>@metamask/base-controller": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
"immer": true
}
},
"@metamask/eth-json-rpc-filters": {
Expand Down Expand Up @@ -1755,25 +1744,19 @@
},
"@metamask/obs-store": {
"packages": {
"@metamask/obs-store>@metamask/safe-event-emitter": true,
"@metamask/obs-store>through2": true,
"stream-browserify": true
}
},
"@metamask/obs-store>@metamask/safe-event-emitter": {
"globals": {
"setTimeout": true
},
"packages": {
"webpack>events": true
"@metamask/obs-store>readable-stream": true,
"@metamask/safe-event-emitter": true
}
},
"@metamask/obs-store>through2": {
"@metamask/obs-store>readable-stream": {
"packages": {
"browserify>browser-resolve": true,
"browserify>buffer": true,
"browserify>process": true,
"browserify>util": true,
"readable-stream": true,
"watchify>xtend": true
"browserify>string_decoder": true,
"pumpify>inherits": true,
"readable-stream>util-deprecate": true,
"webpack>events": true
}
},
"@metamask/permission-controller": {
Expand Down Expand Up @@ -2009,8 +1992,9 @@
"setTimeout": true
},
"packages": {
"@metamask/providers>@metamask/rpc-errors": true,
"@metamask/rate-limit-controller>@metamask/base-controller": true,
"eth-rpc-errors": true
"@metamask/utils": true
}
},
"@metamask/rate-limit-controller>@metamask/base-controller": {
Expand Down
46 changes: 15 additions & 31 deletions lavamoat/browserify/main/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,29 +941,18 @@
"@metamask/ens-controller": {
"packages": {
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/ens-controller>@metamask/controller-utils": true,
"@metamask/controller-utils": true,
"@metamask/ens-controller>@metamask/base-controller": true,
"@metamask/utils": true,
"ethereum-ens-network-map": true,
"punycode": true
}
},
"@metamask/ens-controller>@metamask/controller-utils": {
"@metamask/ens-controller>@metamask/base-controller": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
"immer": true
}
},
"@metamask/eth-json-rpc-filters": {
Expand Down Expand Up @@ -1670,25 +1659,19 @@
},
"@metamask/obs-store": {
"packages": {
"@metamask/obs-store>@metamask/safe-event-emitter": true,
"@metamask/obs-store>through2": true,
"stream-browserify": true
}
},
"@metamask/obs-store>@metamask/safe-event-emitter": {
"globals": {
"setTimeout": true
},
"packages": {
"webpack>events": true
"@metamask/obs-store>readable-stream": true,
"@metamask/safe-event-emitter": true
}
},
"@metamask/obs-store>through2": {
"@metamask/obs-store>readable-stream": {
"packages": {
"browserify>browser-resolve": true,
"browserify>buffer": true,
"browserify>process": true,
"browserify>util": true,
"readable-stream": true,
"watchify>xtend": true
"browserify>string_decoder": true,
"pumpify>inherits": true,
"readable-stream>util-deprecate": true,
"webpack>events": true
}
},
"@metamask/permission-controller": {
Expand Down Expand Up @@ -1924,8 +1907,9 @@
"setTimeout": true
},
"packages": {
"@metamask/providers>@metamask/rpc-errors": true,
"@metamask/rate-limit-controller>@metamask/base-controller": true,
"eth-rpc-errors": true
"@metamask/utils": true
}
},
"@metamask/rate-limit-controller>@metamask/base-controller": {
Expand Down
Loading

0 comments on commit 9c346cd

Please sign in to comment.