fix: balance & prettier

near · Jan 5, 2025 · 04c4c97 · 04c4c97
1 parent c480c04
commit 04c4c97
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/src/components/wallet-utilities/SendNear.tsx b/src/components/wallet-utilities/SendNear.tsx
@@ -6,21 +6,13 @@ import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
 
 import { NearContext } from '../wallet-selector/WalletSelector';
+import { NEAR_NOMINATION } from 'near-api-js/lib/utils/format';
 
 type FormData = {
   sendNearAmount: number;
   sendToAccountId: string;
 };
 
-function displayBalance(balance: number) {
-  if (balance < 1) {
-    const display = (balance * 100000).toFixed(5);
-    if (balance && parseFloat(display) === 0) return '< 0.00001';
-    return display;
-  }
-  return balance.toFixed(5);
-}
-
 export const SendNear = () => {
   const form = useForm<FormData>();
   const { wallet, signedAccountId } = useContext(NearContext);
@@ -31,7 +23,10 @@ export const SendNear = () => {
 
     const loadBalance = async () => {
       try {
-        const balance = await wallet.getBalance(signedAccountId);
+        const balanceYocto = await wallet.getBalance(signedAccountId);
+        const balance = parseFloat((BigInt(balanceYocto) / NEAR_NOMINATION).toString());
+
+        console.log('balance', balanceYocto, balance);
         const requiredGas = 0.00005;
         const availableBalance = balance - requiredGas;
         setCurrentNearAmount(Math.max(availableBalance, 0));
@@ -105,7 +100,7 @@ export const SendNear = () => {
             allowNegative: false,
             allowDecimal: true,
           }}
-          assistive={`${displayBalance(currentNearAmount)} available`}
+          assistive={`${currentNearAmount.toFixed(5)} available`}
           error={form.formState.errors.sendNearAmount?.message}
           {...form.register('sendNearAmount', {
             min: {

diff --git a/src/pages/privacy.tsx b/src/pages/privacy.tsx
@@ -4,20 +4,19 @@ import { useBosComponents } from '@/hooks/useBosComponents';
 import { useDefaultLayout } from '@/hooks/useLayout';
 import type { NextPageWithLayout } from '@/utils/types';
 
-
 const PrivacyPage: NextPageWithLayout = () => {
   const components = useBosComponents();
   return (
-      <ComponentWrapperPage
-        src={components.nearOrg.privacyPage}
-        meta={{ title: 'Privacy Policy', description: '' }}
-        componentProps={{
-          privacyDomainName,
-        }}
-      />
-    );
-  };
+    <ComponentWrapperPage
+      src={components.nearOrg.privacyPage}
+      meta={{ title: 'Privacy Policy', description: '' }}
+      componentProps={{
+        privacyDomainName,
+      }}
+    />
+  );
+};
 
-  PrivacyPage.getLayout = useDefaultLayout;
+PrivacyPage.getLayout = useDefaultLayout;
 
-  export default PrivacyPage
+export default PrivacyPage;