From ffa60eb0fd1d7551f1b38a3201e317ebc8c40558 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 14 May 2018 16:44:07 +0200 Subject: [PATCH 01/10] Put signer right below send button --- src/Send/Send.js | 10 +++-- .../Signer/Signer.js} | 30 +++------------ src/{ => Send}/Signer/index.js | 0 src/Signer/Signer.js | 24 ------------ src/Signer/SignerDetails/index.js | 8 ---- src/Signer/SignerList/SignerList.js | 38 ------------------- src/Signer/SignerList/index.js | 8 ---- 7 files changed, 12 insertions(+), 106 deletions(-) rename src/{Signer/SignerDetails/SignerDetails.js => Send/Signer/Signer.js} (71%) rename src/{ => Send}/Signer/index.js (100%) delete mode 100644 src/Signer/Signer.js delete mode 100644 src/Signer/SignerDetails/index.js delete mode 100644 src/Signer/SignerList/SignerList.js delete mode 100644 src/Signer/SignerList/index.js diff --git a/src/Send/Send.js b/src/Send/Send.js index 6c2a461a..eca29c38 100644 --- a/src/Send/Send.js +++ b/src/Send/Send.js @@ -10,6 +10,7 @@ import { toWei } from '@parity/api/lib/util/wei'; import ethereumIcon from '../assets/img/tokens/ethereum.png'; import light from '../hoc'; +import Signer from './Signer'; @light({ me: defaultAccount$ @@ -51,9 +52,9 @@ class Send extends Component { render () { const { amount, gas, status, to } = this.state; - if (status && status.requested) { - // Redirect to signer when needed - return ; + if (status && status.confirmed) { + // Redirect to homepage when confirmed + return ; } return ( @@ -103,7 +104,10 @@ class Send extends Component {
+ Status: {JSON.stringify(status)} + {status && + status.requested && } ); diff --git a/src/Signer/SignerDetails/SignerDetails.js b/src/Send/Signer/Signer.js similarity index 71% rename from src/Signer/SignerDetails/SignerDetails.js rename to src/Send/Signer/Signer.js index f8225138..f4955220 100644 --- a/src/Signer/SignerDetails/SignerDetails.js +++ b/src/Send/Signer/Signer.js @@ -4,7 +4,6 @@ // SPDX-License-Identifier: MIT import React, { Component } from 'react'; -import { fromWei } from '@parity/api/lib/util/wei'; import { inject, observer } from 'mobx-react'; @inject('signerStore') @@ -15,12 +14,7 @@ class SignerDetails extends Component { }; handleAccept = () => { - const { - match: { - params: { requestId } - }, - signerStore - } = this.props; + const { requestId, signerStore } = this.props; const { password } = this.state; signerStore.acceptRequest(requestId, password); }; @@ -30,12 +24,7 @@ class SignerDetails extends Component { }; handleReject = () => { - const { - match: { - params: { requestId } - }, - signerStore - } = this.props; + const { requestId, signerStore } = this.props; signerStore.rejectRequest(requestId); }; @@ -43,11 +32,9 @@ class SignerDetails extends Component { e.preventDefault(); }; - render () { + render() { const { - match: { - params: { requestId } - }, + requestId, signerStore: { requests } } = this.props; const { password } = this.state; @@ -58,21 +45,14 @@ class SignerDetails extends Component { return null; } - const transaction = request.payload.sendTransaction; - return (
-

Request number {requestId}

-

From: {transaction.from}

-

To: {transaction.to}

-

Amount: {+fromWei(transaction.value)}ETH

-

Gas: {+transaction.gas}

diff --git a/src/Signer/index.js b/src/Send/Signer/index.js similarity index 100% rename from src/Signer/index.js rename to src/Send/Signer/index.js diff --git a/src/Signer/Signer.js b/src/Signer/Signer.js deleted file mode 100644 index 8541349f..00000000 --- a/src/Signer/Signer.js +++ /dev/null @@ -1,24 +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 { Route } from 'react-router-dom'; - -import SignerDetails from './SignerDetails'; -import SignerList from './SignerList'; - -class Signer extends Component { - render () { - return ( -
- -
- -
- ); - } -} - -export default Signer; diff --git a/src/Signer/SignerDetails/index.js b/src/Signer/SignerDetails/index.js deleted file mode 100644 index 7afc360d..00000000 --- a/src/Signer/SignerDetails/index.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2015-2018 Parity Technologies (UK) Ltd. -// This file is part of Parity. -// -// SPDX-License-Identifier: MIT - -import SignerDetails from './SignerDetails'; - -export default SignerDetails; diff --git a/src/Signer/SignerList/SignerList.js b/src/Signer/SignerList/SignerList.js deleted file mode 100644 index a2870640..00000000 --- a/src/Signer/SignerList/SignerList.js +++ /dev/null @@ -1,38 +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 { 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 ( -
- List of requests to be signed (click to sign):
    - {pending.map(({ id, payload: { sendTransaction: { value } } }) => ( -
  • - {/* TODO inline style is bad */} - - - The one with {+fromWei(value)}ETH (show to? from?) - -
    • - ))} -
-
- ); - } -} - -export default SignerList; diff --git a/src/Signer/SignerList/index.js b/src/Signer/SignerList/index.js deleted file mode 100644 index 54c165f1..00000000 --- a/src/Signer/SignerList/index.js +++ /dev/null @@ -1,8 +0,0 @@ -// 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 4bfdd589b003cb83b2ca47b2a03564c0689c5d1d Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 14 May 2018 16:48:13 +0200 Subject: [PATCH 02/10] Show a loading message --- src/Send/Send.js | 10 +++------- src/Send/Signer/Signer.js | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Send/Send.js b/src/Send/Send.js index eca29c38..27e890a6 100644 --- a/src/Send/Send.js +++ b/src/Send/Send.js @@ -5,7 +5,6 @@ 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'; @@ -52,11 +51,6 @@ class Send extends Component { render () { const { amount, gas, status, to } = this.state; - if (status && status.confirmed) { - // Redirect to homepage when confirmed - return ; - } - return (
@@ -102,7 +96,9 @@ class Send extends Component {
- +
Status: {JSON.stringify(status)} diff --git a/src/Send/Signer/Signer.js b/src/Send/Signer/Signer.js index f4955220..04050e4f 100644 --- a/src/Send/Signer/Signer.js +++ b/src/Send/Signer/Signer.js @@ -32,7 +32,7 @@ class SignerDetails extends Component { e.preventDefault(); }; - render() { + render () { const { requestId, signerStore: { requests } @@ -52,7 +52,7 @@ class SignerDetails extends Component { -- GitLab From d3e792fecb62dd3b24250a03be9fe243ba2a7e72 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 14 May 2018 16:53:04 +0200 Subject: [PATCH 03/10] Remove signer link from homepage --- src/App/App.js | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/App/App.js b/src/App/App.js index c6fc1098..96f4336f 100644 --- a/src/App/App.js +++ b/src/App/App.js @@ -13,7 +13,6 @@ 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'; @@ -23,37 +22,40 @@ const Router = process.env.NODE_ENV === 'production' ? MemoryRouter : BrowserRouter; class App extends Component { - render () { + render() { return ( -
-
-
- - +
+
+
+ +
-
-