Cleaning up merge

app/_locales/es/messages.json

@@ -2660,11 +2660,11 @@
     "description": "Return the user to the site that initiated onboarding"
   },
   "onboardingShowIncomingTransactionsDescription": {
-    "message": "Mostrar las transacciones entrantes en su cartera depende de la comunicación con $1. Etherscan tendrá acceso a su dirección de Ethereum y a su dirección IP. Ver $2.",
+    "message": "Mostrar las transacciones entrantes en su cartera depende de la comunicación con $1. Etherscan tendrá acceso a su dirección de Ethereum y a su dirección IP. Ver 2$.",
     "description": "$1 is a clickable link with text defined by the 'etherscan' key. $2 is a clickable link with text defined by the 'privacyMsg' key."
   },
   "onboardingUsePhishingDetectionDescription": {
-    "message": "Las alertas de detección de phishing se basan en la comunicación con $1. jsDeliver tendrá acceso a su dirección IP. Ver $2.",
+    "message": "Las alertas de detección de phishing se basan en la comunicación con $1. jsDeliver tendrá acceso a su dirección IP. Ver 2$.",
     "description": "The $1 is the word 'jsDeliver', from key 'jsDeliver' and $2 is the words Privacy Policy from key 'privacyMsg', both separated here so that it can be wrapped as a link"
   },
   "onlyAddTrustedNetworks": {

lavamoat/browserify/beta/policy.json

@@ -485,16 +485,11 @@
     },
     "@metamask/approval-controller": {
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
         "eth-rpc-errors": true
       }
     },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/approval-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -517,6 +512,7 @@
         "@metamask/assets-controllers>abort-controller": true,
         "@metamask/assets-controllers>multiformats": true,
         "@metamask/base-controller": true,
+        "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
         "@metamask/metamask-eth-abis": true,
         "browserify>events": true,
@@ -923,8 +919,8 @@
     },
     "@metamask/permission-controller": {
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
         "eth-rpc-errors": true,
@@ -932,11 +928,6 @@
         "json-rpc-engine": true
       }
     },
-    "@metamask/permission-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -947,18 +938,13 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/controller-utils>isomorphic-fetch": true,
-        "@metamask/phishing-controller>@metamask/base-controller": true,
         "@metamask/phishing-controller>eth-phishing-detect": true,
         "punycode": true
       }
     },
-    "@metamask/phishing-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/phishing-controller>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
@@ -1073,12 +1059,7 @@
     },
     "@metamask/subject-metadata-controller": {
       "packages": {
-        "@metamask/subject-metadata-controller>@metamask/base-controller": true
+        "@metamask/base-controller": true
-      }
-    },
-    "@metamask/subject-metadata-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
       }
     },
     "@ngraveio/bc-ur": {

lavamoat/browserify/flask/policy.json

@@ -485,16 +485,11 @@
     },
     "@metamask/approval-controller": {
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
         "eth-rpc-errors": true
       }
     },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/approval-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -517,6 +512,7 @@
         "@metamask/assets-controllers>abort-controller": true,
         "@metamask/assets-controllers>multiformats": true,
         "@metamask/base-controller": true,
+        "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
         "@metamask/metamask-eth-abis": true,
         "browserify>events": true,
@@ -935,8 +931,8 @@
     },
     "@metamask/permission-controller": {
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
         "eth-rpc-errors": true,
@@ -944,11 +940,6 @@
         "json-rpc-engine": true
       }
     },
-    "@metamask/permission-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -959,18 +950,13 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/controller-utils>isomorphic-fetch": true,
-        "@metamask/phishing-controller>@metamask/base-controller": true,
         "@metamask/phishing-controller>eth-phishing-detect": true,
         "punycode": true
       }
     },
