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

Fixing UI to support both send and signTransaction

Browse Source
This commit is contained in:
Tomasz Drwięga
2016-11-28 11:55:29 +01:00
parent 3e69ff0b88
commit 8686339b0c
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/views/Signer/components/RequestPending/requestPending.js
View File

@@ -27,7 +27,8 @@ export default class RequestPending extends Component {
isSending: PropTypes.bool.isRequired,
date: PropTypes.instanceOf(Date).isRequired,
payload: PropTypes.oneOfType([
PropTypes.shape({ transaction: PropTypes.object.isRequired }),
PropTypes.shape({ signTransaction: PropTypes.object.isRequired }),
PropTypes.shape({ sendTransaction: PropTypes.object.isRequired }),
PropTypes.shape({ sign: PropTypes.object.isRequired })
]).isRequired,
className: PropTypes.string,
@@ -64,8 +65,8 @@ export default class RequestPending extends Component {
);
}
if (payload.transaction) {
const { transaction } = payload;
if (payload.sendTransaction || payload.signTransaction) {
const transaction = payload.sendTransaction || payload.signTransaction;
return (
<TransactionPending