From 74c138757727eed647d37ac1ee4aed4155e80f16 Mon Sep 17 00:00:00 2001
From: saml33 <slam.uke@gmail.com>
Date: Mon, 11 Sep 2023 10:15:01 +1000
Subject: [PATCH] fix close serum oo function

---
 components/settings/AccountSettings.tsx | 45 +++++++++++++++----------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/components/settings/AccountSettings.tsx b/components/settings/AccountSettings.tsx
index fdd8e54d..df26fee0 100644
--- a/components/settings/AccountSettings.tsx
+++ b/components/settings/AccountSettings.tsx
@@ -12,7 +12,7 @@ import { useTranslation } from 'next-i18next'
 import { useCallback, useState } from 'react'
 import { MAX_ACCOUNTS } from 'utils/constants'
 import mangoStore from '@store/mangoStore'
-import { PublicKey, TransactionInstruction } from '@solana/web3.js'
+import { TransactionInstruction } from '@solana/web3.js'
 import { notify } from 'utils/notifications'
 import { isMangoError } from 'types'
 
@@ -62,25 +62,34 @@ const AccountSettings = () => {
         if (closeType == CLOSE_TYPE.TOKEN) {
           // No instruction yet
         } else if (closeType === CLOSE_TYPE.PERP) {
-          ixs = await Promise.all(
-            emptyPerps.map((p) =>
-              client.perpDeactivatePositionIx(
-                group,
-                mangoAccount,
-                p.marketIndex,
+          try {
+            ixs = await Promise.all(
+              emptyPerps.map((p) =>
+                client.perpDeactivatePositionIx(
+                  group,
+                  mangoAccount,
+                  p.marketIndex,
+                ),
               ),
-            ),
-          )
+            )
+          } catch (e) {
+            console.log('error closing unused perp positions', e)
+          }
         } else if (closeType === CLOSE_TYPE.SERUMOO) {
-          ixs = await Promise.all(
-            emptySerum3.map((s) =>
-              client.serum3CloseOpenOrdersIx(
-                group,
-                mangoAccount,
-                new PublicKey(s),
-              ),
-            ),
-          )
+          try {
+            ixs = await Promise.all(
+              emptySerum3.map((s) => {
+                const market = group.getSerum3MarketByMarketIndex(s.marketIndex)
+                return client.serum3CloseOpenOrdersIx(
+                  group,
+                  mangoAccount,
+                  market.serumMarketExternal,
+                )
+              }),
+            )
+          } catch (e) {
+            console.log('error closing unused serum open orders', e)
+          }
         } else if (closeType === CLOSE_TYPE.PERPOO) {
           // No instruction yet
         }