diff --git a/package.json b/package.json index 4d14c2b..fbd37ea 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "create-redux-form": "^0.1.2", "ethjs": "^0.3.3", "history": "^4.7.2", - "kleros-api": "^0.13.0", + "kleros-api": "^0.14.0", "lessdux": "^0.7.3", "normalize.css": "^7.0.0", "react": "^16.2.0", diff --git a/src/bootstrap/dapp-api.js b/src/bootstrap/dapp-api.js index 0942dff..12f5914 100644 --- a/src/bootstrap/dapp-api.js +++ b/src/bootstrap/dapp-api.js @@ -42,7 +42,8 @@ export { ETHAddressRegExpCaptureGroup, ETHAddressRegExp, strictETHAddressRegExp, - networkID + networkID, + env } setTimeout( diff --git a/src/components/iframes/doges-on-trial-evidence/index.js b/src/components/iframes/doges-on-trial-evidence/index.js index 33ac94f..49de3b8 100644 --- a/src/components/iframes/doges-on-trial-evidence/index.js +++ b/src/components/iframes/doges-on-trial-evidence/index.js @@ -1,7 +1,7 @@ import React, { Component } from 'react' import { ArbitrablePermissionList } from 'kleros-api/lib/contracts/implementations/arbitrable' -import { eth } from '../../../bootstrap/dapp-api' +import { eth, env } from '../../../bootstrap/dapp-api' import LinkBox from '../../link-box' import './doges-on-trial-evidence.css' @@ -22,21 +22,21 @@ class DogesOnTrialEvidence extends Component { ) } - async receiveEvidence(evidence) { - if (evidence.data && evidence.data.target === 'evidence') { + async receiveEvidence(message) { + if (message.data && message.data.target === 'evidence') { const arbitrablePermissionList = new ArbitrablePermissionList( eth.currentProvider, - evidence.data.data.arbitrableContractAddress + message.data.arbitrableContractAddress ) const itemHash = await arbitrablePermissionList.getItemByDisputeId( - evidence.data.data.disputeID + message.data.disputeID ) - evidence.data.data.metaEvidence.fileURI = - process.env.REACT_APP_DEV_DOGE_IMAGES_BASE_URL + itemHash + message.data.metaEvidence.fileURI = + process.env[`REACT_APP_${env}_DOGE_IMAGES_BASE_URL`] + itemHash this.setState({ - evidence: evidence.data.data + evidence: message.data }) } } @@ -44,11 +44,8 @@ class DogesOnTrialEvidence extends Component { render() { const { evidence } = this.state if (!evidence) return null - let uri - // it is metaEvidence if there is a disputeID. We have to fetch the image - if (evidence.disputeID !== null && evidence.disputeID !== undefined) { - uri = evidence.metaEvidence.fileURI - } else uri = evidence.URI + + const uri = evidence.metaEvidence.fileURI return (
diff --git a/src/containers/dispute/components/details/index.js b/src/containers/dispute/components/details/index.js index a8abdc6..ea86472 100644 --- a/src/containers/dispute/components/details/index.js +++ b/src/containers/dispute/components/details/index.js @@ -17,13 +17,20 @@ class Details extends Component { } handleFrameMessage = message => { - if (message.data && message.data.target === 'evidence') { + if ( + message.data && + message.data.target === 'evidence' && + message.data.loaded + ) { const { metaEvidence, disputeID, arbitrableContractAddress } = this.props message.source.postMessage( { target: 'evidence', - data: { metaEvidence, disputeID, arbitrableContractAddress } + metaEvidence, + evidence: {}, + arbitrableContractAddress, + disputeID }, '*' ) @@ -40,6 +47,7 @@ class Details extends Component { metaEvidence } = this.props + // Default display of primary document file. let fileDisplay = (

File

@@ -47,6 +55,7 @@ class Details extends Component {
) + // Use external interface to display primary document file. if (metaEvidence.evidenceDisplayInterfaceURL) { fileDisplay = (