Merge branch 'develop'

adshares · Jan 11, 2019 · 1bdb792 · 1bdb792
2 parents 601ef88 + 3304690
commit 1bdb792
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/chrome/extension/adswallet.js b/chrome/extension/adswallet.js
@@ -7,7 +7,7 @@ import './adswallet.css';
 
 function createHistory(initialState) {
   const history = createHashHistory();
-  if (history.location.pathname === '/') {
+  if (history.location.pathname === '/' && initialState.router && initialState.router.location) {
     if (history.location.pathname !== initialState.router.location.pathname ||
         history.location.search !== initialState.router.location.search ||
         history.location.hash !== initialState.router.location.hash) {

diff --git a/chrome/manifest.prod.json b/chrome/manifest.prod.json
@@ -3,7 +3,12 @@
   "version": "0.1.1",
   "description": "Secure identity vault for Adshares network.",
   "author": "https://adshares.net/",
-  "permissions": [ "storage", "unlimitedStorage" ],
+  "permissions": [
+    "storage",
+    "unlimitedStorage",
+    "clipboardWrite",
+    "tabs"
+  ],
   "content_security_policy": "default-src 'self'; script-src 'self'; style-src * 'unsafe-inline';font-src 'self' https://fonts.gstatic.com; img-src 'self' data:; connect-src 'self' https://rpc.adshares.net https://rpc.e11.click data:",
   "background": {
     "page": "background.html"