Individual settlement fund positioned smartcoin fixes

Enable borrowing new smartcoins into existence whilst there's an ongoing individual settlement fund position in existence.
BTS-CM · Feb 14, 2025 · bb150a8 · bb150a8
1 parent 39cb398
commit bb150a8
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 22 deletions.
diff --git a/src/components/Settlement.jsx b/src/components/Settlement.jsx
@@ -101,8 +101,8 @@ export default function Settlement(properties) {
     if (globalParams && globalParams.length) {
       const foundFee1 = globalParams.find((x) => x.id === 45);
       const foundFee2 = globalParams.find((x) => x.id === 17);
-      const finalFee1 = humanReadableFloat(foundFee1[1].fee, 5);
-      const finalFee2 = humanReadableFloat(foundFee2[1].fee, 5);
+      const finalFee1 = humanReadableFloat(foundFee1.data.fee, 5);
+      const finalFee2 = humanReadableFloat(foundFee2.data.fee, 5);
       setBidFee(finalFee1);
       setSettleFee(finalFee2);
     }

diff --git a/src/components/Smartcoin.jsx b/src/components/Smartcoin.jsx
@@ -343,23 +343,6 @@ export default function Smartcoin(properties) {
     }
   }, [parsedCollateralAsset, usrBalances]);
 
-  const currentFeedSettlementPrice = useMemo(() => {
-    if (finalBitasset && finalBitasset.current_feed && parsedCollateralAsset && parsedAsset) {
-      return parseFloat(
-        (
-          humanReadableFloat(
-            parseInt(finalBitasset.current_feed.settlement_price.quote.amount),
-            parsedCollateralAsset.p
-          ) /
-          humanReadableFloat(
-            parseInt(finalBitasset.current_feed.settlement_price.base.amount),
-            parsedAsset.p
-          )
-        ).toFixed(parsedCollateralAsset.p)
-      );
-    }
-  }, [finalBitasset, parsedAsset, parsedCollateralAsset]);
-
   const settlementFund = useMemo(() => {
     if (finalAsset && parsedAsset && parsedCollateralAsset) {
       const finalSettlementFund = humanReadableFloat(
@@ -399,6 +382,48 @@ export default function Smartcoin(properties) {
     }
   }, [finalBitasset, parsedAsset, parsedCollateralAsset]);
 
+  const currentFeedSettlementPrice = useMemo(() => {
+    if (finalBitasset && finalBitasset.current_feed && parsedCollateralAsset && parsedAsset) {
+      return parseFloat(
+        (
+          humanReadableFloat(
+            parseInt(
+              individualSettlementFund && individualSettlementFund._debt
+                ? finalBitasset.median_feed.settlement_price.quote.amount
+                : finalBitasset.current_feed.settlement_price.quote.amount
+            ),
+            parsedCollateralAsset.p
+          ) /
+          humanReadableFloat(
+            parseInt(
+              individualSettlementFund && individualSettlementFund._debt
+                ? finalBitasset.median_feed.settlement_price.base.amount
+                : finalBitasset.current_feed.settlement_price.base.amount
+            ),
+            parsedAsset.p
+          )
+        ).toFixed(parsedCollateralAsset.p)
+      );
+    }
+  }, [finalBitasset, parsedAsset, parsedCollateralAsset, individualSettlementFund]);
+
+  const individualSettlementPrice = useMemo(() => {
+    if (finalBitasset && finalBitasset.current_feed && parsedCollateralAsset && parsedAsset) {
+      return parseFloat(
+        (
+          humanReadableFloat(
+            parseInt(finalBitasset.current_feed.settlement_price.quote.amount),
+            parsedCollateralAsset.p
+          ) /
+          humanReadableFloat(
+            parseInt(finalBitasset.current_feed.settlement_price.base.amount),
+            parsedAsset.p
+          )
+        ).toFixed(parsedCollateralAsset.p)
+      );
+    }
+  }, [finalBitasset, parsedAsset, parsedCollateralAsset]);
+
   const parsedAssetFlags = useMemo(() => {
     if (finalAsset) {
       const obj = getFlagBooleans(finalAsset.options.flags);
@@ -2555,15 +2580,15 @@ export default function Smartcoin(properties) {
                       {t("Smartcoin:feedPrice")}
                       <br />
                       <span className="text-sm">
-                        {currentFeedSettlementPrice.toFixed(parsedAsset.p)}
+                        {individualSettlementPrice.toFixed(parsedAsset.p)}
                       </span>
                     </div>
                     <div className="col-span-1">
                       {t("Smartcoin:fundingRatio")}
                       <br />
                       <span className="text-sm">
                         {(
-                          ((individualSettlementFund._debt * currentFeedSettlementPrice) /
+                          ((individualSettlementFund._debt * individualSettlementPrice) /
                             individualSettlementFund._fund) *
                           100
                         ).toFixed(2)}
@@ -2572,7 +2597,7 @@ export default function Smartcoin(properties) {
                           {"-"}
                           {(
                             100 -
-                            ((individualSettlementFund._debt * currentFeedSettlementPrice) /
+                            ((individualSettlementFund._debt * individualSettlementPrice) /
                               individualSettlementFund._fund) *
                               100
                           ).toFixed(2)}