fixes of representation for bond prices

Signed-off-by: Uncle Fatso <uncle.fatso@ghostchain.io>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ghost-dao-interface",
   "private": true,
-  "version": "0.0.26",
+  "version": "0.0.27",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/containers/Bond/BondModal.jsx

@@ -113,21 +113,14 @@ export const BondModal = ({ bond, chainId, address, connect }) => {
                                 "--"
                             ) : (
                                 <BondPrice
-                                    price={bond.price.inBaseToken}
+                                    price={bond.price.inUsd}
-                                    symbol={bond.quoteToken.name}
                                 />
                             )
                         }
                         />
                     <Metric
                         label="Market Price"
-                        metric={
+                        metric={<TokenPrice priceInUsd={bond.price.marketPriceInUsd} />}
-                            <TokenPrice
-                                token={bond.baseToken}
-                                symbol={bond.quoteToken.name}
-                                priceInUsd={bond.price.marketPriceInUsd}
-                            />
-                        }
                     />
                     <Metric
                         label="Discount"
@@ -152,13 +145,9 @@ export const BondModal = ({ bond, chainId, address, connect }) => {
     );
 };
 
-const TokenPrice = ({
+const TokenPrice = ({ priceInUsd }) => {
-    token,
-    symbol,
-    priceInUsd
-}) => {
     return priceInUsd ? (
-        <>{formatCurrency(priceInUsd, 2, symbol)}</>
+        <>{formatCurrency(priceInUsd, 2)}</>
     ) : (
         <Skeleton width={60} />
     );

src/containers/Bond/components/BondList.jsx

@@ -95,10 +95,7 @@ const BondCard = ({ bond, secondsTo }) => {
                     {bond.isSoldOut ? (
                         "--"
                     ) : (
-                        <BondPrice
+                        <BondPrice price={bond.price.inUsd} />
-                            price={bond.price.inBaseToken}
-                            symbol={quoteTokenName}
-                        />
                     )}
                 </Typography>
             </Box>
@@ -191,10 +188,7 @@ const BondRow = ({ bond, secondsTo }) => {
                     {bond.isSoldOut ? (
                         "--"
                     ) : (
-                        <BondPrice
+                        <BondPrice price={bond.price.inUsd} />
-                            price={bond.price.inBaseToken}
-                            symbol={quoteTokenName}
-                        />
                     )}
                 </Typography>
             </TableCell>

src/containers/Bond/components/BondPrice.jsx

@@ -1,8 +1,8 @@
-const BondPrice = ({ price, symbol }) => {
+import { formatCurrency } from "../../../helpers";
+
+const BondPrice = ({ price }) => {
     return (
-        <>
+        <>{formatCurrency(price, 2)}</>
-            {price.toString({ decimals: 2, format: true, trim: false })} {symbol}
-        </>
     );
 };
 

src/hooks/bonds/index.jsx

@@ -100,9 +100,9 @@ export const useLiveBonds = (chainId) => {
 
         const quoteTokenPerBaseToken = new DecimalBigNumber(marketPrice, 9);
         const priceInUsd = quoteTokenPerUsd.mul(quoteTokenPerBaseToken);
-        const discount = quoteTokenPerUsd._value > 0n
+        const discount = baseTokenPerUsd._value > 0n
-            ? quoteTokenPerUsd.sub(priceInUsd).div(quoteTokenPerUsd)
+            ? baseTokenPerUsd.sub(priceInUsd).div(baseTokenPerUsd)
-            : new DecimalBigNumber("0", quoteTokenDecimals);
+            : new DecimalBigNumber("0", baseTokenPerUsd._decimals);
 
         const capacityInBaseToken = capacityInQuote
             ? new DecimalBigNumber(marketPrice > 0n ? marketCapacity / marketPrice : 0n, 9)
@@ -143,7 +143,7 @@ export const useLiveBonds = (chainId) => {
             price: {
                 inUsd: priceInUsd,
                 inBaseToken: quoteTokenPerBaseToken,
-                marketPriceInUsd: quoteTokenPerUsd
+                marketPriceInUsd: baseTokenPerUsd
             },
             capacity: {
                 inBaseToken: capacityInBaseToken,