diff --git a/app/extensions.js b/app/extensions.js index dbf9a7a568c..f7858961c35 100644 --- a/app/extensions.js +++ b/app/extensions.js @@ -469,7 +469,7 @@ module.exports.init = () => { } if (!extensionInfo.isLoaded(extensionId) && !extensionInfo.isLoading(extensionId)) { extensionInfo.setState(extensionId, extensionStates.LOADING) - if (extensionId === config.braveExtensionId || extensionId === config.torrentExtensionId || extensionId === config.syncExtensionId) { + if (extensionId === config.braveExtensionId || extensionId === config.torrentExtensionId || extensionId === config.cryptoTokenExtensionId || extensionId === config.syncExtensionId) { session.defaultSession.extensions.load(extensionPath, manifest, manifestLocation) return } @@ -511,6 +511,9 @@ module.exports.init = () => { // Manually install the braveExtension and torrentExtension extensionInfo.setState(config.braveExtensionId, extensionStates.REGISTERED) loadExtension(config.braveExtensionId, getExtensionsPath('brave'), generateBraveManifest(), 'component') + // Cryptotoken extension is loaded from electron_resources.pak + extensionInfo.setState(config.cryptoTokenExtensionId, extensionStates.REGISTERED) + loadExtension(config.cryptoTokenExtensionId, path.join(process.resourcesPath, 'cryptotoken'), {}, 'component') extensionInfo.setState(config.syncExtensionId, extensionStates.REGISTERED) loadExtension(config.syncExtensionId, getExtensionsPath('brave'), generateSyncManifest(), 'unpacked') diff --git a/app/renderer/components/preferences/extensionsTab.js b/app/renderer/components/preferences/extensionsTab.js index daf93976cab..1ecf80fd6b8 100644 --- a/app/renderer/components/preferences/extensionsTab.js +++ b/app/renderer/components/preferences/extensionsTab.js @@ -50,7 +50,7 @@ class ExtensionsTab extends ImmutableComponent { } getRow (extension) { - if ([config.braveExtensionId, config.syncExtensionId].includes(extension.get('id')) || + if ([config.braveExtensionId, config.syncExtensionId, config.cryptoTokenExtensionId].includes(extension.get('id')) || (!extension.get('dummy') && this.isRemovableExtension(extension))) { return [] } diff --git a/js/constants/config.js b/js/constants/config.js index 41a7ff5e4d0..c16d3aa3207 100644 --- a/js/constants/config.js +++ b/js/constants/config.js @@ -86,6 +86,7 @@ module.exports = { pinterestExtensionPublicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDB95q2hyt49ZDuVnYI91XaZhqQkbXu0X3fzoNxPxhFbfqGKwtts90LJ7lD5DCIfnBg8WGFhp3eW4GxOglAKrnksmJoyAD5PnSAufx8fD3trZvo/ZAqFx1x5Xm3Rm34EgvVXdralgHSYiqcEU/FX3kYnLLhr2TS4lcrsn1KZd/lcQIDAQAB', metamaskExtensionId: 'nkbihfbeogaeaoehlefnkodbefgpgknn', metamaskPublicKey: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlcgI4VVL4JUvo6hlSgeCZp9mGltZrzFvc2Asqzb1dDGO9baoYOe+QRoh27/YyVXugxni480Q/R147INhBOyQZVMhZOD5pFMVutia9MHMaZhgRXzrK3BHtNSkKLL1c5mhutQNwiLqLtFkMSGvka91LoMEC8WTI0wi4tACnJ5FyFZQYzvtqy5sXo3VS3gzfOBluLKi7BxYcaUJjNrhOIxl1xL2qgK5lDrDOLKcbaurDiwqofVtAFOL5sM3uJ6D8nOO9tG+T7hoobRFN+nxk43PHgCv4poicOv+NMZQEk3da1m/xfuzXV88NcE/YRbRLwAS82m3gsJZKc6mLqm4wZHzBwIDAQAB', + cryptoTokenExtensionId: 'kmendfapggjehodndflmmgagdbamhnfd', newtab: { fallbackImage: { name: 'Bay Bridge',