@@ -186,7 +186,12 @@ const useApiContext = (hermesUrl: string, pythnetRpcUrl: string) => {
186
186
revalidateOnReconnect : false ,
187
187
} ,
188
188
) ;
189
- const lastStakeAccount = useLocalStorageValue < string > ( "last-stake-account" ) ;
189
+ const lastStakeAccountMainnet = useLocalStorageValue < string > (
190
+ `last-stake-account.mainnet` ,
191
+ ) ;
192
+ const lastStakeAccountDevnet = useLocalStorageValue < string > (
193
+ `last-stake-account.devnet` ,
194
+ ) ;
190
195
191
196
return useMemo ( ( ) => {
192
197
if ( wallet . connecting ) {
@@ -213,11 +218,17 @@ const useApiContext = (hermesUrl: string, pythnetRpcUrl: string) => {
213
218
} else {
214
219
const [ firstAccount , ...otherAccounts ] = stakeAccounts . data ;
215
220
if ( firstAccount ) {
216
- const selectedAccount = lastStakeAccount . value
221
+ const localStorageValue = isMainnet
222
+ ? lastStakeAccountMainnet
223
+ : lastStakeAccountDevnet ;
224
+ const selectedAccount = localStorageValue . value
217
225
? stakeAccounts . data . find (
218
- ( account ) => account . toBase58 ( ) === lastStakeAccount . value ,
226
+ ( account ) => account . toBase58 ( ) === localStorageValue . value ,
219
227
)
220
228
: undefined ;
229
+ if ( ! selectedAccount ) {
230
+ localStorageValue . set ( firstAccount . toBase58 ( ) ) ;
231
+ }
221
232
return State [ StateType . Loaded ] (
222
233
isMainnet ,
223
234
pythStakingClient ,
@@ -226,7 +237,7 @@ const useApiContext = (hermesUrl: string, pythnetRpcUrl: string) => {
226
237
selectedAccount ?? firstAccount ,
227
238
[ firstAccount , ...otherAccounts ] ,
228
239
( account : PublicKey ) => {
229
- lastStakeAccount . set ( account . toBase58 ( ) ) ;
240
+ localStorageValue . set ( account . toBase58 ( ) ) ;
230
241
} ,
231
242
mutate ,
232
243
) ;
@@ -256,7 +267,8 @@ const useApiContext = (hermesUrl: string, pythnetRpcUrl: string) => {
256
267
pythnetClient ,
257
268
stakeAccounts ,
258
269
hermesClient ,
259
- lastStakeAccount ,
270
+ lastStakeAccountMainnet ,
271
+ lastStakeAccountDevnet ,
260
272
mutate ,
261
273
] ) ;
262
274
} ;
0 commit comments