From 7f6352d4183637ea8458d087180e2cd4b40655e9 Mon Sep 17 00:00:00 2001 From: tjs Date: Tue, 14 Feb 2023 22:52:55 -0500 Subject: [PATCH 1/2] use latest client --- yarn.lock | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 9688dda4..d4135ab6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -612,6 +612,16 @@ "@solana/wallet-adapter-base" "^0.9.17" js-base64 "^3.7.2" +"@solana/buffer-layout-utils@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@solana/buffer-layout-utils/-/buffer-layout-utils-0.2.0.tgz#b45a6cab3293a2eb7597cceb474f229889d875ca" + integrity sha512-szG4sxgJGktbuZYDg2FfNmkMi0DYQoVjN2h7ta1W1hPrwzarcFLBq9UpX1UjNXsNpT9dn+chgprtWGioUAr4/g== + dependencies: + "@solana/buffer-layout" "^4.0.0" + "@solana/web3.js" "^1.32.0" + bigint-buffer "^1.1.5" + bignumber.js "^9.0.1" + "@solana/buffer-layout@^4.0.0": version "4.0.1" resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-4.0.1.tgz#b996235eaec15b1e0b5092a8ed6028df77fa6c15" @@ -1080,7 +1090,7 @@ "@wallet-standard/app" "^1.0.0" "@wallet-standard/base" "^1.0.0" -"@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0", "@solana/web3.js@^1.31.0", "@solana/web3.js@^1.36.0", "@solana/web3.js@^1.44.3", "@solana/web3.js@^1.63.1", "@solana/web3.js@^1.68.0": +"@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0", "@solana/web3.js@^1.31.0", "@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0", "@solana/web3.js@^1.44.3", "@solana/web3.js@^1.63.1", "@solana/web3.js@^1.68.0": version "1.73.2" resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.73.2.tgz#4b30cd402b35733dae3a7d0b638be26a7742b395" integrity sha512-9WACF8W4Nstj7xiDw3Oom22QmrhBh0VyZyZ7JvvG3gOxLWLlX3hvm5nPVJOGcCE/9fFavBbCUb5A6CIuvMGdoA== From d304045b1626831154d33731de61f2782f00ceeb Mon Sep 17 00:00:00 2001 From: tjs Date: Tue, 14 Feb 2023 22:56:44 -0500 Subject: [PATCH 2/2] update selectedMarket on group reload --- store/mangoStore.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/store/mangoStore.ts b/store/mangoStore.ts index 954e83e9..80eed98a 100644 --- a/store/mangoStore.ts +++ b/store/mangoStore.ts @@ -634,18 +634,17 @@ const mangoStore = create()( '9Y8paZ5wUpzLFfQuHz8j2RtPrKsDtHx9sbgFmWb5abCw' ) - const defaultMarket = + const selectedMarket = serumMarkets.find((m) => m.name === selectedMarketName) || - perpMarkets.find((m) => m.name === selectedMarketName) - serumMarkets[0] + perpMarkets.find((m) => m.name === selectedMarketName) || + serumMarkets[0] set((state) => { state.group = group state.groupLoaded = true state.serumMarkets = serumMarkets state.perpMarkets = perpMarkets - state.selectedMarket.current = - state.selectedMarket.current || defaultMarket + state.selectedMarket.current = selectedMarket if (!state.swap.inputBank && !state.swap.outputBank) { state.swap.inputBank = inputBank state.swap.outputBank = outputBank