oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00
Code Releases Activity

Subgraph updates (#1007)

Browse Source 
* subgraph updates

* swap title fixes
This commit is contained in:
Matthias Kretschmann 2022-01-18 20:29:28 +00:00 committed by GitHub
parent 6689f55808
commit 2622a807f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/components/@shared/PoolTransactions/Title.tsx
View File

@ -10,22 +10,27 @@ function getTitle(row: PoolTransaction, locale: string) {
switch (row.type) { switch (row.type) {
case 'SWAP': { case 'SWAP': {
const { datatoken, baseToken } = row const { datatoken, baseToken, datatokenValue, baseTokenValue } = row
const outToken = const outToken =
(datatoken.value < 0 && datatoken.value) || (datatokenValue < 0 && datatoken) || (baseTokenValue < 0 && baseToken)
(baseToken.value < 0 && baseToken.value) const outTokenValue =
const outTokenSymbol = outToken?.token.symbol (datatokenValue < 0 && datatokenValue) ||
(baseTokenValue < 0 && baseTokenValue)
const outTokenSymbol = outToken?.symbol
const inToken = const inToken =
(datatoken.value > 0 && datatoken.value) || (datatokenValue > 0 && datatoken) || (baseTokenValue > 0 && baseToken)
(baseToken.value > 0 && baseToken.value) const inTokenValue =
const inTokenSymbol = inToken?.token.symbol (datatokenValue > 0 && datatokenValue) ||
(baseTokenValue > 0 && baseTokenValue)
const inTokenSymbol = inToken?.symbol
title += `Swap ${formatPrice( title += `Swap ${formatPrice(
Math.abs(inToken?.value).toString(), Math.abs(inTokenValue).toString(),
locale locale
)}${inTokenSymbol} for ${formatPrice( )}${inTokenSymbol} for ${formatPrice(
Math.abs(outToken?.value).toString(), Math.abs(outTokenValue).toString(),
locale locale
)}${outTokenSymbol}` )}${outTokenSymbol}`
@ -33,25 +38,27 @@ function getTitle(row: PoolTransaction, locale: string) {
} }
case 'SETUP': { case 'SETUP': {
const firstToken = row.baseToken const firstToken = row.baseToken
const firstTokenSymbol = firstToken?.token.symbol const firstTokenSymbol = firstToken?.symbol
const secondToken = row.datatoken const secondToken = row.datatoken
const secondTokenSymbol = secondToken?.token.symbol const secondTokenSymbol = secondToken?.symbol
title += `Create pool with ${formatPrice( title += `Create pool with ${formatPrice(
Math.abs(firstToken?.value).toString(), Math.abs(row.baseTokenValue).toString(),
locale locale
)}${firstTokenSymbol} and ${formatPrice( )}${firstTokenSymbol} and ${formatPrice(
Math.abs(secondToken?.value).toString(), Math.abs(row.datatokenValue).toString(),
locale locale
)}${secondTokenSymbol}` )}${secondTokenSymbol}`
break break
} }
case 'JOIN': case 'JOIN':
case 'EXIT': { case 'EXIT': {
const tokenMoved = row.baseToken.value > 0 ? row.baseToken : row.datatoken const tokenMoved = row.baseTokenValue > 0 ? row.baseToken : row.datatoken
const tokenSymbol = tokenMoved.token.symbol const tokenValueMoved =
row.baseTokenValue > 0 ? row.baseTokenValue : row.datatokenValue
const tokenSymbol = tokenMoved.symbol
title += `${row.type === 'JOIN' ? 'Add' : 'Remove'} ${formatPrice( title += `${row.type === 'JOIN' ? 'Add' : 'Remove'} ${formatPrice(
Math.abs(tokenMoved.value).toString(), Math.abs(tokenValueMoved).toString(),
locale locale
)}${tokenSymbol}` )}${tokenSymbol}`

20
src/components/@shared/PoolTransactions/index.tsx
View File

@ -27,21 +27,13 @@ const txHistoryQueryByPool = gql`
first: 1000 first: 1000
) { ) {
baseToken { baseToken {
id
value
token {
symbol symbol
address address
} }
}
datatoken { datatoken {
id
value
token {
symbol symbol
address address
} }
}
type type
tx tx
timestamp timestamp
@ -60,21 +52,15 @@ const txHistoryQuery = gql`
first: 1000 first: 1000
) { ) {
baseToken { baseToken {
id
value
token {
symbol symbol
address address
} }
} baseTokenValue
datatoken { datatoken {
id
value
token {
symbol symbol
address address
} }
} datatokenValue
type type
tx tx
timestamp timestamp
@ -180,7 +166,7 @@ export default function PoolTransactions({
const didList: string[] = [] const didList: string[] = []
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
const { address } = data[i].datatoken.token const { address } = data[i].datatoken
const did = web3.utils const did = web3.utils
.toChecksumAddress(address) .toChecksumAddress(address)
.replace('0x', 'did:op:') .replace('0x', 'did:op:')