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

Merge branch 'master' into jg-signer-decoding

Browse Source 
# Conflicts:
#	js/src/views/Signer/components/RequestFinished/requestFinished.js
This commit is contained in:
Jaco Greeff
2016-12-02 11:21:17 +01:00
parent 7e2a072a2b 3837114eb2
commit 2dd2004ed5
116 changed files with 2375 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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,9 +65,8 @@ export default class RequestPending extends Component {
);
}
if (payload.transaction) {
const { transaction } = payload;
const transaction = payload.sendTransaction || payload.signTransaction;
if (transaction) {
return (
<TransactionPending
className={ className }