From 36b3b62a953b2b6ee3b9938e5701aafd816f37a9 Mon Sep 17 00:00:00 2001
From: Tyler Shipe <tjshipe@gmail.com>
Date: Mon, 26 Apr 2021 01:47:45 -0400
Subject: [PATCH] refresh selected margin account

---
 stores/useMangoStore.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/stores/useMangoStore.tsx b/stores/useMangoStore.tsx
index 7c07ef0..ec220a7 100644
--- a/stores/useMangoStore.tsx
+++ b/stores/useMangoStore.tsx
@@ -247,7 +247,16 @@ const useMangoStore = create<MangoStore>((set, get) => ({
           if (marginAccounts.length > 0) {
             set((state) => {
               state.marginAccounts = marginAccounts
-              state.selectedMarginAccount.current = marginAccounts[0]
+              if (state.selectedMarginAccount.current) {
+                state.selectedMarginAccount.current = marginAccounts.find(
+                  (ma) =>
+                    ma.publicKey.equals(
+                      state.selectedMarginAccount.current.publicKey
+                    )
+                )
+              } else {
+                state.selectedMarginAccount.current = marginAccounts[0]
+              }
             })
           }
         })