Fixing merge conflicts

This commit is contained in:
Chris Troutner
2021-10-04 20:36:49 -07:00
2 changed files with 33770 additions and 9526 deletions
+33735 -9491
View File
File diff suppressed because it is too large Load Diff
+28 -28
View File
@@ -1,11 +1,11 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Row, Col, Box, Button } from 'adminlte-2-react'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import JSONPretty from 'react-json-pretty'
import React from "react"
import PropTypes from "prop-types"
import { Row, Col, Box, Button } from "adminlte-2-react"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
import JSONPretty from "react-json-pretty"
const HASH_EXPLORER = 'https://p2wdb.fullstack.cash/entry/hash/' // PSF p2wdb hash explorer
const TX_EXPLORER = 'https://simpleledger.info/tx/' // BCH Transaction Explorer
const HASH_EXPLORER = "https://p2wdb.fullstack.cash/entry/hash/" // PSF p2wdb hash explorer
const TX_EXPLORER = "https://simpleledger.info/tx/" // BCH Transaction Explorer
let _this
class Details extends React.Component {
@@ -16,7 +16,7 @@ class Details extends React.Component {
this.state = {
entry: {},
entryData: {}
entryData: {},
}
}
@@ -26,26 +26,26 @@ class Details extends React.Component {
<>
<Row>
<Col sm={12}>
<Box className=' border-none mt-2' loaded={!this.state.inFetch}>
<Row className='text-center'>
<Box className=" border-none mt-2" loaded={!this.state.inFetch}>
<Row className="text-center">
<Col sm={12}>
<h1 id='SendTokens'>
<h1 id="SendTokens">
<FontAwesomeIcon
className='title-icon'
size='xs'
icon='info-circle'
className="title-icon"
size="xs"
icon="info-circle"
/>
<span>Details</span>
</h1>
{entry._id && (
<Box className='border-none details-data-content'>
<Box className="border-none details-data-content">
<p>
<b>IS VALID: </b>
{entry.isValid}
</p>
<p>
<b>APP ID: </b>
{entry.appId || 'none'}
{entry.appId || "none"}
</p>
<p>
<b>CREATE AT: </b>
@@ -59,8 +59,8 @@ class Details extends React.Component {
<b>HASH: </b>
<a
href={`${HASH_EXPLORER}${entry.hash}`}
target='_blank'
rel='noreferrer'
target="_blank"
rel="noreferrer"
>
{entry.hash}
</a>
@@ -69,8 +69,8 @@ class Details extends React.Component {
<b>TRANSACTION ID : </b>
<a
href={`${TX_EXPLORER}${entry.key}`}
target='_blank'
rel='noreferrer'
target="_blank"
rel="noreferrer"
>
{entry.key}
</a>
@@ -95,7 +95,7 @@ class Details extends React.Component {
<>
- <b>Data :</b>
<JSONPretty
id='json-pretty'
id="json-pretty"
data={entryData.data}
/>
</>
@@ -107,11 +107,11 @@ class Details extends React.Component {
)}
</Col>
<Col sm={12}>
<div className='btn-wrapper'>
<div className="btn-wrapper">
<Button
text='Close'
type='primary'
className='btn-lg btn-close-entry mr-1 ml-1 mt-1'
text="Close"
type="primary"
className="btn-lg btn-close-entry mr-1 ml-1 mt-1"
onClick={_this.handleClose}
/>
</div>
@@ -139,10 +139,10 @@ class Details extends React.Component {
const { entry } = _this.props
_this.setState({
entry,
entryData: entry.value
entryData: entry.value,
})
} catch (err) {
console.warn('Error in handleData()', err)
console.warn("Error in handleData()", err)
}
}
@@ -162,6 +162,6 @@ class Details extends React.Component {
}
Details.propTypes = {
entry: PropTypes.object,
onClose: PropTypes.func
onClose: PropTypes.func,
}
export default Details