From e9ccee3d40fe55f24abea07aa9c943d1223d3f02 Mon Sep 17 00:00:00 2001
From: Amaury Martiny <amaury.martiny@gmail.com>
Date: Wed, 9 May 2018 15:34:32 +0200
Subject: [PATCH 1/5] Add redirection to signer after send tx

---
 src/App/App.js                   | 39 ++++++++-------
 src/Send/Send.js                 | 86 ++++++++++++++++++++++++++------
 src/Signer/From/From.js          | 19 +++++++
 src/Signer/From/index.js         |  8 +++
 src/Signer/Signer.js             | 20 ++++++++
 src/Signer/index.js              |  8 +++
 src/stores/createAccountStore.js | 18 +++----
 src/stores/index.js              |  2 +
 src/stores/signerStore.js        | 60 ++++++++++++++++++++++
 9 files changed, 218 insertions(+), 42 deletions(-)
 create mode 100644 src/Signer/From/From.js
 create mode 100644 src/Signer/From/index.js
 create mode 100644 src/Signer/Signer.js
 create mode 100644 src/Signer/index.js
 create mode 100644 src/stores/signerStore.js

diff --git a/src/App/App.js b/src/App/App.js
index a8a464b8..d2f78b29 100644
--- a/src/App/App.js
+++ b/src/App/App.js
@@ -12,6 +12,7 @@ import ProtectedRoute from './ProtectedRoute';
 import Receive from '../Receive';
 import Send from '../Send';
 import Settings from '../Settings';
+import Signer from '../Signer';
 import Tokens from '../Tokens';
 import './App.css';
 
