Set account properly, tidy up a bit

This commit is contained in:
Riordan Panayides 2021-11-09 15:58:29 +00:00 committed by Tyler Shipe
parent 02734eb1f5
commit eeb93c3afb
2 changed files with 9 additions and 9 deletions

View File

@ -1,4 +1,4 @@
import React, {
import {
FunctionComponent,
useCallback,
useEffect,
@ -43,7 +43,6 @@ const CloseAccountModal: FunctionComponent<CloseAccountModalProps> = ({
const mangoGroup = useMangoStore((s) => s.selectedMangoGroup.current)
const mangoAccount = useMangoStore((s) => s.selectedMangoAccount.current)
const mangoCache = useMangoStore((s) => s.selectedMangoGroup.cache)
//const mangoClient = useMangoStore((s) => s.connection.client)
const { openPositions, unsettledPositions } = usePerpPositions()
const [hasBorrows, setHasBorrows] = useState(false)
const [hasOpenPositions, setHasOpenPositions] = useState(false)
@ -53,8 +52,8 @@ const CloseAccountModal: FunctionComponent<CloseAccountModalProps> = ({
const client = useMangoStore((s) => s.connection.client)
const groupConfig = useMangoGroupConfig()
const openOrders = useOpenOrders()
const walletTokens = useMangoStore((s) => s.wallet.tokens)
const [, setSelectedAccount] = useState(walletTokens[0])
const setMangoStore = useMangoStore((s) => s.set)
const mangoAccounts = useMangoStore((s) => s.mangoAccounts)
const fetchTotalAccountSOL = useCallback(async () => {
if (!mangoAccount) {
@ -150,7 +149,9 @@ const CloseAccountModal: FunctionComponent<CloseAccountModalProps> = ({
console.log('fetchAllMangoAccounts')
actions.fetchAllMangoAccounts()
console.log('setSelectedAccount')
setSelectedAccount(walletTokens[0])
setMangoStore((state) => {
state.selectedMangoAccount.current = mangoAccounts[0]
})
console.log('reloadMangoAccount')
actions.reloadMangoAccount()
onClose()

View File

@ -1284,10 +1284,9 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@blockworks-foundation/mango-client@^3.2.25":
version "3.2.25"
resolved "https://registry.yarnpkg.com/@blockworks-foundation/mango-client/-/mango-client-3.2.25.tgz#b3ce06a17ef2864bb0d8df75c9a4108d36ec2e3e"
integrity sha512-+iFMHcvoI+mCpwkABIUp2adOoa7EoIe7jBYpxtCT7q7mHRnuC2IyAqHfFT2FKeXvZyb93ljc4ZgAOWioPNGHPA==
"@blockworks-foundation/mango-client@git+https://github.com/blockworks-foundation/mango-client-v3.git#pan/delete-account":
version "3.2.0"
resolved "git+https://github.com/blockworks-foundation/mango-client-v3.git#9ddb40b5fb5c4326f908bc94ab72b17222d38c45"
dependencies:
"@project-serum/anchor" "^0.16.2"
"@project-serum/serum" "0.13.55"