-    "@metamask/phishing-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/phishing-controller>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
@@ -1398,12 +1384,7 @@
     },
     "@metamask/subject-metadata-controller": {
       "packages": {
-        "@metamask/subject-metadata-controller>@metamask/base-controller": true
+        "@metamask/base-controller": true
-      }
-    },
-    "@metamask/subject-metadata-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
       }
     },
     "@ngraveio/bc-ur": {

lavamoat/browserify/main/policy.json

@@ -485,16 +485,11 @@
     },
     "@metamask/approval-controller": {
       "packages": {
-        "@metamask/approval-controller>@metamask/base-controller": true,
         "@metamask/approval-controller>nanoid": true,
+        "@metamask/base-controller": true,
         "eth-rpc-errors": true
       }
     },
-    "@metamask/approval-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/approval-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -517,6 +512,7 @@
         "@metamask/assets-controllers>abort-controller": true,
         "@metamask/assets-controllers>multiformats": true,
         "@metamask/base-controller": true,
+        "@metamask/contract-metadata": true,
         "@metamask/controller-utils": true,
         "@metamask/metamask-eth-abis": true,
         "browserify>events": true,
@@ -923,8 +919,8 @@
     },
     "@metamask/permission-controller": {
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
-        "@metamask/permission-controller>@metamask/base-controller": true,
         "@metamask/permission-controller>nanoid": true,
         "deep-freeze-strict": true,
         "eth-rpc-errors": true,
@@ -932,11 +928,6 @@
         "json-rpc-engine": true
       }
     },
-    "@metamask/permission-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/permission-controller>nanoid": {
       "globals": {
         "crypto.getRandomValues": true
@@ -947,18 +938,13 @@
         "fetch": true
       },
       "packages": {
+        "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/controller-utils>isomorphic-fetch": true,
-        "@metamask/phishing-controller>@metamask/base-controller": true,
         "@metamask/phishing-controller>eth-phishing-detect": true,
         "punycode": true
       }
     },
-    "@metamask/phishing-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/phishing-controller>eth-phishing-detect": {
       "packages": {
         "eslint>optionator>fast-levenshtein": true
@@ -1073,12 +1059,7 @@
     },
     "@metamask/subject-metadata-controller": {
       "packages": {
-        "@metamask/subject-metadata-controller>@metamask/base-controller": true
+        "@metamask/base-controller": true
-      }
-    },
-    "@metamask/subject-metadata-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
       }
     },
     "@ngraveio/bc-ur": {

lavamoat/build-system/policy.json

@@ -1913,6 +1913,7 @@
       },
       "packages": {
         "chokidar>braces": true,
+        "chokidar>fsevents": true,
         "chokidar>glob-parent": true,
         "chokidar>is-binary-path": true,
         "chokidar>normalize-path": true,
@@ -1939,6 +1940,13 @@
         "chokidar>braces>fill-range>to-regex-range>is-number": true
       }
     },
+    "chokidar>fsevents": {
+      "globals": {
+        "console.assert": true,
+        "process.platform": true
+      },
+      "native": true
+    },
     "chokidar>glob-parent": {
       "builtin": {
         "os.platform": true,
@@ -4290,6 +4298,7 @@
         "gulp-watch>chokidar>anymatch": true,
         "gulp-watch>chokidar>async-each": true,
         "gulp-watch>chokidar>braces": true,
+        "gulp-watch>chokidar>fsevents": true,
         "gulp-watch>chokidar>is-binary-path": true,
         "gulp-watch>chokidar>readdirp": true,
         "gulp-watch>chokidar>upath": true,
@@ -4662,6 +4671,142 @@
         "enzyme>rst-selector-parser>nearley>randexp>ret": true
       }
     },
