mirror of
https://github.com/oceanprotocol/market.git
synced 2024-12-02 05:57:29 +01:00
currency, prices props fixes
This commit is contained in:
parent
fa6534a4bb
commit
8fc7a19a55
@ -11,6 +11,8 @@ import AssetSelection, {
|
|||||||
} from '../FormFields/AssetSelection'
|
} from '../FormFields/AssetSelection'
|
||||||
import Nft from '../FormFields/Nft'
|
import Nft from '../FormFields/Nft'
|
||||||
import InputRadio from './InputRadio'
|
import InputRadio from './InputRadio'
|
||||||
|
import { useUserPreferences } from '@context/UserPreferences'
|
||||||
|
import { usePrices } from '@context/Prices'
|
||||||
|
|
||||||
const cx = classNames.bind(styles)
|
const cx = classNames.bind(styles)
|
||||||
|
|
||||||
@ -55,6 +57,8 @@ export default function InputElement({
|
|||||||
...props
|
...props
|
||||||
}: InputProps): ReactElement {
|
}: InputProps): ReactElement {
|
||||||
const styleClasses = cx({ select: true, [size]: size })
|
const styleClasses = cx({ select: true, [size]: size })
|
||||||
|
const { locale, currency } = useUserPreferences()
|
||||||
|
const { prices } = usePrices()
|
||||||
switch (props.type) {
|
switch (props.type) {
|
||||||
case 'select': {
|
case 'select': {
|
||||||
const sortedOptions =
|
const sortedOptions =
|
||||||
@ -91,6 +95,9 @@ export default function InputElement({
|
|||||||
return (
|
return (
|
||||||
<AssetSelection
|
<AssetSelection
|
||||||
assets={options as unknown as AssetSelectionAsset[]}
|
assets={options as unknown as AssetSelectionAsset[]}
|
||||||
|
locale={locale}
|
||||||
|
currency={currency}
|
||||||
|
prices={prices}
|
||||||
{...field}
|
{...field}
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
@ -100,6 +107,9 @@ export default function InputElement({
|
|||||||
return (
|
return (
|
||||||
<AssetSelection
|
<AssetSelection
|
||||||
assets={options as unknown as AssetSelectionAsset[]}
|
assets={options as unknown as AssetSelectionAsset[]}
|
||||||
|
locale={locale}
|
||||||
|
currency={currency}
|
||||||
|
prices={prices}
|
||||||
multiple
|
multiple
|
||||||
{...field}
|
{...field}
|
||||||
{...props}
|
{...props}
|
||||||
|
@ -5,9 +5,9 @@ import { AssetSelectionAsset } from '@shared/FormFields/AssetSelection'
|
|||||||
import AssetComputeList from '@shared/AssetList/AssetComputeList'
|
import AssetComputeList from '@shared/AssetList/AssetComputeList'
|
||||||
import { useCancelToken } from '@hooks/useCancelToken'
|
import { useCancelToken } from '@hooks/useCancelToken'
|
||||||
import { getServiceByName } from '@utils/ddo'
|
import { getServiceByName } from '@utils/ddo'
|
||||||
import { Asset } from '@oceanprotocol/lib'
|
|
||||||
import { AssetExtended } from 'src/@types/AssetExtended'
|
import { AssetExtended } from 'src/@types/AssetExtended'
|
||||||
import { useUserPreferences } from '@context/UserPreferences'
|
import { useUserPreferences } from '@context/UserPreferences'
|
||||||
|
import { usePrices } from '@context/Prices'
|
||||||
|
|
||||||
export default function AlgorithmDatasetsListForCompute({
|
export default function AlgorithmDatasetsListForCompute({
|
||||||
asset,
|
asset,
|
||||||
@ -19,7 +19,8 @@ export default function AlgorithmDatasetsListForCompute({
|
|||||||
const [datasetsForCompute, setDatasetsForCompute] =
|
const [datasetsForCompute, setDatasetsForCompute] =
|
||||||
useState<AssetSelectionAsset[]>()
|
useState<AssetSelectionAsset[]>()
|
||||||
const newCancelToken = useCancelToken()
|
const newCancelToken = useCancelToken()
|
||||||
const { locale } = useUserPreferences()
|
const { locale, currency } = useUserPreferences()
|
||||||
|
const { prices } = usePrices()
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!asset) return
|
if (!asset) return
|
||||||
@ -44,7 +45,12 @@ export default function AlgorithmDatasetsListForCompute({
|
|||||||
return (
|
return (
|
||||||
<div className={styles.datasetsContainer}>
|
<div className={styles.datasetsContainer}>
|
||||||
<h3 className={styles.text}>Datasets algorithm is allowed to run on</h3>
|
<h3 className={styles.text}>Datasets algorithm is allowed to run on</h3>
|
||||||
<AssetComputeList assets={datasetsForCompute} locale={locale} />
|
<AssetComputeList
|
||||||
|
assets={datasetsForCompute}
|
||||||
|
locale={locale}
|
||||||
|
currency={currency}
|
||||||
|
prices={prices}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -5,6 +5,7 @@ import Tooltip from '@shared/atoms/Tooltip'
|
|||||||
import styles from './PriceOutput.module.css'
|
import styles from './PriceOutput.module.css'
|
||||||
import { AccessDetails } from 'src/@types/Price'
|
import { AccessDetails } from 'src/@types/Price'
|
||||||
import { useUserPreferences } from '@context/UserPreferences'
|
import { useUserPreferences } from '@context/UserPreferences'
|
||||||
|
import { usePrices } from '@context/Prices'
|
||||||
interface PriceOutputProps {
|
interface PriceOutputProps {
|
||||||
totalPrice: number
|
totalPrice: number
|
||||||
hasPreviousOrder: boolean
|
hasPreviousOrder: boolean
|
||||||
@ -32,7 +33,8 @@ function Row({
|
|||||||
timeout?: string
|
timeout?: string
|
||||||
sign?: string
|
sign?: string
|
||||||
}) {
|
}) {
|
||||||
const { locale } = useUserPreferences()
|
const { locale, currency } = useUserPreferences()
|
||||||
|
const { prices } = usePrices()
|
||||||
return (
|
return (
|
||||||
<div className={styles.priceRow}>
|
<div className={styles.priceRow}>
|
||||||
<div className={styles.sign}>{sign}</div>
|
<div className={styles.sign}>{sign}</div>
|
||||||
@ -43,6 +45,8 @@ function Row({
|
|||||||
size="small"
|
size="small"
|
||||||
className={styles.price}
|
className={styles.price}
|
||||||
locale={locale}
|
locale={locale}
|
||||||
|
currency={currency}
|
||||||
|
prices={prices}
|
||||||
/>
|
/>
|
||||||
<span className={styles.timeout}>
|
<span className={styles.timeout}>
|
||||||
{timeout &&
|
{timeout &&
|
||||||
@ -67,7 +71,8 @@ export default function PriceOutput({
|
|||||||
selectedComputeAssetTimeout
|
selectedComputeAssetTimeout
|
||||||
}: PriceOutputProps): ReactElement {
|
}: PriceOutputProps): ReactElement {
|
||||||
const { asset } = useAsset()
|
const { asset } = useAsset()
|
||||||
const { locale } = useUserPreferences()
|
const { locale, currency } = useUserPreferences()
|
||||||
|
const { prices } = usePrices()
|
||||||
return (
|
return (
|
||||||
<div className={styles.priceComponent}>
|
<div className={styles.priceComponent}>
|
||||||
You will pay{' '}
|
You will pay{' '}
|
||||||
@ -76,6 +81,8 @@ export default function PriceOutput({
|
|||||||
symbol={symbol}
|
symbol={symbol}
|
||||||
size="small"
|
size="small"
|
||||||
locale={locale}
|
locale={locale}
|
||||||
|
currency={currency}
|
||||||
|
prices={prices}
|
||||||
/>
|
/>
|
||||||
<Tooltip
|
<Tooltip
|
||||||
content={
|
content={
|
||||||
|
@ -35,6 +35,7 @@ import { AccessDetails } from 'src/@types/Price'
|
|||||||
import { transformAssetToAssetSelection } from '@utils/assetConvertor'
|
import { transformAssetToAssetSelection } from '@utils/assetConvertor'
|
||||||
import { useMarketMetadata } from '@context/MarketMetadata'
|
import { useMarketMetadata } from '@context/MarketMetadata'
|
||||||
import { useUserPreferences } from '@context/UserPreferences'
|
import { useUserPreferences } from '@context/UserPreferences'
|
||||||
|
import { usePrices } from '@context/Prices'
|
||||||
|
|
||||||
export default function Compute({
|
export default function Compute({
|
||||||
ddo,
|
ddo,
|
||||||
@ -54,7 +55,8 @@ export default function Compute({
|
|||||||
consumableFeedback?: string
|
consumableFeedback?: string
|
||||||
}): ReactElement {
|
}): ReactElement {
|
||||||
const { appConfig } = useMarketMetadata()
|
const { appConfig } = useMarketMetadata()
|
||||||
const { locale } = useUserPreferences()
|
const { locale, currency } = useUserPreferences()
|
||||||
|
const { prices } = usePrices()
|
||||||
const { accountId } = useWeb3()
|
const { accountId } = useWeb3()
|
||||||
const [isJobStarting, setIsJobStarting] = useState(false)
|
const [isJobStarting, setIsJobStarting] = useState(false)
|
||||||
const [error, setError] = useState<string>()
|
const [error, setError] = useState<string>()
|
||||||
@ -395,6 +397,8 @@ export default function Compute({
|
|||||||
conversion
|
conversion
|
||||||
size="large"
|
size="large"
|
||||||
locale={locale}
|
locale={locale}
|
||||||
|
currency={currency}
|
||||||
|
prices={prices}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@ import { useIsMounted } from '@hooks/useIsMounted'
|
|||||||
import { usePool } from '@context/Pool'
|
import { usePool } from '@context/Pool'
|
||||||
import { useMarketMetadata } from '@context/MarketMetadata'
|
import { useMarketMetadata } from '@context/MarketMetadata'
|
||||||
import { useUserPreferences } from '@context/UserPreferences'
|
import { useUserPreferences } from '@context/UserPreferences'
|
||||||
|
import { usePrices } from '@context/Prices'
|
||||||
|
|
||||||
export default function Download({
|
export default function Download({
|
||||||
asset,
|
asset,
|
||||||
@ -37,7 +38,8 @@ export default function Download({
|
|||||||
consumableFeedback?: string
|
consumableFeedback?: string
|
||||||
}): ReactElement {
|
}): ReactElement {
|
||||||
const { accountId, web3 } = useWeb3()
|
const { accountId, web3 } = useWeb3()
|
||||||
const { locale } = useUserPreferences()
|
const { locale, currency } = useUserPreferences()
|
||||||
|
const { prices } = usePrices()
|
||||||
const { getOpcFeeForToken } = useMarketMetadata()
|
const { getOpcFeeForToken } = useMarketMetadata()
|
||||||
const { isInPurgatory, isAssetNetwork } = useAsset()
|
const { isInPurgatory, isAssetNetwork } = useAsset()
|
||||||
const { poolData } = usePool()
|
const { poolData } = usePool()
|
||||||
@ -216,6 +218,8 @@ export default function Download({
|
|||||||
conversion
|
conversion
|
||||||
size="large"
|
size="large"
|
||||||
locale={locale}
|
locale={locale}
|
||||||
|
currency={currency}
|
||||||
|
prices={prices}
|
||||||
/>
|
/>
|
||||||
{!isInPurgatory && <PurchaseButton />}
|
{!isInPurgatory && <PurchaseButton />}
|
||||||
</div>
|
</div>
|
||||||
|
@ -2,6 +2,7 @@ import React, { ReactElement } from 'react'
|
|||||||
import PriceUnit from '@shared/Price/PriceUnit'
|
import PriceUnit from '@shared/Price/PriceUnit'
|
||||||
import styles from './UserLiquidity.module.css'
|
import styles from './UserLiquidity.module.css'
|
||||||
import { useUserPreferences } from '@context/UserPreferences'
|
import { useUserPreferences } from '@context/UserPreferences'
|
||||||
|
import { usePrices } from '@context/Prices'
|
||||||
|
|
||||||
function UserLiquidityLine({
|
function UserLiquidityLine({
|
||||||
title,
|
title,
|
||||||
@ -12,11 +13,20 @@ function UserLiquidityLine({
|
|||||||
amount: string
|
amount: string
|
||||||
symbol: string
|
symbol: string
|
||||||
}) {
|
}) {
|
||||||
const { locale } = useUserPreferences()
|
const { locale, currency } = useUserPreferences()
|
||||||
|
const { prices } = usePrices()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<span>{title}</span>
|
<span>{title}</span>
|
||||||
<PriceUnit price={amount} symbol={symbol} size="small" locale={locale} />
|
<PriceUnit
|
||||||
|
price={amount}
|
||||||
|
symbol={symbol}
|
||||||
|
size="small"
|
||||||
|
locale={locale}
|
||||||
|
currency={currency}
|
||||||
|
prices={prices}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user