grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove finished rendering completely

Browse Source
This commit is contained in:
Jaco Greeff 2016-11-29 16:59:44 +01:00
parent 0ddd33c643
commit 7e2a072a2b
5 changed files with 2 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/views/Signer/components/RequestFinished/index.js
View File

@ -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 <http://www.gnu.org/licenses/>.
export default from './requestFinished';

87
js/src/views/Signer/components/RequestFinished/requestFinished.js
View File

@ -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 <http://www.gnu.org/licenses/>.
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 (
<SignRequest
className={ className }
isFinished
id={ id }
address={ sign.address }
hash={ sign.hash }
msg={ msg }
status={ status }
error={ error }
isTest={ isTest }
store={ store }
/>
);
}
if (payload.transaction) {
const { transaction } = payload;
return (
<TransactionFinished
className={ className }
txHash={ result }
id={ id }
gasPrice={ transaction.gasPrice }
gas={ transaction.gas }
from={ transaction.from }
to={ transaction.to }
value={ transaction.value }
msg={ msg }
date={ date }
status={ status }
error={ error }
isTest={ isTest }
store={ store }
/>
);
}
// Unknown payload
return null;
}
}

18
js/src/views/Signer/components/index.js
View File

@ -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 <http://www.gnu.org/licenses/>.
export RequestFinished from './RequestFinished';
export RequestPending from './RequestPending';

2
js/src/views/Signer/containers/Embedded/embedded.js
View File

@ -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';

2
js/src/views/Signer/containers/RequestsPage/RequestsPage.js
View File

@ -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';