Show full description in Asset page, use short name for FormattedAsse…

…t popover fix #833
cryptonomex · Apr 25, 2016 · ec7a2ca · ec7a2ca
1 parent 6988752
commit ec7a2ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/web/app/components/Account/AccountAssets.jsx b/web/app/components/Account/AccountAssets.jsx
@@ -213,6 +213,7 @@ class AccountAssets extends React.Component {
         .map(asset => {
             let description = assetUtils.parseDescription(asset.options.description);
             let desc = description.short_name ? description.short_name : description.main;
+
             if (desc.length > 100) {
                 desc = desc.substr(0, 100) + "...";
             }

diff --git a/web/app/components/Blockchain/Asset.jsx b/web/app/components/Blockchain/Asset.jsx
@@ -161,7 +161,9 @@ class Asset extends React.Component {
         // Add <a to any links included in the description
 
         let description = assetUtils.parseDescription(asset.options.description);
-        let desc = description.short_name ? description.short_name : description.main;
+        let desc = description.main;
+        let short_name = description.short_name ? description.short_name : null;
+
         let urlTest = /(http?):\/\/(www\.)?[a-z0-9\.:].*?(?=\s)/g;
 
         // Regexp needs a whitespace after a url, so add one to make sure
@@ -191,6 +193,7 @@ class Asset extends React.Component {
                         description={desc}
                         issuer= {issuerName}
                     />
+                    {short_name ? <p>{short_name}</p> : null}
                     <a style={{textTransform: "uppercase"}} href={`#/market/${asset.symbol}_${preferredMarket}`}><Translate content="exchange.market"/></a>
                 </div>
         );

diff --git a/web/app/components/Utility/FormattedAsset.jsx b/web/app/components/Utility/FormattedAsset.jsx
@@ -101,7 +101,7 @@ class FormattedAsset extends React.Component {
                 alt_path="assets/Asset"
                 section="summary"
                 symbol={asset.symbol}
-                description={description.main}
+                description={description.short_name ? description.short_name : description.main}
                 issuer={issuerName}/>
             {this.props.assetInfo}
         </div>;