mirror of
https://github.com/oceanprotocol/market.git
synced 2024-12-02 05:57:29 +01:00
fix most remaining typing errors
This commit is contained in:
parent
b8930cc738
commit
f9f3768f5f
@ -13,6 +13,7 @@ import { FormAddLiquidity } from '.'
|
|||||||
import { PoolBalance } from '../../../../../@types/TokenBalance'
|
import { PoolBalance } from '../../../../../@types/TokenBalance'
|
||||||
import UserLiquidity from '../../../../atoms/UserLiquidity'
|
import UserLiquidity from '../../../../atoms/UserLiquidity'
|
||||||
import { useOcean } from '../../../../../providers/Ocean'
|
import { useOcean } from '../../../../../providers/Ocean'
|
||||||
|
import { useWeb3 } from '../../../../../providers/Web3'
|
||||||
|
|
||||||
export default function FormAdd({
|
export default function FormAdd({
|
||||||
coin,
|
coin,
|
||||||
@ -37,7 +38,8 @@ export default function FormAdd({
|
|||||||
setNewPoolTokens: (value: string) => void
|
setNewPoolTokens: (value: string) => void
|
||||||
setNewPoolShare: (value: string) => void
|
setNewPoolShare: (value: string) => void
|
||||||
}): ReactElement {
|
}): ReactElement {
|
||||||
const { ocean, balance } = useOcean()
|
const { balance } = useWeb3()
|
||||||
|
const { ocean } = useOcean()
|
||||||
|
|
||||||
// Connect with form
|
// Connect with form
|
||||||
const {
|
const {
|
||||||
|
@ -65,8 +65,8 @@ export default function Add({
|
|||||||
const data = useStaticQuery(contentQuery)
|
const data = useStaticQuery(contentQuery)
|
||||||
const content = data.content.edges[0].node.childContentJson.pool.add
|
const content = data.content.edges[0].node.childContentJson.pool.add
|
||||||
|
|
||||||
const { accountId } = useWeb3()
|
const { accountId, balance } = useWeb3()
|
||||||
const { ocean, balance } = useOcean()
|
const { ocean } = useOcean()
|
||||||
const { debug } = useUserPreferences()
|
const { debug } = useUserPreferences()
|
||||||
const [txId, setTxId] = useState<string>()
|
const [txId, setTxId] = useState<string>()
|
||||||
const [coin, setCoin] = useState('OCEAN')
|
const [coin, setCoin] = useState('OCEAN')
|
||||||
|
@ -6,8 +6,8 @@ import { useOcean } from '../../../../providers/Ocean'
|
|||||||
import { useWeb3 } from '../../../../providers/Web3'
|
import { useWeb3 } from '../../../../providers/Web3'
|
||||||
|
|
||||||
export default function Trade(): ReactElement {
|
export default function Trade(): ReactElement {
|
||||||
const { accountId } = useWeb3()
|
const { accountId, balance } = useWeb3()
|
||||||
const { ocean, balance } = useOcean()
|
const { ocean } = useOcean()
|
||||||
const [tokenBalance, setTokenBalance] = useState<PoolBalance>()
|
const [tokenBalance, setTokenBalance] = useState<PoolBalance>()
|
||||||
const { price, ddo } = useAsset()
|
const { price, ddo } = useAsset()
|
||||||
const [maxDt, setMaxDt] = useState(0)
|
const [maxDt, setMaxDt] = useState(0)
|
||||||
|
@ -16,8 +16,8 @@ import { getFileInfo } from '../../../utils/provider'
|
|||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
|
||||||
export default function AssetActions(): ReactElement {
|
export default function AssetActions(): ReactElement {
|
||||||
const { accountId } = useWeb3()
|
const { accountId, balance } = useWeb3()
|
||||||
const { ocean, balance, account } = useOcean()
|
const { ocean, config, account } = useOcean()
|
||||||
const { price, ddo, metadata, type, isAssetNetwork } = useAsset()
|
const { price, ddo, metadata, type, isAssetNetwork } = useAsset()
|
||||||
|
|
||||||
const [isBalanceSufficient, setIsBalanceSufficient] = useState<boolean>()
|
const [isBalanceSufficient, setIsBalanceSufficient] = useState<boolean>()
|
||||||
@ -28,6 +28,7 @@ export default function AssetActions(): ReactElement {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!config) return
|
if (!config) return
|
||||||
|
|
||||||
const source = axios.CancelToken.source()
|
const source = axios.CancelToken.source()
|
||||||
async function initFileInfo() {
|
async function initFileInfo() {
|
||||||
setFileIsLoading(true)
|
setFileIsLoading(true)
|
||||||
@ -45,6 +46,10 @@ export default function AssetActions(): ReactElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
initFileInfo()
|
initFileInfo()
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
source.cancel()
|
||||||
|
}
|
||||||
}, [config, ddo.id])
|
}, [config, ddo.id])
|
||||||
|
|
||||||
// Get and set user DT balance
|
// Get and set user DT balance
|
||||||
|
@ -23,8 +23,8 @@ export default function Dynamic({
|
|||||||
ddo: DDO
|
ddo: DDO
|
||||||
content: any
|
content: any
|
||||||
}): ReactElement {
|
}): ReactElement {
|
||||||
const { networkId } = useWeb3()
|
const { networkId, balance } = useWeb3()
|
||||||
const { account, balance } = useOcean()
|
const { account } = useOcean()
|
||||||
const [firstPrice, setFirstPrice] = useState<string>()
|
const [firstPrice, setFirstPrice] = useState<string>()
|
||||||
|
|
||||||
// Connect with form
|
// Connect with form
|
||||||
|
@ -101,7 +101,7 @@ async function getAssetMetadata(
|
|||||||
|
|
||||||
export default function ComputeJobs(): ReactElement {
|
export default function ComputeJobs(): ReactElement {
|
||||||
const { appConfig } = useSiteMetadata()
|
const { appConfig } = useSiteMetadata()
|
||||||
const { ocean, account } = useOcean()
|
const { ocean, account, config } = useOcean()
|
||||||
const { accountId } = useWeb3()
|
const { accountId } = useWeb3()
|
||||||
const [isLoading, setIsLoading] = useState(true)
|
const [isLoading, setIsLoading] = useState(true)
|
||||||
const [jobs, setJobs] = useState<ComputeJobMetaData[]>([])
|
const [jobs, setJobs] = useState<ComputeJobMetaData[]>([])
|
||||||
|
@ -6,9 +6,9 @@ import web3 from 'web3'
|
|||||||
import AssetTitle from '../../molecules/AssetListTitle'
|
import AssetTitle from '../../molecules/AssetListTitle'
|
||||||
import { useWeb3 } from '../../../providers/Web3'
|
import { useWeb3 } from '../../../providers/Web3'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import { useOcean } from '../../../providers/Ocean'
|
|
||||||
import { retrieveDDO } from '../../../utils/aquarius'
|
import { retrieveDDO } from '../../../utils/aquarius'
|
||||||
import { Logger } from '@oceanprotocol/lib'
|
import { Logger } from '@oceanprotocol/lib'
|
||||||
|
import { useSiteMetadata } from '../../../hooks/useSiteMetadata'
|
||||||
|
|
||||||
const getTokenOrders = gql`
|
const getTokenOrders = gql`
|
||||||
query OrdersData($user: String!) {
|
query OrdersData($user: String!) {
|
||||||
@ -61,10 +61,10 @@ export default function ComputeDownloads(): ReactElement {
|
|||||||
const { data } = useQuery(getTokenOrders, {
|
const { data } = useQuery(getTokenOrders, {
|
||||||
variables: { user: accountId?.toLowerCase() }
|
variables: { user: accountId?.toLowerCase() }
|
||||||
})
|
})
|
||||||
const { metadataCacheUri } = useOcean()
|
const { appConfig } = useSiteMetadata()
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!metadataCacheUri || !data) return
|
if (!appConfig.metadataCacheUri || !data) return
|
||||||
|
|
||||||
async function filterAssets() {
|
async function filterAssets() {
|
||||||
const filteredOrders: DownloadedAssets[] = []
|
const filteredOrders: DownloadedAssets[] = []
|
||||||
@ -76,7 +76,11 @@ export default function ComputeDownloads(): ReactElement {
|
|||||||
const did = web3.utils
|
const did = web3.utils
|
||||||
.toChecksumAddress(data.tokenOrders[i].datatokenId.address)
|
.toChecksumAddress(data.tokenOrders[i].datatokenId.address)
|
||||||
.replace('0x', 'did:op:')
|
.replace('0x', 'did:op:')
|
||||||
const ddo = await retrieveDDO(did, metadataCacheUri, source.token)
|
const ddo = await retrieveDDO(
|
||||||
|
did,
|
||||||
|
appConfig.metadataCacheUri,
|
||||||
|
source.token
|
||||||
|
)
|
||||||
if (ddo.service[1].type === 'access') {
|
if (ddo.service[1].type === 'access') {
|
||||||
filteredOrders.push({
|
filteredOrders.push({
|
||||||
did: did,
|
did: did,
|
||||||
@ -94,7 +98,7 @@ export default function ComputeDownloads(): ReactElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
filterAssets()
|
filterAssets()
|
||||||
}, [metadataCacheUri, data])
|
}, [appConfig.metadataCacheUri, data])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Table
|
<Table
|
||||||
|
Loading…
x
Reference in New Issue
Block a user