From 7e2a072a2b8e183784482e62a7abfa02f36fae3b Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 29 Nov 2016 16:59:44 +0100 Subject: [PATCH] Remove finished rendering completely --- .../components/RequestFinished/index.js | 17 ---- .../RequestFinished/requestFinished.js | 87 ------------------- js/src/views/Signer/components/index.js | 18 ---- .../Signer/containers/Embedded/embedded.js | 2 +- .../containers/RequestsPage/RequestsPage.js | 2 +- 5 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 js/src/views/Signer/components/RequestFinished/index.js delete mode 100644 js/src/views/Signer/components/RequestFinished/requestFinished.js delete mode 100644 js/src/views/Signer/components/index.js diff --git a/js/src/views/Signer/components/RequestFinished/index.js b/js/src/views/Signer/components/RequestFinished/index.js deleted file mode 100644 index c5ed83b6b..000000000 --- a/js/src/views/Signer/components/RequestFinished/index.js +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2015, 2016 Ethcore (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -export default from './requestFinished'; diff --git a/js/src/views/Signer/components/RequestFinished/requestFinished.js b/js/src/views/Signer/components/RequestFinished/requestFinished.js deleted file mode 100644 index bce9e4038..000000000 --- a/js/src/views/Signer/components/RequestFinished/requestFinished.js +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright 2015, 2016 Ethcore (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -import React, { Component, PropTypes } from 'react'; - -import TransactionFinished from '../TransactionFinished'; -import SignRequest from '../SignRequest'; - -export default class RequestFinished extends Component { - static propTypes = { - id: PropTypes.object.isRequired, - result: PropTypes.any.isRequired, - date: PropTypes.instanceOf(Date).isRequired, - payload: PropTypes.oneOfType([ - PropTypes.shape({ transaction: PropTypes.object.isRequired }), - PropTypes.shape({ sign: PropTypes.object.isRequired }) - ]).isRequired, - msg: PropTypes.string, - status: PropTypes.string, - error: PropTypes.string, - className: PropTypes.string, - isTest: PropTypes.bool.isRequired, - store: PropTypes.object.isRequired - } - - render () { - const { payload, id, result, msg, status, error, date, className, isTest, store } = this.props; - - if (payload.sign) { - const { sign } = payload; - - return ( - - ); - } - - if (payload.transaction) { - const { transaction } = payload; - - return ( - - ); - } - - // Unknown payload - return null; - } -} diff --git a/js/src/views/Signer/components/index.js b/js/src/views/Signer/components/index.js deleted file mode 100644 index 7c891f621..000000000 --- a/js/src/views/Signer/components/index.js +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2015, 2016 Ethcore (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -export RequestFinished from './RequestFinished'; -export RequestPending from './RequestPending'; diff --git a/js/src/views/Signer/containers/Embedded/embedded.js b/js/src/views/Signer/containers/Embedded/embedded.js index b62c1a6c0..af008609c 100644 --- a/js/src/views/Signer/containers/Embedded/embedded.js +++ b/js/src/views/Signer/containers/Embedded/embedded.js @@ -23,7 +23,7 @@ import Store from '../../store'; import * as RequestsActions from '../../../../redux/providers/signerActions'; import { Container } from '../../../../ui'; -import { RequestPending } from '../../components'; +import RequestPending from '../../components/RequestPending'; import styles from './embedded.css'; diff --git a/js/src/views/Signer/containers/RequestsPage/RequestsPage.js b/js/src/views/Signer/containers/RequestsPage/RequestsPage.js index a15cb537d..1ee88fc09 100644 --- a/js/src/views/Signer/containers/RequestsPage/RequestsPage.js +++ b/js/src/views/Signer/containers/RequestsPage/RequestsPage.js @@ -24,7 +24,7 @@ import Store from '../../store'; import * as RequestsActions from '../../../../redux/providers/signerActions'; import { Container, Page, TxList } from '../../../../ui'; -import { RequestPending } from '../../components'; +import RequestPending from '../../components/RequestPending'; import styles from './RequestsPage.css';