@@ -21,30 +22,34 @@ const Router =
   process.env.NODE_ENV === 'production' ? MemoryRouter : BrowserRouter;
 
 class App extends Component {
-  render () {
+  render() {
     return (
       <Router>
-        <div className='wrapper'>
-          <div className='content'>
-            <div className='connector'>
-              <svg width='60px' height='30px' viewBox='0 0 60 30'>
-                <polygon points='0 30 60 30 30 0' />
+        <div className="wrapper">
+          <div className="content">
+            <div className="connector">
+              <svg width="60px" height="30px" viewBox="0 0 60 30">
+                <polygon points="0 30 60 30 30 0" />
               </svg>
             </div>
-            <div className='window'>
-              <Route path='/loading' component={Loading} />
-              <ProtectedRoute exact path='/' component={Tokens} />
-              <ProtectedRoute path='/settings' component={Settings} />
-              <ProtectedRoute path='/send' component={Send} />
-              <ProtectedRoute path='/receive' component={Receive} />
-              <ProtectedRoute path='/accounts/new' component={CreateAccount} />
+            <div className="window">
+              <Route path="/loading" component={Loading} />
+              <ProtectedRoute exact path="/" component={Tokens} />
+              <ProtectedRoute path="/settings" component={Settings} />
+              <ProtectedRoute path="/send" component={Send} />
+              <ProtectedRoute path="/signer" component={Signer} />
+              <ProtectedRoute path="/receive" component={Receive} />
+              <ProtectedRoute path="/accounts/new" component={CreateAccount} />
 
-              <nav className='primary-nav'>
-                <Link to='/'>Home</Link>
-                <Link to='/receive' className='icon -receive'>
+              <nav className="primary-nav">
+                <Link to="/">Home</Link>
+                {/* @brian Putting a <Link> here for ease of use for us, 
+                but I'll let you decided how/when to show the Signer component */}
+                <Link to="/signer">Signer</Link>
+                <Link to="/receive" className="icon -receive">
                   Receive
                 </Link>
-                <Link to='/settings' className='icon -settings'>
+                <Link to="/settings" className="icon -settings">
                   Settings
                 </Link>
               </nav>
diff --git a/src/Send/Send.js b/src/Send/Send.js
index 47156451..b15984ee 100644
--- a/src/Send/Send.js
+++ b/src/Send/Send.js
@@ -4,39 +4,97 @@
 // SPDX-License-Identifier: MIT
 
 import React, { Component } from 'react';
+import { defaultAccount$, post$ } from '@parity/light.js';
+import { Redirect } from 'react-router-dom';
+import { toWei } from '@parity/api/lib/util/wei';
 
 import ethereumIcon from '../assets/img/tokens/ethereum.png';
+import light from '../hoc';
 
+@light({
+  me: defaultAccount$
+})
 class Send extends Component {
-  render () {
+  state = {
+    amount: 0.01, // In Ether
+    gas: 21000,
+    to: '0x00Ae02834e91810B223E54ce3f9B7875258a1747',
+    txStatus: null
+  };
+
+  handleChangeAmount = ({ target: { value } }) =>
+    this.setState({ amount: value });
+
+  handleChangeGas = ({ target: { value } }) => this.setState({ gas: value });
+
+  handleChangeTo = ({ target: { value } }) => this.setState({ to: value });
+
+  handleSubmit = e => {
+    e.preventDefault();
+    const { me } = this.props;
+    const { amount, gas, to } = this.state;
+
+    post$({
+      from: me,
+      gas,
+      to,
+      value: toWei(amount)
+    }).subscribe(status => this.setState({ status }));
+  };
+
+  render() {
+    const { amount, gas, status, to } = this.state;
+
+    if (status && status.requested) {
+      // Redirect to signer when needed
+      return <Redirect to={`/signer/${status.requested}`} />;
+    }
+
     return (
       <div>
-        <div className='box -card'>
-          <header className='token-header'>
-            <div className='token-header_icon'>
-              <img src={ethereumIcon} alt='ethereum' />
+        <div className="box -card">
+          <header className="token-header">
+            <div className="token-header_icon">
+              <img src={ethereumIcon} alt="ethereum" />
             </div>
-            <div className='token-header_name'>Ethereum</div>
-            <div className='token-header_balance'>42.89</div>
+            <div className="token-header_name">Ethereum</div>
+            <div className="token-header_balance">42.89</div>
           </header>
 
-          <form className='send-form'>
-            <ul className='send-form_fields'>
+          <form className="send-form" onSubmit={this.handleSubmit}>
+            {/* @brian can we not use ul/li here? Not really semantic. I could
+            change it but I'm scared it'll break the layout */}
+            <ul className="send-form_fields">
               <li>
                 <label>Address</label>
-                <input type='tel' />
+                <input
+                  onChange={this.handleChangeTo}
+                  required
+                  type="tel"
+                  value={to}
+                />
               </li>
               <li>
                 <label>Amount</label>
-                <input type='tel' />
+                <input
+                  onChange={this.handleChangeAmount}
+                  required
+                  type="tel"
+                  value={amount}
+                />
               </li>
               <li>
                 <label>Gas</label>
-                <input type='tel' />
+                <input
+                  onChange={this.handleChangeGas}
+                  required
+                  type="tel"
+                  value={gas}
+                />
               </li>
             </ul>
-            <div className='send-form_action'>
-              <button className='button'>Send</button>
+            <div className="send-form_action">
+              <button className="button">Send</button>
             </div>
           </form>
         </div>
diff --git a/src/Signer/From/From.js b/src/Signer/From/From.js
new file mode 100644
index 00000000..d34bbc1d
--- /dev/null
+++ b/src/Signer/From/From.js
@@ -0,0 +1,19 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import React, { Component } from 'react';
+import { inject, observer } from 'mobx-react';
+
+@inject('signerStore')
+@observer
+class Signer extends Component {
+  render() {
+    const { signerStore } = this.props;
+    console.log(signerStore);
+    return <div />;
+  }
+}
+
+export default Signer;
diff --git a/src/Signer/From/index.js b/src/Signer/From/index.js
new file mode 100644
index 00000000..259c2eb8
--- /dev/null
+++ b/src/Signer/From/index.js
@@ -0,0 +1,8 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import From from './From';
+
+export default From;
diff --git a/src/Signer/Signer.js b/src/Signer/Signer.js
new file mode 100644
index 00000000..e496da34
--- /dev/null
+++ b/src/Signer/Signer.js
@@ -0,0 +1,20 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import React, { Component } from 'react';
+
+import From from './From';
+
+class Signer extends Component {
+  render() {
+    return (
+      <div>
+        <From />
+      </div>
+    );
+  }
+}
+
+export default Signer;
diff --git a/src/Signer/index.js b/src/Signer/index.js
new file mode 100644
index 00000000..decd33d4
--- /dev/null
+++ b/src/Signer/index.js
@@ -0,0 +1,8 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import Signer from './Signer';
+
+export default Signer;
diff --git a/src/stores/createAccountStore.js b/src/stores/createAccountStore.js
index 23ff68de..b88ec117 100644
--- a/src/stores/createAccountStore.js
+++ b/src/stores/createAccountStore.js
@@ -14,30 +14,26 @@ class CreateAccountStore {
   @observable password = '';
   @observable phrase = null; // The 12-word seed phrase
 
-  constructor () {
-    this.parityStore = parityStore;
+  constructor() {
+    this.api = parityStore.api;
   }
 
   generateNewAccount = () => {
-    const { api } = this.parityStore;
-
-    return api.parity
+    return this.api.parity
       .generateSecretPhrase()
       .then(phrase => {
         this.setPhrase(phrase);
-        return api.parity.phraseToAddress(phrase);
+        return this.api.parity.phraseToAddress(phrase);
       })
       .then(address => this.setAddress(address));
   };
 
   saveAccountToParity = () => {
-    const { api } = this.parityStore;
-
-    return api.parity
+    return this.api.parity
       .newAccountFromPhrase(this.phrase, this.password)
-      .then(address => api.parity.setAccountName(this.address, this.name))
+      .then(address => this.api.parity.setAccountName(this.address, this.name))
       .then(() =>
-        api.parity.setAccountMeta(this.address, {
+        this.api.parity.setAccountMeta(this.address, {
           timestamp: Date.now(),
           passwordHint: this.hint
         })
diff --git a/src/stores/index.js b/src/stores/index.js
index ae43065f..6e071f07 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -5,10 +5,12 @@
 
 import createAccountStore from './createAccountStore';
 import parityStore from './parityStore';
+import signerStore from './signerStore';
 import tokensStore from './tokensStore';
 
 export default {
   createAccountStore,
   parityStore,
+  signerStore,
   tokensStore
 };
diff --git a/src/stores/signerStore.js b/src/stores/signerStore.js
new file mode 100644
index 00000000..49f61539
--- /dev/null
+++ b/src/stores/signerStore.js
@@ -0,0 +1,60 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import { action, computed, observable } from 'mobx';
+
+import parityStore from './parityStore';
+
+class SignerStore {
+  @observable pending = [];
+
+  constructor() {
+    this.api = parityStore.api;
+
+    if (parityStore.isApiConnected) {
+      this.subscribePending();
+    } else {
+      // TODO This .on() is not working, so we poll every second
+      // this.api.on('connected', this.subscribePending);
+      this.interval = setInterval(() => {
+        if (parityStore.isApiConnected) {
+          this.subscribePending();
+          clearInterval(this.interval);
+        }
+      }, 1000);
+    }
+  }
+
+  @computed
+  get requests() {
+    const mapping = {}; // requestId -> request mapping
+    this.pending.forEach(request => (mapping[request.id] = request));
+    return mapping;
+  }
+
+  @action
+  setPending = (pending = []) => {
+    this.pending = pending;
+  };
+
+  subscribePending = () => {
+    const callback = (err, pending) => {
+      console.log('OENDING=', pending);
+      if (err) {
+        throw new Error(err);
+      }
+
+      this.setPending(pending);
+    };
+
+    this.api
+      .subscribe('signer_requestsToConfirm', callback)
+      .then(() => this.api.signer.requestsToConfirm())
+      .then(pending => callback(null, pending))
+      .catch(callback);
+  };
+}
+
+export default new SignerStore();
-- 
GitLab


From d067c91c8f23986dfc1670dbe843f9a41e4ebcdd Mon Sep 17 00:00:00 2001
From: Amaury Martiny <amaury.martiny@gmail.com>
Date: Wed, 9 May 2018 16:33:30 +0200
Subject: [PATCH 2/5] Show signer requests list

---
 src/Signer/Signer.js                |  4 +--
 src/Signer/SignerList/SignerList.js | 38 +++++++++++++++++++++++++++++
 src/Signer/SignerList/index.js      |  8 ++++++
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 src/Signer/SignerList/SignerList.js
 create mode 100644 src/Signer/SignerList/index.js

diff --git a/src/Signer/Signer.js b/src/Signer/Signer.js
index e496da34..1b82cc24 100644
--- a/src/Signer/Signer.js
+++ b/src/Signer/Signer.js
@@ -5,13 +5,13 @@
 
 import React, { Component } from 'react';
 
-import From from './From';
+import SignerList from './SignerList';
 
 class Signer extends Component {
   render() {
     return (
       <div>
-        <From />
+        <SignerList />
       </div>
     );
   }
diff --git a/src/Signer/SignerList/SignerList.js b/src/Signer/SignerList/SignerList.js
new file mode 100644
index 00000000..ae0b087d
--- /dev/null
+++ b/src/Signer/SignerList/SignerList.js
@@ -0,0 +1,38 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import React, { Component } from 'react';
+import { fromWei } from '@parity/api/lib/util/wei';
+import { inject, observer } from 'mobx-react';
+import { Link } from 'react-router-dom';
+
+@inject('signerStore')
+@observer
+class SignerList extends Component {
+  render() {
+    const {
+      signerStore: { pending }
+    } = this.props;
+    return (
+      <div>
+        List of requests to be signed (click to sign):<ul>
+          {pending.map(({ id, payload: { sendTransaction: { value } } }) => (
+            <li key={+id}>
+              {/* TODO inline style is bad */}
+              <Link
+                to={`/signer/${id.toString(16)}`}
+                style={{ color: 'white' }}
+              >
+                - The one with {+fromWei(value)}ETH (show to? from?)
+              </Link>
+            </li>
+          ))}
+        </ul>
+      </div>
+    );
+  }
+}
+
+export default SignerList;
diff --git a/src/Signer/SignerList/index.js b/src/Signer/SignerList/index.js
new file mode 100644
index 00000000..54c165f1
--- /dev/null
+++ b/src/Signer/SignerList/index.js
@@ -0,0 +1,8 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import SignerList from './SignerList';
+
+export default SignerList;
-- 
GitLab


From c05e1579c084ad12c8ea7b5af4f45a2bb83f6540 Mon Sep 17 00:00:00 2001
From: Amaury Martiny <amaury.martiny@gmail.com>
Date: Wed, 9 May 2018 17:16:38 +0200
Subject: [PATCH 3/5] Add accept and reject requests

---
 src/Send/Send.js                            |  8 +-
 src/Signer/From/From.js                     | 19 -----
 src/Signer/Signer.js                        |  4 +
 src/Signer/SignerDetails/SignerDetails.js   | 95 +++++++++++++++++++++
 src/Signer/{From => SignerDetails}/index.js |  4 +-
 src/stores/signerStore.js                   |  6 ++
 6 files changed, 113 insertions(+), 23 deletions(-)
 delete mode 100644 src/Signer/From/From.js
 create mode 100644 src/Signer/SignerDetails/SignerDetails.js
 rename src/Signer/{From => SignerDetails}/index.js (61%)

diff --git a/src/Send/Send.js b/src/Send/Send.js
index b15984ee..1ba08070 100644
--- a/src/Send/Send.js
+++ b/src/Send/Send.js
@@ -22,6 +22,10 @@ class Send extends Component {
     txStatus: null
   };
 
+  componentWillUnmount() {
+    this.subscription.dispose();
+  }
+
   handleChangeAmount = ({ target: { value } }) =>
     this.setState({ amount: value });
 
@@ -34,7 +38,7 @@ class Send extends Component {
     const { me } = this.props;
     const { amount, gas, to } = this.state;
 
-    post$({
+    this.subscription = post$({
       from: me,
       gas,
       to,
@@ -47,7 +51,7 @@ class Send extends Component {
 
     if (status && status.requested) {
       // Redirect to signer when needed
-      return <Redirect to={`/signer/${status.requested}`} />;
+      return <Redirect to={`/signer/${+status.requested}`} />;
     }
 
     return (
diff --git a/src/Signer/From/From.js b/src/Signer/From/From.js
deleted file mode 100644
index d34bbc1d..00000000
--- a/src/Signer/From/From.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-//
-// SPDX-License-Identifier: MIT
-
-import React, { Component } from 'react';
-import { inject, observer } from 'mobx-react';
-
-@inject('signerStore')
-@observer
-class Signer extends Component {
-  render() {
-    const { signerStore } = this.props;
-    console.log(signerStore);
-    return <div />;
-  }
-}
-
-export default Signer;
diff --git a/src/Signer/Signer.js b/src/Signer/Signer.js
index 1b82cc24..f02a0876 100644
--- a/src/Signer/Signer.js
+++ b/src/Signer/Signer.js
@@ -4,7 +4,9 @@
 // SPDX-License-Identifier: MIT
 
 import React, { Component } from 'react';
+import { Route } from 'react-router-dom';
 
+import SignerDetails from './SignerDetails';
 import SignerList from './SignerList';
 
 class Signer extends Component {
@@ -12,6 +14,8 @@ class Signer extends Component {
     return (
       <div>
         <SignerList />
+        <hr />
+        <Route path="/signer/:requestId" component={SignerDetails} />
       </div>
     );
   }
diff --git a/src/Signer/SignerDetails/SignerDetails.js b/src/Signer/SignerDetails/SignerDetails.js
new file mode 100644
index 00000000..edd012f2
--- /dev/null
+++ b/src/Signer/SignerDetails/SignerDetails.js
@@ -0,0 +1,95 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+//
+// SPDX-License-Identifier: MIT
+
+import React, { Component } from 'react';
+import { fromWei } from '@parity/api/lib/util/wei';
+import { inject, observer } from 'mobx-react';
+import { Redirect } from 'react-router-dom';
+
+import From from './From';
+
+@inject('signerStore')
+@observer
+class SignerDetails extends Component {
+  state = {
+    password: ''
+  };
+
+  handleAccept = () => {
+    const {
+      match: {
+        params: { requestId }
+      },
+      signerStore
+    } = this.props;
+    const { password } = this.state;
+    signerStore.acceptRequest(requestId, password);
+  };
+
+  handleChangePassword = ({ target: { value } }) => {
+    this.setState({ password: value });
+  };
+
+  handleReject = () => {
+    const {
+      match: {
+        params: { requestId }
+      },
+      signerStore
+    } = this.props;
+    signerStore.rejectRequest(requestId);
+  };
+
+  handleSubmit = e => {
+    e.preventDefault();
+  };
+
+  render() {
+    const {
+      match: {
+        params: { requestId }
+      },
+      signerStore: { requests }
+    } = this.props;
+    const { password } = this.state;
+    const request = requests[requestId];
+
+    if (!request) {
+      // This happens after we accept/reject a request
+      return null;
+    }
+
+    const transaction = request.payload.sendTransaction;
+
+    return (
+      <form onSubmit={this.handleSubmit}>
+        <h3>Request number {requestId}</h3>
+        <p>From: {transaction.from}</p>
+        <p>To: {transaction.to}</p>
+        <p>Amount: {+fromWei(transaction.value)}ETH</p>
+        <p>Gas: {+transaction.gas}</p>
+        <label>
+          Enter your password to confirm:<br />
+          <input
+            onChange={this.handleChangePassword}
+            required
+            type="password"
+            value={password}
+          />
+        </label>
+        <br />
+        <button onClick={this.handleAccept}>Accept</button>{' '}
+        <button onClick={this.handleReject}>Reject (no pw needed)</button>
+        <br />
+        <em style={{ fontSize: 10 }}>
+          @brian, for now for errors look in console, e.g. when nothing happens
+          when you click on Accept
+        </em>
+      </form>
+    );
+  }
+}
+
+export default SignerDetails;
diff --git a/src/Signer/From/index.js b/src/Signer/SignerDetails/index.js
similarity index 61%
rename from src/Signer/From/index.js
rename to src/Signer/SignerDetails/index.js
index 259c2eb8..7afc360d 100644
--- a/src/Signer/From/index.js
+++ b/src/Signer/SignerDetails/index.js
@@ -3,6 +3,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-import From from './From';
+import SignerDetails from './SignerDetails';
 
-export default From;
+export default SignerDetails;
diff --git a/src/stores/signerStore.js b/src/stores/signerStore.js
index 49f61539..12ec5290 100644
--- a/src/stores/signerStore.js
+++ b/src/stores/signerStore.js
@@ -27,6 +27,12 @@ class SignerStore {
     }
   }
 
+  acceptRequest = (requestId, password) =>
+    this.api.signer.confirmRequest(requestId, null, password);
+
+  rejectRequest = (requestId, password) =>
+    this.api.signer.rejectRequest(requestId, null, password);
+
   @computed
   get requests() {
     const mapping = {}; // requestId -> request mapping
-- 
GitLab


From 38720bd22d2d600099f8ad66b6dddd5ff78ee7f1 Mon Sep 17 00:00:00 2001
From: Amaury Martiny <amaury.martiny@gmail.com>
Date: Fri, 11 May 2018 14:58:20 +0200
Subject: [PATCH 4/5] Bugfixes

---
 src/Send/Send.js                          | 4 +++-
 src/Signer/SignerDetails/SignerDetails.js | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Send/Send.js b/src/Send/Send.js
index 1ba08070..347899f4 100644
--- a/src/Send/Send.js
+++ b/src/Send/Send.js
@@ -23,7 +23,9 @@ class Send extends Component {
   };
 
   componentWillUnmount() {
-    this.subscription.dispose();
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+    }
   }
 
   handleChangeAmount = ({ target: { value } }) =>
diff --git a/src/Signer/SignerDetails/SignerDetails.js b/src/Signer/SignerDetails/SignerDetails.js
index edd012f2..08a030f6 100644
--- a/src/Signer/SignerDetails/SignerDetails.js
+++ b/src/Signer/SignerDetails/SignerDetails.js
@@ -8,8 +8,6 @@ import { fromWei } from '@parity/api/lib/util/wei';
 import { inject, observer } from 'mobx-react';
 import { Redirect } from 'react-router-dom';
 
-import From from './From';
-
 @inject('signerStore')
 @observer
 class SignerDetails extends Component {
-- 
GitLab


From 45f61a10f92ae09ae9e5feddd0a9a09928e64be6 Mon Sep 17 00:00:00 2001
From: Amaury Martiny <amaury.martiny@gmail.com>
Date: Fri, 11 May 2018 15:08:46 +0200
Subject: [PATCH 5/5] Fix lint

---
 electron/cli/index.js                     |  3 +-
 electron/index.js                         |  4 +--
 electron/menu/index.js                    |  2 +-
 electron/messages/index.js                |  1 -
 electron/operations/fetchParity.js        |  3 +-
 electron/operations/handleError.js        |  3 +-
 electron/operations/runParity.js          |  5 ++-
 package.json                              |  2 +-
 src/App/App.js                            | 40 +++++++++++------------
 src/Send/Send.js                          | 30 ++++++++---------
 src/Signer/Signer.js                      |  4 +--
 src/Signer/SignerDetails/SignerDetails.js |  5 ++-
 src/Signer/SignerList/SignerList.js       |  2 +-
 src/stores/createAccountStore.js          |  2 +-
 src/stores/signerStore.js                 |  9 ++---
 15 files changed, 57 insertions(+), 58 deletions(-)

diff --git a/electron/cli/index.js b/electron/cli/index.js
index 7b88f5b3..41caeb0b 100644
--- a/electron/cli/index.js
+++ b/electron/cli/index.js
@@ -3,11 +3,12 @@
 //
 // SPDX-License-Identifier: MIT
 
-// eslint-disable-next-line
+/* eslint-disable */
 const dynamicRequire =
   typeof __non_webpack_require__ === 'undefined'
     ? require
     : __non_webpack_require__; // Dynamic require https://github.com/yargs/yargs/issues/781
+/* eslint-enable */
 
 const { app } = require('electron');
 const fs = require('fs');
diff --git a/electron/index.js b/electron/index.js
index b264838f..d559aa30 100644
--- a/electron/index.js
+++ b/electron/index.js
@@ -21,7 +21,7 @@ let mainWindow;
 // Get arguments from cli
 const [argv] = cli();
 
-function createWindow() {
+function createWindow () {
   // If cli() returns false, then it means that the arguments are stopping the
   // app (e.g. --help or --version). We don't do anything more in this case.
   if (!argv) {
@@ -67,7 +67,7 @@ function createWindow() {
     },
     (details, callback) => {
       details.requestHeaders.Origin = `parity://${mainWindow.id}.ui.parity`;
-      callback({ requestHeaders: details.requestHeaders });
+      callback({ requestHeaders: details.requestHeaders }); // eslint-disable-line
     }
   );
 
diff --git a/electron/menu/index.js b/electron/menu/index.js
index 0d5d7846..fb08a2ef 100644
--- a/electron/menu/index.js
+++ b/electron/menu/index.js
@@ -44,7 +44,7 @@ module.exports = mainWindow => {
       submenu: [
         {
           label: 'Learn More',
-          click() {
+          click () {
             shell.openExternal('https://parity.io');
           }
         }
diff --git a/electron/messages/index.js b/electron/messages/index.js
index b9fd367c..275a8d08 100644
--- a/electron/messages/index.js
+++ b/electron/messages/index.js
@@ -3,7 +3,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-const { runParity } = require('../operations/runParity');
 const signerNewToken = require('../operations/signerNewToken');
 
 /**
diff --git a/electron/operations/fetchParity.js b/electron/operations/fetchParity.js
index 5f853b03..9e726c70 100644
--- a/electron/operations/fetchParity.js
+++ b/electron/operations/fetchParity.js
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-const { app, dialog } = require('electron');
+const { app } = require('electron');
 const axios = require('axios');
 const { download } = require('electron-dl');
 const fs = require('fs');
@@ -15,7 +15,6 @@ const {
 } = require('../../package.json');
 const parityPath = require('../utils/parityPath');
 
-const fsExists = util.promisify(fs.stat);
 const fsChmod = util.promisify(fs.chmod);
 
 const getArch = () => {
diff --git a/electron/operations/handleError.js b/electron/operations/handleError.js
index 7c85d4fa..e5bcc553 100644
--- a/electron/operations/handleError.js
+++ b/electron/operations/handleError.js
@@ -3,11 +3,12 @@
 //
 // SPDX-License-Identifier: MIT
 
-const { dialog } = require('electron');
+const { app, dialog } = require('electron');
 
 const {
   parity: { channel }
 } = require('../../package.json');
+const parityPath = require('../utils/parityPath');
 
 module.exports = (err, message = 'An error occurred.') => {
   console.error(err);
diff --git a/electron/operations/runParity.js b/electron/operations/runParity.js
index bbf6021c..8e076749 100644
--- a/electron/operations/runParity.js
+++ b/electron/operations/runParity.js
@@ -3,7 +3,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-const { app, dialog, webContents } = require('electron');
 const flatten = require('lodash/flatten');
 const fs = require('fs');
 const { spawn } = require('child_process');
@@ -21,7 +20,7 @@ const fsUnlink = util.promisify(fs.unlink);
 let parity = null; // Will hold the running parity instance
 
 module.exports = {
-  runParity(mainWindow) {
+  runParity (mainWindow) {
     // Create a logStream to save logs
     const logFile = `${parityPath()}.log`;
 
@@ -72,7 +71,7 @@ module.exports = {
         handleError(err, 'An error occured while running parity.');
       });
   },
-  killParity() {
+  killParity () {
     if (parity) {
       console.log('Stopping parity.');
       parity.kill();
diff --git a/package.json b/package.json
index d8af35c9..1a447273 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "build-electron": "webpack --config electron/webpack.config.js",
     "build-js": "react-app-rewired build",
     "electron": "npm run build && electron build/electron.js",
-    "lint": "semistandard 'src/**/*.js' --parser babel-eslint",
+    "lint": "semistandard 'src/**/*.js' 'electron/**/*.js' --parser babel-eslint",
     "prebuild": "rimraf build/",
     "start": "npm-run-all -p watch-css start-js",
     "start-electron": "electron electron/ --ui-dev --ws-origins all",
diff --git a/src/App/App.js b/src/App/App.js
index d2f78b29..795d191e 100644
--- a/src/App/App.js
+++ b/src/App/App.js
@@ -22,34 +22,34 @@ const Router =
   process.env.NODE_ENV === 'production' ? MemoryRouter : BrowserRouter;
 
 class App extends Component {
-  render() {
+  render () {
     return (
       <Router>
-        <div className="wrapper">
-          <div className="content">
-            <div className="connector">
-              <svg width="60px" height="30px" viewBox="0 0 60 30">
-                <polygon points="0 30 60 30 30 0" />
+        <div className='wrapper'>
+          <div className='content'>
+            <div className='connector'>
+              <svg width='60px' height='30px' viewBox='0 0 60 30'>
+                <polygon points='0 30 60 30 30 0' />
               </svg>
             </div>
-            <div className="window">
-              <Route path="/loading" component={Loading} />
-              <ProtectedRoute exact path="/" component={Tokens} />
-              <ProtectedRoute path="/settings" component={Settings} />
-              <ProtectedRoute path="/send" component={Send} />
-              <ProtectedRoute path="/signer" component={Signer} />
-              <ProtectedRoute path="/receive" component={Receive} />
-              <ProtectedRoute path="/accounts/new" component={CreateAccount} />
+            <div className='window'>
+              <Route path='/loading' component={Loading} />
+              <ProtectedRoute exact path='/' component={Tokens} />
+              <ProtectedRoute path='/settings' component={Settings} />
+              <ProtectedRoute path='/send' component={Send} />
+              <ProtectedRoute path='/signer' component={Signer} />
+              <ProtectedRoute path='/receive' component={Receive} />
+              <ProtectedRoute path='/accounts/new' component={CreateAccount} />
 
-              <nav className="primary-nav">
-                <Link to="/">Home</Link>
-                {/* @brian Putting a <Link> here for ease of use for us, 
+              <nav className='primary-nav'>
+                <Link to='/'>Home</Link>
+                {/* @brian Putting a <Link> here for ease of use for us,
                 but I'll let you decided how/when to show the Signer component */}
-                <Link to="/signer">Signer</Link>
-                <Link to="/receive" className="icon -receive">
+                <Link to='/signer'>Signer</Link>
+                <Link to='/receive' className='icon -receive'>
                   Receive
                 </Link>
-                <Link to="/settings" className="icon -settings">
+                <Link to='/settings' className='icon -settings'>
                   Settings
                 </Link>
               </nav>
diff --git a/src/Send/Send.js b/src/Send/Send.js
index 347899f4..0fe92a2c 100644
--- a/src/Send/Send.js
+++ b/src/Send/Send.js
@@ -22,7 +22,7 @@ class Send extends Component {
     txStatus: null
   };
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     if (this.subscription) {
       this.subscription.unsubscribe();
     }
@@ -48,7 +48,7 @@ class Send extends Component {
     }).subscribe(status => this.setState({ status }));
   };
 
-  render() {
+  render () {
     const { amount, gas, status, to } = this.state;
 
     if (status && status.requested) {
@@ -58,25 +58,25 @@ class Send extends Component {
 
     return (
       <div>
-        <div className="box -card">
-          <header className="token-header">
-            <div className="token-header_icon">
-              <img src={ethereumIcon} alt="ethereum" />
+        <div className='box -card'>
+          <header className='token-header'>
+            <div className='token-header_icon'>
+              <img src={ethereumIcon} alt='ethereum' />
             </div>
-            <div className="token-header_name">Ethereum</div>
-            <div className="token-header_balance">42.89</div>
+            <div className='token-header_name'>Ethereum</div>
+            <div className='token-header_balance'>42.89</div>
           </header>
 
-          <form className="send-form" onSubmit={this.handleSubmit}>
+          <form className='send-form' onSubmit={this.handleSubmit}>
             {/* @brian can we not use ul/li here? Not really semantic. I could
             change it but I'm scared it'll break the layout */}
-            <ul className="send-form_fields">
+            <ul className='send-form_fields'>
               <li>
                 <label>Address</label>
                 <input
                   onChange={this.handleChangeTo}
                   required
-                  type="tel"
+                  type='tel'
                   value={to}
                 />
               </li>
@@ -85,7 +85,7 @@ class Send extends Component {
                 <input
                   onChange={this.handleChangeAmount}
                   required
-                  type="tel"
+                  type='tel'
                   value={amount}
                 />
               </li>
@@ -94,13 +94,13 @@ class Send extends Component {
                 <input
                   onChange={this.handleChangeGas}
                   required
-                  type="tel"
+                  type='tel'
                   value={gas}
                 />
               </li>
             </ul>
-            <div className="send-form_action">
-              <button className="button">Send</button>
+            <div className='send-form_action'>
+              <button className='button'>Send</button>
             </div>
           </form>
         </div>
diff --git a/src/Signer/Signer.js b/src/Signer/Signer.js
index f02a0876..8541349f 100644
--- a/src/Signer/Signer.js
+++ b/src/Signer/Signer.js
@@ -10,12 +10,12 @@ import SignerDetails from './SignerDetails';
 import SignerList from './SignerList';
 
 class Signer extends Component {
-  render() {
+  render () {
     return (
       <div>
         <SignerList />
         <hr />
-        <Route path="/signer/:requestId" component={SignerDetails} />
+        <Route path='/signer/:requestId' component={SignerDetails} />
       </div>
     );
   }
diff --git a/src/Signer/SignerDetails/SignerDetails.js b/src/Signer/SignerDetails/SignerDetails.js
index 08a030f6..f8225138 100644
--- a/src/Signer/SignerDetails/SignerDetails.js
+++ b/src/Signer/SignerDetails/SignerDetails.js
@@ -6,7 +6,6 @@
 import React, { Component } from 'react';
 import { fromWei } from '@parity/api/lib/util/wei';
 import { inject, observer } from 'mobx-react';
-import { Redirect } from 'react-router-dom';
 
 @inject('signerStore')
 @observer
@@ -44,7 +43,7 @@ class SignerDetails extends Component {
     e.preventDefault();
   };
 
-  render() {
+  render () {
     const {
       match: {
         params: { requestId }
@@ -73,7 +72,7 @@ class SignerDetails extends Component {
           <input
             onChange={this.handleChangePassword}
             required
-            type="password"
+            type='password'
             value={password}
           />
         </label>
diff --git a/src/Signer/SignerList/SignerList.js b/src/Signer/SignerList/SignerList.js
index ae0b087d..a2870640 100644
--- a/src/Signer/SignerList/SignerList.js
+++ b/src/Signer/SignerList/SignerList.js
@@ -11,7 +11,7 @@ import { Link } from 'react-router-dom';
 @inject('signerStore')
 @observer
 class SignerList extends Component {
-  render() {
+  render () {
     const {
       signerStore: { pending }
     } = this.props;
diff --git a/src/stores/createAccountStore.js b/src/stores/createAccountStore.js
index b88ec117..d9f60192 100644
--- a/src/stores/createAccountStore.js
+++ b/src/stores/createAccountStore.js
@@ -14,7 +14,7 @@ class CreateAccountStore {
   @observable password = '';
   @observable phrase = null; // The 12-word seed phrase
 
-  constructor() {
+  constructor () {
     this.api = parityStore.api;
   }
 
diff --git a/src/stores/signerStore.js b/src/stores/signerStore.js
index 12ec5290..785cca7a 100644
--- a/src/stores/signerStore.js
+++ b/src/stores/signerStore.js
@@ -10,7 +10,7 @@ import parityStore from './parityStore';
 class SignerStore {
   @observable pending = [];
 
-  constructor() {
+  constructor () {
     this.api = parityStore.api;
 
     if (parityStore.isApiConnected) {
@@ -34,9 +34,11 @@ class SignerStore {
     this.api.signer.rejectRequest(requestId, null, password);
 
   @computed
-  get requests() {
+  get requests () {
     const mapping = {}; // requestId -> request mapping
-    this.pending.forEach(request => (mapping[request.id] = request));
+    this.pending.forEach(request => {
+      mapping[request.id] = request;
+    });
     return mapping;
   }
 
@@ -47,7 +49,6 @@ class SignerStore {
 
   subscribePending = () => {
     const callback = (err, pending) => {
-      console.log('OENDING=', pending);
       if (err) {
         throw new Error(err);
       }
-- 
GitLab