Merge branch 'master' into go-signer

app/store/actions/index.js

@@ -36,12 +36,13 @@ export const addRequest = (u, request) => {
   u('signer.requests', (requests, state) => {
     if (state.frame.type === 'tray') ipcRenderer.send('frame:showTray')
     if (request.type === 'approveTransaction') requests[request.handlerId] = request
-    if (request.type === 'requestProvider') requests[request.origin] = request
+    if (request.type === 'requestProvider') requests[request.origin.replace('.', '')] = request
     return requests
   })
 }
 
 export const giveAccess = (u, origin, access) => {
+  origin = origin.replace('.', '')
   u('permissions', origin, 'provider', provider => access)
   u('signer.requests', (requests, state) => {
     delete requests[origin]
@@ -50,6 +51,7 @@ export const giveAccess = (u, origin, access) => {
 }
 
 export const toggleAccess = (u, origin) => {
+  origin = origin.replace('.', '')
   u('permissions', origin, 'provider', provider => !provider)
 }
 

app/ws/index.js

@@ -3,7 +3,7 @@ import store from '../store'
 
 const allowed = (req, proceed) => {
   let obs = store.observer(_ => {
-    let permissions = store('permissions', req.origin)
+    let permissions = store('permissions', req.origin.replace('.', ''))
     if (!permissions) return store.addRequest({type: 'requestProvider', origin: req.origin, notice: `${req.origin} is requesting access to the provider.`})
     setTimeout(_ => obs.remove(), 0) // Add fix for this pattern in restore
     permissions.provider ? proceed(req.accept(null, req.origin)) : req.reject()

extension/index.js

@@ -0,0 +1,5 @@
+/* globals chrome */
+
+chrome.browserAction.onClicked.addListener(tab => {
+  chrome.tabs.executeScript(tab.ib, {file: 'inject.js'})
+})

extension/inject.js

@@ -0,0 +1,3 @@
+(_ => {
+  console.log('Injecting Frame Connection')
+})()

extension/manifest.json

@@ -0,0 +1,20 @@
+{
+  "name": "Frame",
+  "version": "0.0.0",
+  "manifest_version": 0,
+  "description": "Frame",
+  "homepage_url": "https://github.com/floating/frame",
+  "background": {
+    "scripts": ["index.js"],
+    "persistent": true
+  },
+  "browser_action": {
+    "default_title": "Frame"
+  },
+  "permissions": [
+    "activeTab",
+    "https://*/*",
+    "http://*/*",
+    "tabs"
+  ]
+}