Skip to content

Commit d644c99

Browse files
committedAug 24, 2024
optimize render
1 parent 28c14a9 commit d644c99

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed
 

‎src/components/AuthContext/AuthContext.tsx

+2-13
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
3636
const [isAuthenticated, setIsAuthenticated] = useState(false);
3737
const {setCurrentUser} = useContext(UserContext);
3838
const [isLoading, setIsLoading] = useState(true);
39-
const [isFetching, setIsFetching] = useState(false);
4039
const [fetchUserDataIsComplited, setFetchUserDataIsComplited] = useState(false);
4140

4241

@@ -59,7 +58,6 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
5958
};
6059

6160

62-
const isFetchingRef = useRef(false);
6361
let isFetchingInProgress = false;
6462

6563

@@ -72,18 +70,11 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
7270
if (isFetchingInProgress) return;
7371
isFetchingInProgress = true;
7472

75-
if (isFetching) {
76-
console.log('Fetch in progress, skipping');
77-
return;
78-
}
79-
isFetchingRef.current = true;
80-
setIsFetching(true);
73+
8174
const token = localStorage.getItem('token');
8275
if (!token) {
8376
setIsAuthenticated(false);
8477
setCurrentUser(null);
85-
isFetchingRef.current = false;
86-
setIsFetching(false);
8778
return;
8879
}
8980

@@ -128,14 +119,12 @@ export const AuthProvider: React.FC<IAuthProviderProps> = ({children}) => {
128119
console.error('Unknown error', error);
129120
}
130121
} finally {
131-
isFetchingRef.current = false;
132-
setIsFetching(false);
133122
setIsLoading(false);
134123
isFetchingInProgress = false;
135124
setFetchUserDataIsComplited(true);
136125

137126
}
138-
}, [refreshAccessToken, isFetching, fetchUserDataIsComplited]);
127+
}, [refreshAccessToken, fetchUserDataIsComplited]);
139128

140129
useEffect(() => {
141130
console.log('Fetching user data from useEffect');

0 commit comments

Comments
 (0)
Please sign in to comment.