Merge pull request #41 from MetaMask/fix-descriptions

Fix missing permissions descriptions in prompt
MetaMask · Oct 2, 2019 · f8e274d · f8e274d
2 parents 1aa64ad + 8f80668
commit f8e274d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/app/scripts/controllers/permissions/permissions.js b/app/scripts/controllers/permissions/permissions.js
@@ -209,8 +209,17 @@ class PermissionsController {
    */
   _initializePermissions (restoredState) {
 
-    // TODO:permissions stop persisting permissionsDescriptions and remove this line
-    const initState = { ...restoredState, permissionsRequests: [] }
+    const initState = Object.keys(restoredState)
+      .filter(k => {
+        return ![
+          'permissionsDescriptions',
+          'permissionsRequests',
+        ].includes(k)
+      })
+      .reduce((acc, k) => {
+        acc[k] = restoredState[k]
+        return acc
+      }, {})
 
     this.testProfile = {
       name: 'Dan Finlay',

diff --git a/app/scripts/controllers/plugins.js b/app/scripts/controllers/plugins.js
@@ -149,7 +149,6 @@ class PluginsController extends EventEmitter {
     console.log('running add plugin with ', plugin)
     const { sourceCode, initialPermissions } = plugin
 
-
     const ethereumProvider = this.setupProvider(pluginName, async () => { return {name: pluginName } }, true)
 
     return new Promise((resolve, reject) => {