1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-07-01 06:11:43 +02:00

display ocean symbol on compute job price (#913)

This commit is contained in:
Norbi 2021-10-12 11:01:25 +03:00 committed by GitHub
parent 46a16a3043
commit f4746e8a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions

View File

@ -4,7 +4,6 @@ import classNames from 'classnames/bind'
import Conversion from './Conversion' import Conversion from './Conversion'
import styles from './PriceUnit.module.css' import styles from './PriceUnit.module.css'
import { useUserPreferences } from '../../../providers/UserPreferences' import { useUserPreferences } from '../../../providers/UserPreferences'
import { useOcean } from '../../../providers/Ocean'
import Badge from '../Badge' import Badge from '../Badge'
const cx = classNames.bind(styles) const cx = classNames.bind(styles)

View File

@ -58,6 +58,7 @@ export default function FormStartCompute({
assetTimeout, assetTimeout,
hasPreviousOrderSelectedComputeAsset, hasPreviousOrderSelectedComputeAsset,
hasDatatokenSelectedComputeAsset, hasDatatokenSelectedComputeAsset,
oceanSymbol,
dtSymbolSelectedComputeAsset, dtSymbolSelectedComputeAsset,
dtBalanceSelectedComputeAsset, dtBalanceSelectedComputeAsset,
selectedComputeAssetLowPoolLiquidity, selectedComputeAssetLowPoolLiquidity,
@ -81,6 +82,7 @@ export default function FormStartCompute({
assetTimeout: string assetTimeout: string
hasPreviousOrderSelectedComputeAsset?: boolean hasPreviousOrderSelectedComputeAsset?: boolean
hasDatatokenSelectedComputeAsset?: boolean hasDatatokenSelectedComputeAsset?: boolean
oceanSymbol?: string
dtSymbolSelectedComputeAsset?: string dtSymbolSelectedComputeAsset?: string
dtBalanceSelectedComputeAsset?: string dtBalanceSelectedComputeAsset?: string
selectedComputeAssetLowPoolLiquidity?: boolean selectedComputeAssetLowPoolLiquidity?: boolean
@ -179,6 +181,7 @@ export default function FormStartCompute({
selectedComputeAssetTimeout={selectedComputeAssetTimeout} selectedComputeAssetTimeout={selectedComputeAssetTimeout}
hasDatatokenSelectedComputeAsset={hasDatatokenSelectedComputeAsset} hasDatatokenSelectedComputeAsset={hasDatatokenSelectedComputeAsset}
algorithmPrice={algorithmPrice} algorithmPrice={algorithmPrice}
symbol={oceanSymbol}
totalPrice={totalPrice} totalPrice={totalPrice}
/> />

View File

@ -9,6 +9,7 @@ interface PriceOutputProps {
totalPrice: number totalPrice: number
hasPreviousOrder: boolean hasPreviousOrder: boolean
hasDatatoken: boolean hasDatatoken: boolean
symbol: string
assetTimeout: string assetTimeout: string
hasPreviousOrderSelectedComputeAsset: boolean hasPreviousOrderSelectedComputeAsset: boolean
hasDatatokenSelectedComputeAsset: boolean hasDatatokenSelectedComputeAsset: boolean
@ -20,12 +21,14 @@ function Row({
price, price,
hasPreviousOrder, hasPreviousOrder,
hasDatatoken, hasDatatoken,
symbol,
timeout, timeout,
sign sign
}: { }: {
price: number price: number
hasPreviousOrder?: boolean hasPreviousOrder?: boolean
hasDatatoken?: boolean hasDatatoken?: boolean
symbol?: string
timeout?: string timeout?: string
sign?: string sign?: string
}) { }) {
@ -35,6 +38,7 @@ function Row({
<div> <div>
<PriceUnit <PriceUnit
price={hasPreviousOrder || hasDatatoken ? '0' : `${price}`} price={hasPreviousOrder || hasDatatoken ? '0' : `${price}`}
symbol={symbol}
small small
className={styles.price} className={styles.price}
/> />
@ -54,6 +58,7 @@ export default function PriceOutput({
hasPreviousOrder, hasPreviousOrder,
hasDatatoken, hasDatatoken,
assetTimeout, assetTimeout,
symbol,
hasPreviousOrderSelectedComputeAsset, hasPreviousOrderSelectedComputeAsset,
hasDatatokenSelectedComputeAsset, hasDatatokenSelectedComputeAsset,
algorithmPrice, algorithmPrice,
@ -63,7 +68,7 @@ export default function PriceOutput({
return ( return (
<div className={styles.priceComponent}> <div className={styles.priceComponent}>
You will pay <PriceUnit price={`${totalPrice}`} small /> You will pay <PriceUnit price={`${totalPrice}`} symbol={symbol} small />
<Tooltip <Tooltip
content={ content={
<div className={styles.calculation}> <div className={styles.calculation}>
@ -72,15 +77,17 @@ export default function PriceOutput({
hasDatatoken={hasDatatoken} hasDatatoken={hasDatatoken}
price={price?.value} price={price?.value}
timeout={assetTimeout} timeout={assetTimeout}
symbol={symbol}
/> />
<Row <Row
hasPreviousOrder={hasPreviousOrderSelectedComputeAsset} hasPreviousOrder={hasPreviousOrderSelectedComputeAsset}
hasDatatoken={hasDatatokenSelectedComputeAsset} hasDatatoken={hasDatatokenSelectedComputeAsset}
price={algorithmPrice?.value} price={algorithmPrice?.value}
timeout={selectedComputeAssetTimeout} timeout={selectedComputeAssetTimeout}
symbol={symbol}
sign="+" sign="+"
/> />
<Row price={totalPrice} sign="=" /> <Row price={totalPrice} symbol={symbol} sign="=" />
</div> </div>
} }
/> />

View File

@ -448,6 +448,7 @@ export default function Compute({
assetTimeout={datasetTimeout} assetTimeout={datasetTimeout}
hasPreviousOrderSelectedComputeAsset={hasPreviousAlgorithmOrder} hasPreviousOrderSelectedComputeAsset={hasPreviousAlgorithmOrder}
hasDatatokenSelectedComputeAsset={hasAlgoAssetDatatoken} hasDatatokenSelectedComputeAsset={hasAlgoAssetDatatoken}
oceanSymbol={price ? price.oceanSymbol : ''}
dtSymbolSelectedComputeAsset={ dtSymbolSelectedComputeAsset={
selectedAlgorithmAsset?.dataTokenInfo?.symbol selectedAlgorithmAsset?.dataTokenInfo?.symbol
} }