chore: factor dust checking logic

mrgnlabs · Nov 18, 2023 · 75f9223 · 75f9223
1 parent 08bc03d
commit 75f9223
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/apps/marginfi-v2-ui/src/components/desktop/AssetsList/AssetRow/AssetRow.tsx b/apps/marginfi-v2-ui/src/components/desktop/AssetsList/AssetRow/AssetRow.tsx
@@ -90,7 +90,7 @@ const AssetRow: FC<{
         return bank.userInfo.maxRepay;
     }
   }, [bank, currentAction]);
-  const isDust = bank.isActive && uiToNative(bank.position.amount, bank.info.state.mintDecimals).isZero();
+  const isDust = bank.isActive && bank.position.isDust;
   const showCloseBalance = currentAction === ActionType.Withdraw && isDust; // Only case we should show close balance is when we are withdrawing a dust balance, since user receives 0 tokens back (vs repaying a dust balance where the input box will show the smallest unit of the token)
   const isActionDisabled = maxAmount === 0 && !showCloseBalance;
 

diff --git a/apps/marginfi-v2-ui/src/components/desktop/UserPositions/UserPositionRow/UserPositionRow.tsx b/apps/marginfi-v2-ui/src/components/desktop/UserPositions/UserPositionRow/UserPositionRow.tsx
@@ -25,7 +25,7 @@ const UserPositionRow: FC<UserPositionRowProps> = ({ activeBankInfo, marginfiAcc
   const maxAmount = activeBankInfo.position.isLending
     ? activeBankInfo.userInfo.maxWithdraw
     : activeBankInfo.userInfo.maxRepay;
-  const isDust = uiToNative(activeBankInfo.position.amount, activeBankInfo.info.state.mintDecimals).isZero();
+  const isDust = activeBankInfo.position.isDust;
   const showCloseBalance = activeBankInfo.position.isLending && isDust;
   const isActionDisabled = maxAmount === 0 && !showCloseBalance;
 

diff --git a/packages/marginfi-v2-ui-state/src/lib/mrgnlend.ts b/packages/marginfi-v2-ui-state/src/lib/mrgnlend.ts
@@ -321,13 +321,20 @@ function makeLendingPosition(
   const usdValues = balance.computeUsdValue(bank, oraclePrice, MarginRequirementType.Equity);
   const weightedUSDValues = balance.getUsdValueWithPriceBias(bank, oraclePrice, MarginRequirementType.Maintenance);
   const isLending = usdValues.liabilities.isZero();
+
+  const amount = isLending
+  ? nativeToUi(amounts.assets.toNumber(), bankInfo.mintDecimals)
+  : nativeToUi(amounts.liabilities.toNumber(), bankInfo.mintDecimals);
+  const isDust = uiToNative(amount, bankInfo.mintDecimals).isZero();
+  const weightedUSDValue = isLending ? weightedUSDValues.assets.toNumber() : weightedUSDValues.liabilities.toNumber();
+  const usdValue = isLending ? usdValues.assets.toNumber() : usdValues.liabilities.toNumber();
+
   return {
-    amount: isLending
-      ? nativeToUi(amounts.assets.toNumber(), bankInfo.mintDecimals)
-      : nativeToUi(amounts.liabilities.toNumber(), bankInfo.mintDecimals),
-    usdValue: isLending ? usdValues.assets.toNumber() : usdValues.liabilities.toNumber(),
-    weightedUSDValue: isLending ? weightedUSDValues.assets.toNumber() : weightedUSDValues.liabilities.toNumber(),
+    amount,
+    usdValue,
+    weightedUSDValue,
     isLending,
+    isDust,
   };
 }
 
@@ -484,6 +491,7 @@ interface LendingPosition {
   amount: number;
   usdValue: number;
   weightedUSDValue: number;
+  isDust: boolean;
 }
 
 interface BankInfo {