retain lev stake accounts and use for calculating next account num (#448

)
blockworks-foundation · Oct 1, 2024 · 8fef0d2 · 8fef0d2
1 parent 50969d6
commit 8fef0d2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/components/account/CreateAccountForm.tsx b/components/account/CreateAccountForm.tsx
@@ -66,7 +66,10 @@ const CreateAccountForm = ({
   const handleNewAccount = useCallback(async () => {
     const client = mangoStore.getState().client
     const group = mangoStore.getState().group
-    const existingMangoAccts = mangoStore.getState().mangoAccounts
+    const existingMangoAccts = [
+      ...mangoStore.getState().mangoAccounts,
+      ...mangoStore.getState().mangoAccountsLevStake,
+    ]
     const set = mangoStore.getState().set
     const connection = mangoStore.getState().connection
 

diff --git a/store/mangoStore.ts b/store/mangoStore.ts
@@ -235,6 +235,7 @@ export type MangoStore = {
     }
   }
   mangoAccounts: MangoAccount[]
+  mangoAccountsLevStake: MangoAccount[]
   markets: Serum3Market[] | undefined
   transactionNotificationIdCounter: number
   transactionNotifications: Array<TransactionNotification>
@@ -416,6 +417,7 @@ const mangoStore = create<MangoStore>()(
         tradeHistory: { data: [], loading: true },
       },
       mangoAccounts: [],
+      mangoAccountsLevStake: [],
       markets: undefined,
       transactionNotificationIdCounter: 0,
       transactionNotifications: [],
@@ -683,12 +685,17 @@ const mangoStore = create<MangoStore>()(
               client.getMangoAccountsForDelegate(group, ownerPk),
             ])
 
-            const mangoAccounts = [
+            const allMangoAccounts = [
               ...ownerMangoAccounts,
               ...delegateAccounts,
-            ].filter(
+            ]
+
+            const mangoAccounts = allMangoAccounts.filter(
               (acc) => hasLevCloseInUrl || !acc.name.includes('Leverage Stake'),
             )
+            const mangoAccountsLevStake = allMangoAccounts.filter(
+              (acc) => !hasLevCloseInUrl && acc.name.includes('Leverage Stake'),
+            )
             const selectedAccountIsNotInAccountsList = mangoAccounts.find(
               (x) =>
                 x.publicKey.toBase58() ===
@@ -734,6 +741,7 @@ const mangoStore = create<MangoStore>()(
 
             set((state) => {
               state.mangoAccounts = mangoAccounts
+              state.mangoAccountsLevStake = mangoAccountsLevStake
             })
           } catch (e) {
             console.error('Error fetching mango accts', e)