@@ -17,28 +17,20 @@ export const CharmsManagerProvider: React.FC<{ children: React.ReactNode }> = (
1717 { children } ,
1818) => {
1919 const { replicaName } = useParams < { replicaName : string } > ( ) ;
20- const [ effectiveReplica , setEffectiveReplica ] = React . useState < string > (
21- ( ) => localStorage . getItem ( "lastReplica" ) || "common-knowledge" ,
22- ) ;
2320 const { user } = useAuthentication ( ) ;
2421
25- React . useEffect ( ( ) => {
22+ const charmManager = useMemo ( ( ) => {
2623 console . log ( "CharmManagerProvider" , replicaName ) ;
2724
2825 if ( replicaName ) {
29- // When a replica is provided in the URL, use it and save it as the last visited
30- setEffectiveReplica ( replicaName ) ;
3126 localStorage . setItem ( "lastReplica" , replicaName ) ;
3227 }
33- } , [ replicaName ] ) ;
34-
35- const charmManager = useMemo ( ( ) => {
36- return user ? new CharmManager ( effectiveReplica , user ) : null ;
37- } , [ effectiveReplica , user ] ) ;
28+ return user && replicaName ? new CharmManager ( replicaName , user ) : null ;
29+ } , [ replicaName , user ] ) ;
3830
3931 return (
4032 < CharmManagerContext . Provider
41- value = { { charmManager, currentReplica : effectiveReplica } }
33+ value = { { charmManager, currentReplica : replicaName || "" } }
4234 >
4335 { children }
4436 </ CharmManagerContext . Provider >
0 commit comments