diff --git a/package.json b/package.json
index 264d768..e872c1d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cryptolio",
- "version": "3.2.0",
+ "version": "3.2.1",
"private": true,
"dependencies": {
"@material-ui/core": "latest",
diff --git a/src/Components/AssetCard.js b/src/Components/AssetCard.js
index 15efbba..752d8c0 100644
--- a/src/Components/AssetCard.js
+++ b/src/Components/AssetCard.js
@@ -81,25 +81,37 @@ class AssetCard extends Component {
? (
)
:
+ const percentChanges =
+ (
+
+
+
+
+
+ )
+
const assetInfo =
price
? (
-
- {renderStyle === 'compact'
- ? {Util.getLocalizedPrice(price, this.props.settings)}
- : Price: {Util.getLocalizedPrice(price, this.props.settings)}}
- {renderStyle === 'compact'
- ? {Util.getCurrencySymbol(this.props.settings.currency) + abbreviate(this.props.asset.market_cap, 2, ['K', 'M', 'B', 'T'])}
- : Market Cap: {Util.getCurrencySymbol(this.props.settings.currency) + abbreviate(this.props.asset.market_cap, 2, ['K', 'M', 'B', 'T'])}}
-
-
- )
+
+
+ {renderStyle === 'compact'
+ ? {Util.getLocalizedPrice(price, this.props.settings)}
+ : Price: {Util.getLocalizedPrice(price, this.props.settings)}}
+ {renderStyle === 'compact'
+ ? {Util.getCurrencySymbol(this.props.settings.currency) + abbreviate(this.props.asset.market_cap, 2, ['K', 'M', 'B', 'T'])}
+ : Market Cap: {Util.getCurrencySymbol(this.props.settings.currency) + abbreviate(this.props.asset.market_cap, 2, ['K', 'M', 'B', 'T'])}}
+
+
+ {renderStyle === 'compact' ? percentChanges : null}
+
+ )
:
const assetName =
@@ -107,14 +119,6 @@ class AssetCard extends Component {
? `${this.props.asset.name} (${this.props.asset.symbol})`
:
- const percentChanges =
- (
-
- )
-
return (
(window.innerWidth <= 760 && event.target.tagName !== 'INPUT') ? this.toggleSettings() : null}>
@@ -140,15 +144,15 @@ class AssetCard extends Component {
}
classes={
- renderStyle === 'compact'
- ? null
- : {
- action: 'm-0 p-2',
- root: 'h-0 p-0'
- }
-}
+ renderStyle === 'compact'
+ ? null
+ : {
+ action: 'm-0 p-2',
+ root: 'h-0 p-0'
+ }
+ }
subheader={renderStyle === 'compact' ? assetInfo : null}
- title={renderStyle === 'compact' ? assetName : null}
+ title={renderStyle === 'compact' ? {assetName} : null}
/>
{
renderStyle !== 'compact'
@@ -162,13 +166,11 @@ class AssetCard extends Component {
)
: null
}
-
- {renderStyle === 'compact'
- ? percentChanges
- :
- {percentChanges}
- {assetInfo}
- }
+
+
+ {percentChanges}
+ {assetInfo}
+
(
+ Util.getLocalizedPrice(params.value, props.settings)
+ )
+ },
{
field: 'holdings',
headerName: 'Holdings',
@@ -154,7 +162,7 @@ function AssetTable (props) {
asset.symbol,
asset.imageURL,
asset.name,
- Util.getLocalizedPrice(asset.holdings * asset.price, props.settings),
+ asset.holdings * asset.price,
asset.holdings,
asset.price,
asset.percent_change_1h,
@@ -174,6 +182,7 @@ function AssetTable (props) {
{
if (cell.field === "holdings") {
editHoldings = cell.row.id
diff --git a/src/styles/Card.css b/src/styles/Card.css
index 0e51b6e..678827e 100644
--- a/src/styles/Card.css
+++ b/src/styles/Card.css
@@ -109,14 +109,6 @@
height: 0 !important;
}
-.MuiDataGrid-viewport .rendering-zone,
-.MuiDataGrid-root .Mui-even.MuiDataGrid-row,
-.MuiDataGrid-root .Mui-odd.MuiDataGrid-row,
-.MuiDataGrid-root .MuiDataGrid-viewport {
- min-width: 100% !important;
- width: 100% !important;
-}
-
.pull-left {
left: 0;
position: relative !important;