augur-ui-react-components
Advanced tools
Comparing version 3.6.33 to 3.6.34
{ | ||
"name": "augur-ui-react-components", | ||
"version": "3.6.33", | ||
"version": "3.6.34", | ||
"description": "Augur UI React Components", | ||
@@ -5,0 +5,0 @@ "author": "Augur Project", |
@@ -56,2 +56,14 @@ import React, { PropTypes } from 'react'; | ||
<h2>Technical updates:</h2> | ||
<h3>November 30, 2016</h3> | ||
<ol> | ||
<li> | ||
Added human-readable "label" and "description" fields to static API data. Added "label maker" to augur-core API maker script. | ||
</li> | ||
<li> | ||
The following things are now included in the auto-generated transaction display: formatted label, description, timestamp, and gas fees. | ||
</li> | ||
<li> | ||
Added a "no-relay" list to the UI, which has the names of methods for which the transaction relay should not be triggered. This will allow the old manually-constructed "transactions" to peacefully coexist with relay-generated transactions in the transaction display. | ||
</li> | ||
</ol> | ||
<h3>November 29, 2016</h3> | ||
@@ -58,0 +70,0 @@ <ol> |
@@ -5,3 +5,3 @@ import React from 'react'; | ||
import { CREATE_MARKET, BUY, SELL, BID, ASK, SHORT_SELL, SHORT_ASK, COMMIT_REPORT, REVEAL_REPORT, GENERATE_ORDER_BOOK, CANCEL_ORDER, SELL_COMPLETE_SETS } from 'modules/transactions/constants/types'; | ||
import { LOGIN, FUND_ACCOUNT } from 'modules/auth/constants/auth-types'; | ||
import { FUND_ACCOUNT } from 'modules/auth/constants/auth-types'; | ||
import { SCALAR, CATEGORICAL } from 'modules/markets/constants/market-types'; | ||
@@ -16,8 +16,11 @@ import ValueDenomination from 'modules/common/components/value-denomination'; | ||
const marketDescription = () => { | ||
if (!p.data.description && !p.data.marketDescription) return <span />; | ||
const shortDescription = p.data.description ? | ||
p.data.description.substring(0, 100) + ((p.data.description.length > 100 && '...') || '') : | ||
p.data.marketDescription.substring(0, 100) + ((p.data.marketDescription.length > 100 && '...') || ''); | ||
const fullDescription = p.data.description || p.data.marketDescription; | ||
const buildDescription = (fullDescription) => { | ||
if (!fullDescription) return <span />; | ||
let shortDescription; | ||
if (fullDescription.indexOf('\n') > -1) { | ||
shortDescription = fullDescription.split('\n').map(text => <li key={text}>{text}</li>); | ||
shortDescription = <ul>{shortDescription}</ul>; | ||
} else { | ||
shortDescription = fullDescription.substring(0, 100) + ((fullDescription.length > 100 && '...') || ''); | ||
} | ||
const description = (isShortened) => { | ||
@@ -92,3 +95,3 @@ if (isShortened) { | ||
<br /> | ||
{marketDescription()} | ||
{buildDescription(p.data.description)} | ||
<br className="hide-in-trade-summary-display" /> | ||
@@ -109,3 +112,3 @@ {p.timestamp && | ||
<br /> | ||
{marketDescription()} | ||
{buildDescription(p.data.description)} | ||
<br /> | ||
@@ -119,9 +122,2 @@ {p.timestamp && | ||
case LOGIN: | ||
nodes.description = ( | ||
<span className="description"> | ||
Login | ||
</span> | ||
); | ||
break; | ||
case FUND_ACCOUNT: | ||
@@ -141,2 +137,3 @@ nodes.action = 'REGISTER NEW ACCOUNT'; | ||
break; | ||
case CREATE_MARKET: | ||
@@ -148,3 +145,3 @@ nodes.action = 'Create market'; | ||
<br /> | ||
{marketDescription()} | ||
{buildDescription(p.data.description)} | ||
<br /> | ||
@@ -184,3 +181,3 @@ {p.timestamp && | ||
<br /> | ||
{marketDescription()} | ||
{buildDescription(p.data.description || p.data.marketDescription)} | ||
<br /> | ||
@@ -200,3 +197,3 @@ {p.timestamp && | ||
<br /> | ||
{marketDescription()} | ||
{buildDescription(p.data.description)} | ||
<br /> | ||
@@ -219,3 +216,3 @@ {p.timestamp && | ||
<br /> | ||
{marketDescription()} | ||
{buildDescription(p.data.description)} | ||
<br /> | ||
@@ -231,3 +228,13 @@ {p.timestamp && | ||
default: | ||
nodes.description = (<span className="description">{p.type}</span>); | ||
nodes.description = ( | ||
<span className="description"> | ||
<span className="action">{p.type}</span> | ||
<br /> | ||
{buildDescription(p.data.description)} | ||
<br /> | ||
{p.timestamp && | ||
<ValueTimestamp className="property-value" {...p.timestamp} /> | ||
} | ||
</span> | ||
); | ||
break; | ||
@@ -234,0 +241,0 @@ } |
Sorry, the diff of this file is too big to display
2493085
47881