oceanprotocol/market
1
0
Fork 0
mirror of https://github.com/oceanprotocol/market.git synced 2024-06-30 22:01:44 +02:00
Code Releases Activity

refactor to use less hardcoded OCEAN

Browse Source 
* ref #468
This commit is contained in:
Matthias Kretschmann 2022-01-24 14:35:59 +00:00
parent 4dc188d3e4
commit a541cbcee0
Signed by: m
GPG Key ID: 606EEEF3C479A91F
5 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Asset/AssetActions/Pool/Add/Output.tsx
View File

@ -11,14 +11,14 @@ export default function Output({
newPoolTokens, newPoolTokens,
newPoolShare, newPoolShare,
swapFee, swapFee,
dtSymbol, datatokenSymbol,
totalPoolTokens, totalPoolTokens,
totalBalance totalBalance
}: { }: {
newPoolTokens: string newPoolTokens: string
newPoolShare: string newPoolShare: string
swapFee: string swapFee: string
dtSymbol: string datatokenSymbol: string
totalPoolTokens: string totalPoolTokens: string
totalBalance: PoolBalance totalBalance: PoolBalance
}): ReactElement { }): ReactElement {
@ -63,7 +63,7 @@ export default function Output({
<div> <div>
<p>{titleOut}</p> <p>{titleOut}</p>
<Token symbol="OCEAN" balance={poolOcean} /> <Token symbol="OCEAN" balance={poolOcean} />
<Token symbol={dtSymbol} balance={poolDatatoken} /> <Token symbol={datatokenSymbol} balance={poolDatatoken} />
</div> </div>
</div> </div>
</> </>

6
src/components/Asset/AssetActions/Pool/Add/index.tsx
View File

@ -30,7 +30,7 @@ export default function Add({
totalPoolTokens, totalPoolTokens,
totalBalance, totalBalance,
swapFee, swapFee,
dtSymbol, datatokenSymbol,
baseTokenSymbol, baseTokenSymbol,
fetchAllData fetchAllData
}: { }: {
@ -39,7 +39,7 @@ export default function Add({
totalPoolTokens: string totalPoolTokens: string
totalBalance: PoolBalance totalBalance: PoolBalance
swapFee: string swapFee: string
dtSymbol: string datatokenSymbol: string
baseTokenSymbol: string baseTokenSymbol: string
fetchAllData: () => void fetchAllData: () => void
}): ReactElement { }): ReactElement {
@ -164,7 +164,7 @@ export default function Add({
newPoolTokens={newPoolTokens} newPoolTokens={newPoolTokens}
newPoolShare={newPoolShare} newPoolShare={newPoolShare}
swapFee={swapFee} swapFee={swapFee}
dtSymbol={dtSymbol} datatokenSymbol={datatokenSymbol}
totalPoolTokens={totalPoolTokens} totalPoolTokens={totalPoolTokens}
totalBalance={totalBalance} totalBalance={totalBalance}
/> />

6
src/components/Asset/AssetActions/Pool/Remove.tsx
View File

@ -28,14 +28,14 @@ export default function Remove({
poolAddress, poolAddress,
poolTokens, poolTokens,
totalPoolTokens, totalPoolTokens,
dtSymbol, datatokenSymbol,
fetchAllData fetchAllData
}: { }: {
setShowRemove: (show: boolean) => void setShowRemove: (show: boolean) => void
poolAddress: string poolAddress: string
poolTokens: string poolTokens: string
totalPoolTokens: string totalPoolTokens: string
dtSymbol: string datatokenSymbol: string
fetchAllData: () => void fetchAllData: () => void
}): ReactElement { }): ReactElement {
const slippagePresets = ['5', '10', '15', '25', '50'] const slippagePresets = ['5', '10', '15', '25', '50']
@ -245,7 +245,7 @@ export default function Remove({
{isAdvanced === true ? ( {isAdvanced === true ? (
<> <>
<Token symbol="OCEAN" balance={minOceanAmount} /> <Token symbol="OCEAN" balance={minOceanAmount} />
<Token symbol={dtSymbol} balance={minDatatokenAmount} /> <Token symbol={datatokenSymbol} balance={minDatatokenAmount} />
</> </>
) : ( ) : (
<Token symbol="OCEAN" balance={minOceanAmount} /> <Token symbol="OCEAN" balance={minOceanAmount} />

21
src/components/Asset/AssetActions/Pool/TokenList.tsx
View File

@ -7,10 +7,10 @@ import Decimal from 'decimal.js'
export default function TokenList({ export default function TokenList({
title, title,
children, children,
ocean, baseTokenValue,
oceanSymbol, baseTokenSymbol,
dt, datatokenValue,
dtSymbol, datatokenSymbol,
poolShares, poolShares,
conversion, conversion,
highlight, highlight,
@ -18,10 +18,10 @@ export default function TokenList({
}: { }: {
title: string | ReactNode title: string | ReactNode
children: ReactNode children: ReactNode
ocean: string baseTokenValue: string
oceanSymbol: string baseTokenSymbol: string
dt: string datatokenValue: string
dtSymbol: string datatokenSymbol: string
poolShares: string poolShares: string
conversion: Decimal conversion: Decimal
highlight?: boolean highlight?: boolean
@ -32,8 +32,8 @@ export default function TokenList({
<h3 className={styles.title}>{title}</h3> <h3 className={styles.title}>{title}</h3>
<div className={styles.tokens}> <div className={styles.tokens}>
<div> <div>
<Token symbol={oceanSymbol} balance={ocean} /> <Token symbol={baseTokenSymbol} balance={baseTokenValue} />
<Token symbol={dtSymbol} balance={dt} /> <Token symbol={datatokenSymbol} balance={datatokenValue} />
{conversion.greaterThan(0) && ( {conversion.greaterThan(0) && (
<Conversion <Conversion
price={conversion.toString()} price={conversion.toString()}
@ -45,7 +45,6 @@ export default function TokenList({
<div> <div>
<Token symbol="pool shares" balance={poolShares} noIcon /> <Token symbol="pool shares" balance={poolShares} noIcon />
{children} {children}
</div> </div>
</div> </div>

44
src/components/Asset/AssetActions/Pool/index.tsx
View File

@ -29,9 +29,9 @@ function getWeight(weight: string) {
interface PoolInfo { interface PoolInfo {
poolFee: string poolFee: string
weightOcean: string weightBaseToken: string
weightDt: string weightDt: string
dtSymbol: string datatokenSymbol: string
baseTokenSymbol: string baseTokenSymbol: string
totalPoolTokens: string totalPoolTokens: string
totalLiquidityInOcean: Decimal totalLiquidityInOcean: Decimal
@ -158,9 +158,9 @@ export default function Pool(): ReactElement {
const newPoolInfo = { const newPoolInfo = {
poolFee, poolFee,
weightOcean: getWeight(poolData.baseTokenWeight), weightBaseToken: getWeight(poolData.baseTokenWeight),
weightDt: getWeight(poolData.datatokenWeight), weightDt: getWeight(poolData.datatokenWeight),
dtSymbol: poolData.datatoken.symbol, datatokenSymbol: poolData.datatoken.symbol,
baseTokenSymbol: poolData.baseToken.symbol, baseTokenSymbol: poolData.baseToken.symbol,
totalPoolTokens: poolData.totalShares, totalPoolTokens: poolData.totalShares,
totalLiquidityInOcean totalLiquidityInOcean
@ -342,7 +342,7 @@ export default function Pool(): ReactElement {
datatoken: new Decimal(price?.datatoken).toString() datatoken: new Decimal(price?.datatoken).toString()
}} }}
swapFee={poolInfo?.poolFee} swapFee={poolInfo?.poolFee}
dtSymbol={poolInfo?.dtSymbol} datatokenSymbol={poolInfo?.datatokenSymbol}
baseTokenSymbol={poolInfo?.baseTokenSymbol} baseTokenSymbol={poolInfo?.baseTokenSymbol}
fetchAllData={fetchAllData} fetchAllData={fetchAllData}
/> />
@ -350,15 +350,15 @@ export default function Pool(): ReactElement {
<Remove <Remove
setShowRemove={setShowRemove} setShowRemove={setShowRemove}
poolAddress={price?.address} poolAddress={price?.address}
poolTokens={poolInfoUser.poolShares} poolTokens={poolInfoUser?.poolShares}
totalPoolTokens={poolInfo?.totalPoolTokens} totalPoolTokens={poolInfo?.totalPoolTokens}
dtSymbol={poolInfo?.dtSymbol} datatokenSymbol={poolInfo?.datatokenSymbol}
fetchAllData={fetchAllData} fetchAllData={fetchAllData}
/> />
) : ( ) : (
<> <>
<div className={styles.dataToken}> <div className={styles.dataToken}>
<PriceUnit price="1" symbol={poolInfo?.dtSymbol} /> ={' '} <PriceUnit price="1" symbol={poolInfo?.datatokenSymbol} /> ={' '}
<PriceUnit <PriceUnit
price={`${price?.value}`} price={`${price?.value}`}
symbol={poolInfo?.baseTokenSymbol} symbol={poolInfo?.baseTokenSymbol}
@ -396,10 +396,10 @@ export default function Pool(): ReactElement {
/> />
</> </>
} }
ocean={`${poolInfoUser?.liquidity?.ocean}`} baseTokenValue={`${poolInfoUser?.liquidity?.ocean}`}
oceanSymbol={poolInfo?.baseTokenSymbol} baseTokenSymbol={poolInfo?.baseTokenSymbol}
dt={`${poolInfoUser?.liquidity?.datatoken}`} datatokenValue={`${poolInfoUser?.liquidity?.datatoken}`}
dtSymbol={poolInfo?.dtSymbol} datatokenSymbol={poolInfo?.datatokenSymbol}
poolShares={poolInfoUser?.poolShares} poolShares={poolInfoUser?.poolShares}
conversion={poolInfoUser?.totalLiquidityInOcean} conversion={poolInfoUser?.totalLiquidityInOcean}
highlight highlight
@ -413,10 +413,10 @@ export default function Pool(): ReactElement {
<TokenList <TokenList
title="Pool Creator Statistics" title="Pool Creator Statistics"
ocean={`${poolInfoOwner?.liquidity?.ocean}`} baseTokenValue={`${poolInfoOwner?.liquidity?.ocean}`}
oceanSymbol={poolInfo?.baseTokenSymbol} baseTokenSymbol={poolInfo?.baseTokenSymbol}
dt={`${poolInfoOwner?.liquidity?.datatoken}`} datatokenValue={`${poolInfoOwner?.liquidity?.datatoken}`}
dtSymbol={poolInfo?.dtSymbol} datatokenSymbol={poolInfo?.datatokenSymbol}
poolShares={poolInfoOwner?.poolShares} poolShares={poolInfoOwner?.poolShares}
conversion={poolInfoOwner?.totalLiquidityInOcean} conversion={poolInfoOwner?.totalLiquidityInOcean}
> >
@ -434,18 +434,18 @@ export default function Pool(): ReactElement {
{poolInfo?.weightDt && ( {poolInfo?.weightDt && (
<span <span
className={styles.titleInfo} className={styles.titleInfo}
title={`Weight of ${poolInfo?.weightOcean}% OCEAN & ${poolInfo?.weightDt}% ${poolInfo?.dtSymbol}`} title={`Weight of ${poolInfo?.weightBaseToken}% ${poolInfo?.baseTokenSymbol} & ${poolInfo?.weightDt}% ${poolInfo?.datatokenSymbol}`}
> >
{poolInfo?.weightOcean}/{poolInfo?.weightDt} {poolInfo?.weightBaseToken}/{poolInfo?.weightDt}
</span> </span>
)} )}
<Graph /> <Graph />
</> </>
} }
ocean={`${price?.ocean}`} baseTokenValue={`${price?.ocean}`}
oceanSymbol={poolInfo?.baseTokenSymbol} baseTokenSymbol={poolInfo?.baseTokenSymbol}
dt={`${price?.datatoken}`} datatokenValue={`${price?.datatoken}`}
dtSymbol={poolInfo?.dtSymbol} datatokenSymbol={poolInfo?.datatokenSymbol}
poolShares={poolInfo?.totalPoolTokens} poolShares={poolInfo?.totalPoolTokens}
conversion={poolInfo?.totalLiquidityInOcean} conversion={poolInfo?.totalLiquidityInOcean}
showTVLLabel showTVLLabel