From e291a2d4b9ea491147f8073c083ed722c1f2f8fb Mon Sep 17 00:00:00 2001
From: Amaury Martiny <amaury.martiny@gmail.com>
Date: Mon, 12 Mar 2018 14:21:14 +0100
Subject: [PATCH 1/2] Fix bug inject.js windows

---
 src/Dapp/dapp.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/Dapp/dapp.js b/src/Dapp/dapp.js
index 18c1823..ccd7fcc 100644
--- a/src/Dapp/dapp.js
+++ b/src/Dapp/dapp.js
@@ -29,12 +29,6 @@ import HistoryStore from '@parity/shared/lib/mobx/historyStore';
 import RequestsStore from '../DappRequests/store';
 import styles from './dapp.css';
 
-let remote;
-
-if (isElectron()) {
-  remote = window.require('electron').remote;
-}
-
 const internalDapps = [].concat(viewsDapps, builtinDapps);
 
 @observer
@@ -129,19 +123,30 @@ export default class Dapp extends Component {
     />
   )
 
-  renderWebview = (src, hash) => (
-    <webview
+  renderWebview = (src, hash) => {
+    const remote = window.require('electron').remote;
+    // Replace all backslashes by front-slashes (happens in Windows)
+    // Note: `dirName` contains backslashes in Windows. One would assume that
+    // path.join in Windows would handle everything for us, but after some time
+    // I realized that even in Windows path.join here bahaves like POSIX (maybe
+    // it's electron, maybe browser env?). Switching to '/'. -Amaury 12.03.2018
+    const posixDirName = remote.getGlobal('dirName').replace(/\\/g, '/');
+    const preload = `file://${path.join(
+      posixDirName,
+      '..',
+      '.build',
+      'inject.js'
+    )}`;
+
+    return <webview
       className={ styles.frame }
       id='dappFrame'
       nodeintegration='true'
-      preload={ `file://${path.join(
-        remote.getGlobal('dirName'),
-        '../.build/inject.js'
-      )}` }
+      preload={ preload }
       ref={ this.handleWebview }
       src={ `${src}${hash}` }
-    />
-  );
+           />;
+  }
 
   render () {
     const { dappsUrl } = this.context.api;
-- 
GitLab


From 368b34f348a3e7ea65735c89dc0f8fdbef114b1d Mon Sep 17 00:00:00 2001
From: Amaury Martiny <amaury.martiny@gmail.com>
Date: Mon, 12 Mar 2018 14:22:18 +0100
Subject: [PATCH 2/2] Update package.json

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fef1594..1b97895 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "Parity",
-  "version": "1.10.0",
+  "name": "parity-wallet",
+  "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -112,10 +112,10 @@
           "integrity": "sha512-aG79IOxMBeRsu92Zlq3QsR6Z6PAmlhmOdU9tQP+F9XB/44Y4sGxfSDNucGucWz/Jz0VGerJn53CoACa4Yj5uYA==",
           "dev": true,
           "requires": {
-            "@parity/api": "2.1.15",
+            "@parity/api": "2.1.20",
             "@parity/etherscan": "2.1.3",
             "@parity/mobx": "1.1.2",
-            "@parity/shared": "2.2.24",
+            "@parity/shared": "2.2.25",
             "babel-runtime": "6.26.0",
             "bignumber.js": "4.1.0",
             "brace": "0.11.0",
@@ -266,10 +266,10 @@
           "integrity": "sha512-aG79IOxMBeRsu92Zlq3QsR6Z6PAmlhmOdU9tQP+F9XB/44Y4sGxfSDNucGucWz/Jz0VGerJn53CoACa4Yj5uYA==",
           "dev": true,
           "requires": {
-            "@parity/api": "2.1.15",
+            "@parity/api": "2.1.20",
             "@parity/etherscan": "2.1.3",
             "@parity/mobx": "1.1.2",
-            "@parity/shared": "2.2.24",
+            "@parity/shared": "2.2.25",
             "babel-runtime": "6.26.0",
             "bignumber.js": "4.1.0",
             "brace": "0.11.0",
@@ -18675,4 +18675,4 @@
       "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA="
     }
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 416abf2..6bebe03 100644
--- a/package.json
+++ b/package.json
@@ -179,4 +179,4 @@
     "solc": "ngotchac/solc-js",
     "store": "1.3.20"
   }
-}
\ No newline at end of file
+}
-- 
GitLab