From 9078747e12548a2f00ab92f0aa949b2a63c0e924 Mon Sep 17 00:00:00 2001
From: Oluwakorede Fashokun <koredefashokun@gmail.com>
Date: Mon, 22 Jun 2020 01:27:06 +0100
Subject: [PATCH] Fix accessToken hook

---
 app/App.tsx                              |  1 +
 app/src/hooks/useAccessToken.ts          | 12 +++++-------
 app/src/screens/VerifyAuthentication.tsx |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/App.tsx b/app/App.tsx
index 792d0359..5a56bd3c 100644
--- a/app/App.tsx
+++ b/app/App.tsx
@@ -184,6 +184,7 @@ const App = () => {
 		})
 	});
 
+	// Keep the splash screen open until loading becomes true.
 	return loading ? (
 		<View>
 			<ActivityIndicator />
diff --git a/app/src/hooks/useAccessToken.ts b/app/src/hooks/useAccessToken.ts
index 3ceeceaa..bd6635fb 100644
--- a/app/src/hooks/useAccessToken.ts
+++ b/app/src/hooks/useAccessToken.ts
@@ -8,9 +8,10 @@ const useAccessToken = () => {
 	React.useEffect(() => {
 		(async () => {
 			try {
-				const savedAccessToken = await AsyncStorage.getItem('accessToken');
-				if (!savedAccessToken) return setAccessToken(null);
-				setAccessToken(savedAccessToken);
+				const savedToken = await AsyncStorage.getItem('accessToken');
+				setAccessToken(savedToken);
+			} catch (error) {
+				setAccessToken(null);
 			} finally {
 				setLoading(false);
 			}
@@ -25,12 +26,9 @@ const useAccessToken = () => {
 		AsyncStorage.setItem('accessToken', accessToken);
 	}, [accessToken]);
 
-	const saveAccessToken = (token: string) =>
-		AsyncStorage.setItem('accessToken', token);
-
 	const logOut = () => setAccessToken(null);
 
-	return { loading, accessToken, saveAccessToken, logOut };
+	return { loading, accessToken, setAccessToken, logOut };
 };
 
 export default useAccessToken;
diff --git a/app/src/screens/VerifyAuthentication.tsx b/app/src/screens/VerifyAuthentication.tsx
index b3a382c1..023fe06f 100644
--- a/app/src/screens/VerifyAuthentication.tsx
+++ b/app/src/screens/VerifyAuthentication.tsx
@@ -17,7 +17,7 @@ const VerifyAuthentication = () => {
 		RouteProp<AuthStackParamList, 'VerifyAuthentication'>
 	>();
 	const { navigate } = useNavigation();
-	const { saveAccessToken } = useAccessToken();
+	const { setAccessToken } = useAccessToken();
 	const [code, setCode] = React.useState('');
 	const [
 		{ data, fetching },
@@ -27,7 +27,7 @@ const VerifyAuthentication = () => {
 
 	React.useEffect(() => {
 		if (data?.verifyAuthentication) {
-			saveAccessToken(data.verifyAuthentication);
+			setAccessToken(data.verifyAuthentication);
 			navigate('Main');
 		}
 	}, [data]);