+    "gulp-watch>chokidar>fsevents": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "fs.stat": true,
+        "path.join": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.assert": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "fs.existsSync": true,
+        "fs.readFileSync": true,
+        "fs.renameSync": true,
+        "path.dirname": true,
+        "path.existsSync": true,
+        "path.join": true,
+        "path.resolve": true,
+        "url.parse": true,
+        "url.resolve": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.log": true,
+        "process.arch": true,
+        "process.cwd": true,
+        "process.env": true,
+        "process.platform": true,
+        "process.version.substr": true,
+        "process.versions": true
+      },
+      "packages": {
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>npmlog": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>detect-libc": {
+      "builtin": {
+        "child_process.spawnSync": true,
+        "fs.readdirSync": true,
+        "os.platform": true
+      },
+      "globals": {
+        "process.env": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt": {
+      "builtin": {
+        "path": true,
+        "stream.Stream": true,
+        "url": true
+      },
+      "globals": {
+        "console": true,
+        "process.argv": true,
+        "process.env.DEBUG_NOPT": true,
+        "process.env.NOPT_DEBUG": true,
+        "process.platform": true
+      },
+      "packages": {
+        "@lavamoat/allow-scripts>@npmcli/run-script>node-gyp>nopt>abbrev": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv": {
+      "builtin": {
+        "child_process.exec": true,
+        "path": true
+      },
+      "globals": {
+        "process.env.COMPUTERNAME": true,
+        "process.env.ComSpec": true,
+        "process.env.EDITOR": true,
+        "process.env.HOSTNAME": true,
+        "process.env.PATH": true,
+        "process.env.PROMPT": true,
+        "process.env.PS1": true,
+        "process.env.Path": true,
+        "process.env.SHELL": true,
+        "process.env.USER": true,
+        "process.env.USERDOMAIN": true,
+        "process.env.USERNAME": true,
+        "process.env.VISUAL": true,
+        "process.env.path": true,
+        "process.nextTick": true,
+        "process.platform": true
+      },
+      "packages": {
+        "@storybook/core>@storybook/core-server>x-default-browser>default-browser-id>untildify>os-homedir": true,
+        "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>nopt>osenv>os-tmpdir": {
+      "globals": {
+        "process.env.SystemRoot": true,
+        "process.env.TEMP": true,
+        "process.env.TMP": true,
+        "process.env.TMPDIR": true,
+        "process.env.windir": true,
+        "process.platform": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>rimraf": {
+      "builtin": {
+        "assert": true,
+        "fs": true,
+        "path.join": true
+      },
+      "globals": {
+        "process.platform": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "nyc>glob": true
+      }
+    },
+    "gulp-watch>chokidar>fsevents>node-pre-gyp>semver": {
+      "globals": {
+        "console": true,
+        "process": true
+      }
+    },
     "gulp-watch>chokidar>is-binary-path": {
       "builtin": {
         "path.extname": true
@@ -4695,15 +4840,15 @@
         "process.platform": true
       },
       "packages": {
+        "@babel/register>clone-deep>kind-of": true,
         "gulp-watch>chokidar>braces": true,
+        "gulp-watch>chokidar>braces>array-unique": true,
         "gulp-watch>chokidar>braces>snapdragon": true,
         "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp-watch>chokidar>readdirp>micromatch>arr-diff": true,
-        "gulp-watch>chokidar>readdirp>micromatch>array-unique": true,
         "gulp-watch>chokidar>readdirp>micromatch>define-property": true,
-        "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": true,
         "gulp-watch>chokidar>readdirp>micromatch>extglob": true,
-        "gulp-watch>chokidar>readdirp>micromatch>kind-of": true,
+        "gulp-zip>plugin-error>arr-diff": true,
+        "gulp-zip>plugin-error>extend-shallow": true,
         "gulp>gulp-cli>liftoff>fined>object.pick": true,
         "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
         "gulp>gulp-cli>matchdep>micromatch>nanomatch": true,
@@ -4716,22 +4861,11 @@
         "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
       }
     },
-    "gulp-watch>chokidar>readdirp>micromatch>extend-shallow": {
-      "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": true,
-        "gulp-zip>plugin-error>extend-shallow>assign-symbols": true
-      }
-    },
-    "gulp-watch>chokidar>readdirp>micromatch>extend-shallow>is-extendable": {
-      "packages": {
-        "@babel/register>clone-deep>is-plain-object": true
-      }
-    },
     "gulp-watch>chokidar>readdirp>micromatch>extglob": {
       "packages": {
+        "gulp-watch>chokidar>braces>array-unique": true,
         "gulp-watch>chokidar>braces>snapdragon": true,
         "gulp-watch>chokidar>braces>to-regex": true,
-        "gulp-watch>chokidar>readdirp>micromatch>array-unique": true,
         "gulp-watch>chokidar>readdirp>micromatch>extglob>define-property": true,
         "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets": true,
         "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": true,
@@ -4792,22 +4926,32 @@
     },
     "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>kind-of": true
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-accessor-descriptor>kind-of": {
+      "packages": {
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor": {
       "packages": {
-        "gulp-watch>anymatch>micromatch>kind-of": true
+        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": true
+      }
+    },
+    "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>define-property>is-descriptor>is-data-descriptor>kind-of": {
+      "packages": {
+        "browserify>insert-module-globals>is-buffer": true
       }
     },
     "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow": {
       "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>expand-brackets>extend-shallow>is-extendable": true
+        "gulp-watch>chokidar>braces>extend-shallow>is-extendable": true
       }
     },
     "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow": {
       "packages": {
-        "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow>is-extendable": true
+        "gulp-watch>chokidar>braces>extend-shallow>is-extendable": true
       }
     },
     "gulp-watch>chokidar>upath": {
@@ -5069,15 +5213,15 @@
       },
       "packages": {
         "@babel/register>clone-deep>kind-of": true,
+        "gulp-watch>chokidar>braces>array-unique": true,
         "gulp-watch>chokidar>braces>snapdragon": true,
         "gulp-watch>chokidar>braces>to-regex": true,
         "gulp-zip>plugin-error>arr-diff": true,
+        "gulp-zip>plugin-error>extend-shallow": true,
         "gulp>glob-watcher>anymatch>micromatch>define-property": true,
-        "gulp>glob-watcher>anymatch>micromatch>extend-shallow": true,
         "gulp>glob-watcher>anymatch>micromatch>extglob": true,
         "gulp>glob-watcher>chokidar>braces": true,
         "gulp>gulp-cli>liftoff>fined>object.pick": true,
-        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
         "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
         "gulp>gulp-cli>matchdep>micromatch>nanomatch": true,
         "gulp>gulp-cli>matchdep>micromatch>regex-not": true
@@ -5089,25 +5233,14 @@
         "gulp>gulp-cli>matchdep>micromatch>define-property>is-descriptor": true
       }
     },
-    "gulp>glob-watcher>anymatch>micromatch>extend-shallow": {
-      "packages": {
-        "gulp-zip>plugin-error>extend-shallow>assign-symbols": true,
-        "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": true
-      }
-    },
-    "gulp>glob-watcher>anymatch>micromatch>extend-shallow>is-extendable": {
-      "packages": {
-        "@babel/register>clone-deep>is-plain-object": true
-      }
-    },
     "gulp>glob-watcher>anymatch>micromatch>extglob": {
       "packages": {
-        "gulp-watch>chokidar>braces>extend-shallow": true,
+        "gulp-watch>chokidar>braces>array-unique": true,
         "gulp-watch>chokidar>braces>snapdragon": true,
         "gulp-watch>chokidar>braces>to-regex": true,
         "gulp>glob-watcher>anymatch>micromatch>extglob>define-property": true,
         "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets": true,
-        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": true,
         "gulp>gulp-cli>matchdep>micromatch>fragment-cache": true,
         "gulp>gulp-cli>matchdep>micromatch>regex-not": true
       }
@@ -5122,11 +5255,11 @@
         "__filename": true
       },
       "packages": {
-        "gulp-watch>chokidar>braces>extend-shallow": true,
         "gulp-watch>chokidar>braces>snapdragon": true,
         "gulp-watch>chokidar>braces>to-regex": true,
         "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>debug": true,
         "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>define-property": true,
+        "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": true,
         "gulp>gulp-cli>matchdep>micromatch>extglob>expand-brackets>posix-character-classes": true,
         "gulp>gulp-cli>matchdep>micromatch>regex-not": true
       }
@@ -5183,28 +5316,30 @@
         "browserify>insert-module-globals>is-buffer": true
       }
     },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>expand-brackets>extend-shallow": {
+      "packages": {
+        "gulp-watch>chokidar>braces>extend-shallow>is-extendable": true
+      }
+    },
+    "gulp>glob-watcher>anymatch>micromatch>extglob>extend-shallow": {
+      "packages": {
+        "gulp-watch>chokidar>braces>extend-shallow>is-extendable": true
+      }
+    },
     "gulp>glob-watcher>anymatch>normalize-path": {
       "packages": {
         "vinyl>remove-trailing-separator": true
       }
     },
     "gulp>glob-watcher>async-done": {
-      "builtin": {
-        "domain.create": true
-      },
       "globals": {
         "process.nextTick": true
       },
       "packages": {
         "end-of-stream": true,
-        "gulp>glob-watcher>async-done>process-nextick-args": true,
         "gulp>glob-watcher>async-done>stream-exhaust": true,
-        "pump>once": true
+        "pump>once": true,
-      }
+        "readable-stream>process-nextick-args": true
-    },
-    "gulp>glob-watcher>async-done>process-nextick-args": {
-      "globals": {
-        "process": true
       }
     },
     "gulp>glob-watcher>async-done>stream-exhaust": {
@@ -5239,14 +5374,15 @@
         "setTimeout": true
       },
       "packages": {
+        "chokidar>normalize-path": true,
         "eslint>is-glob": true,
         "gulp-watch>chokidar>async-each": true,
-        "gulp-watch>glob-parent": true,
         "gulp-watch>path-is-absolute": true,
         "gulp>glob-watcher>anymatch": true,
         "gulp>glob-watcher>chokidar>braces": true,
+        "gulp>glob-watcher>chokidar>fsevents": true,
+        "gulp>glob-watcher>chokidar>glob-parent": true,
         "gulp>glob-watcher>chokidar>is-binary-path": true,
-        "gulp>glob-watcher>chokidar>normalize-path": true,
         "gulp>glob-watcher>chokidar>readdirp": true,
         "gulp>glob-watcher>chokidar>upath": true,
         "pumpify>inherits": true
@@ -5254,29 +5390,39 @@
     },
     "gulp>glob-watcher>chokidar>braces": {
       "packages": {
-        "gulp-watch>chokidar>braces>extend-shallow": true,
+        "gulp-watch>chokidar>braces>array-unique": true,
         "gulp-watch>chokidar>braces>repeat-element": true,
         "gulp-watch>chokidar>braces>snapdragon": true,
         "gulp-watch>chokidar>braces>snapdragon-node": true,
         "gulp-watch>chokidar>braces>split-string": true,
         "gulp-watch>chokidar>braces>to-regex": true,
+        "gulp>glob-watcher>chokidar>braces>extend-shallow": true,
         "gulp>glob-watcher>chokidar>braces>fill-range": true,
         "gulp>gulp-cli>isobject": true,
-        "gulp>gulp-cli>matchdep>micromatch>array-unique": true,
         "gulp>undertaker>arr-flatten": true
       }
     },
+    "gulp>glob-watcher>chokidar>braces>extend-shallow": {
+      "packages": {
+        "gulp-watch>chokidar>braces>extend-shallow>is-extendable": true
+      }
+    },
     "gulp>glob-watcher>chokidar>braces>fill-range": {
       "builtin": {
         "util.inspect": true
       },
       "packages": {
-        "gulp-watch>chokidar>braces>extend-shallow": true,
+        "gulp>glob-watcher>chokidar>braces>fill-range>extend-shallow": true,
         "gulp>glob-watcher>chokidar>braces>fill-range>is-number": true,
         "gulp>glob-watcher>chokidar>braces>fill-range>to-regex-range": true,
         "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
       }
     },
+    "gulp>glob-watcher>chokidar>braces>fill-range>extend-shallow": {
+      "packages": {
+        "gulp-watch>chokidar>braces>extend-shallow>is-extendable": true
+      }
+    },
     "gulp>glob-watcher>chokidar>braces>fill-range>is-number": {
       "packages": {
         "gulp>glob-watcher>chokidar>braces>fill-range>is-number>kind-of": true
@@ -5293,6 +5439,39 @@
         "stylelint>@stylelint/postcss-markdown>remark>remark-parse>repeat-string": true
       }
     },
+    "gulp>glob-watcher>chokidar>fsevents": {
+      "builtin": {
+        "events.EventEmitter": true,
+        "fs.stat": true,
+        "path.join": true,
+        "util.inherits": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.assert": true,
+        "process.nextTick": true,
+        "process.platform": true,
+        "setImmediate": true
+      },
+      "packages": {
+        "gulp-watch>chokidar>fsevents>node-pre-gyp": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>glob-parent": {
+      "builtin": {
+        "os.platform": true,
+        "path": true
+      },
+      "packages": {
+        "gulp-watch>glob-parent>path-dirname": true,
+        "gulp>glob-watcher>chokidar>glob-parent>is-glob": true
+      }
+    },
+    "gulp>glob-watcher>chokidar>glob-parent>is-glob": {
+      "packages": {
+        "gulp>glob-watcher>chokidar>glob-parent>is-glob>is-extglob": true
+      }
+    },
     "gulp>glob-watcher>chokidar>is-binary-path": {
       "builtin": {
         "path.extname": true

test/e2e/snaps/test-snap-bip-32.spec.js

@@ -72,10 +72,7 @@ describe('Test Snap bip-32', function () {
         });
 
         // wait for permissions popover, click checkboxes and confirm
-        await driver.waitForSelector({
+        await driver.delay(1000);
-          css: '.popover-header',
-          text: 'Are you sure?',
-        });
         await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
         await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
         await driver.clickElement({
@@ -91,10 +88,7 @@ describe('Test Snap bip-32', function () {
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
         // scroll to and click get public key
-        await driver.waitForSelector({
+        await driver.delay(1000);
-          css: '#connectBip32',
-          text: 'Reconnect to BIP-32 Snap',
-        });
         const snapButton2 = await driver.findElement('#bip32GetPublic');
         await driver.scrollToElement(snapButton2);
         await driver.delay(1000);

test/e2e/snaps/test-snap-bip-44.spec.js

@@ -71,10 +71,7 @@ describe('Test Snap bip-44', function () {
         });
 
         // deal with permissions popover
-        await driver.waitForSelector({
+        await driver.delay(1000);
-          css: '.popover-header',
-          text: 'Are you sure?',
-        });
         await driver.clickElement('#key-access-bip44-1-0');
         await driver.delay(1000);
         await driver.clickElement({
@@ -88,10 +85,7 @@ describe('Test Snap bip-44', function () {
         // click send inputs on test snap page
         windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.waitForSelector({
+        await driver.delay(1000);
-          css: '#connectBip44Snap',
-          text: 'Reconnect to BIP-44 Snap',
-        });
         await driver.clickElement('#sendBip44Test');
 
         // check the results of the public key test

test/e2e/snaps/test-snap-confirm.spec.js

@@ -76,10 +76,6 @@ describe('Test Snap Confirm', function () {
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
         // click send inputs on test snap page
-        await driver.waitForSelector({
-          css: '#connectConfirmSnap',
-          text: 'Reconnect to Confirm Snap',
-        });
         const snapButton2 = await driver.findElement('#sendConfirmButton');
         await driver.scrollToElement(snapButton2);
         await driver.delay(1000);

test/e2e/snaps/test-snap-error.spec.js

@@ -75,10 +75,7 @@ describe('Test Snap Error', function () {
         // click send inputs on test snap page
         windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.waitForSelector({
+        await driver.delay(1000);
-          css: '#connectErrorSnap',
-          text: 'Reconnect to Error Snap',
-        });
 
         // find and click on send error
         await driver.clickElement('#sendError');

test/e2e/snaps/test-snap-installed.spec.js

@@ -74,10 +74,6 @@ describe('Test Snap Installed', function () {
         // click send inputs on test snap page
         windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.waitForSelector({
-          css: '#connectConfirmSnap',
-          text: 'Reconnect to Confirm Snap',
-        });
 
         const errorButton = await driver.findElement('#connectErrorSnap');
         await driver.scrollToElement(errorButton);
@@ -116,10 +112,6 @@ describe('Test Snap Installed', function () {
 
         windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.waitForSelector({
-          css: '#connectErrorSnap',
-          text: 'Reconnect to Error Snap',
-        });
 
         const result = await driver.findElement('#installedSnapsResult');
         await driver.scrollToElement(result);

test/e2e/snaps/test-snap-managestate.spec.js

@@ -83,9 +83,7 @@ describe('Test Snap manageState', function () {
         );
         await driver.scrollToElement(snapButton2);
         await driver.delay(1000);
-        const sendButton = await driver.findElement('#sendManageState');
+        await driver.clickElement('#sendManageState');
-        await driver.scrollToElement(sendButton);
-        await sendButton.click();
 
         // check the results of the public key test
         await driver.delay(1000);
@@ -105,9 +103,7 @@ describe('Test Snap manageState', function () {
         );
 
         // click clear results
-        const clearButton = await driver.findElement('#clearManageState');
+        await driver.clickElement('#clearManageState');
-        await driver.scrollToElement(clearButton);
-        await clearButton.click();
 
         // check if true
         await driver.delay(1000);

test/e2e/snaps/test-snap-notification.spec.js

@@ -76,10 +76,7 @@ describe('Test Snap Notification', function () {
         // click send inputs on test snap page
         windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.waitForSelector({
+        await driver.delay(1000);
-          css: '#connectNotification',
-          text: 'Reconnect to Notification Snap',
-        });
         await driver.clickElement('#sendInAppNotification');
 
         // switch back to the extension page

test/e2e/snaps/test-snap-update.spec.js

@@ -70,10 +70,7 @@ describe('Test Snap update', function () {
         });
 
         // wait for permissions popover, click checkboxes and confirm
-        await driver.waitForSelector({
+        await driver.delay(1000);
-          css: '.popover-header',
-          text: 'Are you sure?',
-        });
         await driver.clickElement('#key-access-bip32-m-44h-0h-secp256k1-0');
         await driver.clickElement('#key-access-bip32-m-44h-0h-ed25519-0');
         await driver.clickElement({
@@ -87,10 +84,7 @@ describe('Test Snap update', function () {
         // navigate to test snap page
         windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.waitForSelector({
+        await driver.delay(1000);
-          css: '#connectUpdate',
-          text: 'Reconnect to Update Snap',
-        });
 
         // find and scroll to the correct card and click first
         const snapButton2 = await driver.findElement('#connectUpdateNew');
@@ -122,10 +116,8 @@ describe('Test Snap update', function () {
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
 
         // look for the correct version text
-        const versionResult = await driver.waitForSelector({
+        const versionResult = await driver.findElement('#updateSnapVersion');
-          css: '#updateSnapVersion',
+        await driver.delay(1000);
-          text: '"4.0.2"',
-        });
         assert.equal(await versionResult.getText(), '"4.0.2"');
       },
     );

ui/pages/onboarding-flow/create-password/create-password.js

@@ -189,7 +189,6 @@ export default function CreatePassword({
           <FormField
             dataTestId="create-password-new"
             autoFocus
-            error={passwordError}
             passwordStrength={passwordStrength}
             passwordStrengthText={passwordStrengthText}
             onChange={handlePasswordChange}