From 857c6ccdaab2a869ac9e0b47cf805074b7036aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Brzezin=CC=81ski?= <a.brzezinski94@gmail.com>
Date: Sat, 14 Dec 2024 13:01:50 +0400
Subject: [PATCH] fix mango account selector loading

---
 components/TreasuryAccount/MangoModal.tsx | 38 ++++++++++++++---------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/components/TreasuryAccount/MangoModal.tsx b/components/TreasuryAccount/MangoModal.tsx
index fec0b5f44..f17504d62 100644
--- a/components/TreasuryAccount/MangoModal.tsx
+++ b/components/TreasuryAccount/MangoModal.tsx
@@ -168,13 +168,17 @@ const MangoModal = ({ account }: { account: AssetAccount }) => {
 
   useEffect(() => {
     const getMangoAccounts = async () => {
-      const accounts = await mangoClient?.getMangoAccountsForOwner(
-        mangoGroup!,
-        account.extensions.token!.account.owner!
-      )
+      try {
+        const accounts = await mangoClient?.getMangoAccountsForOwner(
+          mangoGroup!,
+          account.extensions.token!.account.owner!
+        )
 
-      if (accounts) {
-        setMangoAccounts(accounts)
+        if (accounts) {
+          setMangoAccounts(accounts)
+        }
+      } catch (e) {
+        console.log(e)
       }
     }
     if (mangoClient && mangoGroup) {
@@ -741,17 +745,21 @@ const MangoAccountItem = ({
   account: MangoAccount | null
   group: Group | null
 }) => {
-  return account && group ? (
-    <div>
-      <div>Name: {account.name}</div>
-      <div>{account.publicKey.toBase58()}</div>
+  try {
+    return account && group ? (
       <div>
-        Account Value: ${toUiDecimals(account.getAssetsValue(group), 6)}
+        <div>Name: {account.name}</div>
+        <div>{account.publicKey.toBase58()}</div>
+        <div>
+          Account Value: ${toUiDecimals(account.getAssetsValue(group), 6)}
+        </div>
       </div>
-    </div>
-  ) : (
-    <div>Create new account</div>
-  )
+    ) : (
+      <div>Create new account</div>
+    )
+  } catch (e) {
+    return null
+  }
 }
 
 const getNextAccountNumber = (accounts: MangoAccount[]): number => {