m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00
Code

Consolidate notification UI openers (#9885)

Browse Source 
* Consolidate notification UI openers

* Update tests
This commit is contained in:
Erik Marks 2020-11-16 08:32:53 -08:00 committed by GitHub
parent 70a3a7b09c
commit 5a80f04dca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scripts/background.js
View File

@ -225,10 +225,7 @@ function setupController(initState, initLangCode) {
const controller = new MetamaskController({ const controller = new MetamaskController({
infuraProjectId: process.env.INFURA_PROJECT_ID, infuraProjectId: process.env.INFURA_PROJECT_ID,
// User confirmation callbacks: // User confirmation callbacks:
showUnconfirmedMessage: triggerUi, showUserConfirmation: triggerUi,
showUnapprovedTx: triggerUi,
showPermissionRequest: triggerUi,
showUnlockRequest: triggerUi,
openPopup, openPopup,
// initial state // initial state
initState, initState,

16
app/scripts/metamask-controller.js
View File

@ -150,7 +150,7 @@ export default class MetamaskController extends EventEmitter {
isUnlocked: this.isUnlocked.bind(this), isUnlocked: this.isUnlocked.bind(this),
initState: initState.AppStateController, initState: initState.AppStateController,
onInactiveTimeout: () => this.setLocked(), onInactiveTimeout: () => this.setLocked(),
showUnlockRequest: opts.showUnlockRequest, showUnlockRequest: opts.showUserConfirmation,
preferencesStore: this.preferencesController.store, preferencesStore: this.preferencesController.store,
}) })
@ -247,7 +247,7 @@ export default class MetamaskController extends EventEmitter {
notifyDomain: this.notifyConnections.bind(this), notifyDomain: this.notifyConnections.bind(this),
notifyAllDomains: this.notifyAllConnections.bind(this), notifyAllDomains: this.notifyAllConnections.bind(this),
preferences: this.preferencesController.store, preferences: this.preferencesController.store,
showPermissionRequest: opts.showPermissionRequest, showPermissionRequest: opts.showUserConfirmation,
}, },
initState.PermissionsController, initState.PermissionsController,
initState.PermissionsMetadata, initState.PermissionsMetadata,
@ -302,7 +302,7 @@ export default class MetamaskController extends EventEmitter {
getParticipateInMetrics: () => getParticipateInMetrics: () =>
this.preferencesController.getParticipateInMetaMetrics(), this.preferencesController.getParticipateInMetaMetrics(),
}) })
this.txController.on('newUnapprovedTx', () => opts.showUnapprovedTx()) this.txController.on('newUnapprovedTx', () => opts.showUserConfirmation())
this.txController.on(`tx:status-update`, async (txId, status) => { this.txController.on(`tx:status-update`, async (txId, status) => {
if ( if (
@ -1376,7 +1376,7 @@ export default class MetamaskController extends EventEmitter {
req, req,
) )
this.sendUpdate() this.sendUpdate()
this.opts.showUnconfirmedMessage() this.opts.showUserConfirmation()
return promise return promise
} }
@ -1439,7 +1439,7 @@ export default class MetamaskController extends EventEmitter {
req, req,
) )
this.sendUpdate() this.sendUpdate()
this.opts.showUnconfirmedMessage() this.opts.showUserConfirmation()
return promise return promise
} }
@ -1498,7 +1498,7 @@ export default class MetamaskController extends EventEmitter {
req, req,
) )
this.sendUpdate() this.sendUpdate()
this.opts.showUnconfirmedMessage() this.opts.showUserConfirmation()
return promise return promise
} }
@ -1590,7 +1590,7 @@ export default class MetamaskController extends EventEmitter {
req, req,
) )
this.sendUpdate() this.sendUpdate()
this.opts.showUnconfirmedMessage() this.opts.showUserConfirmation()
return promise return promise
} }
@ -1655,7 +1655,7 @@ export default class MetamaskController extends EventEmitter {
version, version,
) )
this.sendUpdate() this.sendUpdate()
this.opts.showUnconfirmedMessage() this.opts.showUserConfirmation()
return promise return promise
} }

3
test/unit/app/controllers/metamask-controller-test.js
View File

@ -97,8 +97,7 @@ describe('MetaMaskController', function () {
.reply(200, '{"JPY":12415.9}') .reply(200, '{"JPY":12415.9}')
metamaskController = new MetaMaskController({ metamaskController = new MetaMaskController({
showUnapprovedTx: noop, showUserConfirmation: noop,
showUnconfirmedMessage: noop,
encryptor: { encryptor: {
encrypt(_, object) { encrypt(_, object) {
this.object = object this.object = object

3
test/unit/ui/app/actions.spec.js
View File

@ -44,8 +44,7 @@ describe('Actions', function () {
platform: { getVersion: () => 'foo' }, platform: { getVersion: () => 'foo' },
provider, provider,
keyringController: new KeyringController({}), keyringController: new KeyringController({}),
showUnapprovedTx: noop, showUserConfirmation: noop,
showUnconfirmedMessage: noop,
encryptor: { encryptor: {
encrypt(_, object) { encrypt(_, object) {
this.object = object this.object = object