Merge branch 'master' into tma-634-badge-selection-screen

# Conflicts:
#	src/components/taggs/SocialMediaInfo.tsx

1 files changed, 18 insertions, 10 deletions

diff --git a/src/screens/search/RequestContactsAccess.tsx b/src/screens/search/RequestContactsAccess.tsx
index de023464..08548c69 100644
--- a/src/screens/search/RequestContactsAccess.tsx
+++ b/src/screens/search/RequestContactsAccess.tsx
@@ -21,21 +21,29 @@ const RequestContactsAccess: React.FC = () => {
   const navigation = useNavigation();
 
   const handleAllowAccess = async () => {
-    checkPermission().then((permission) => {
+    try {
+      let permission = await checkPermission();
       if (permission === 'undefined') {
-        requestPermission().then((response) => {
-          if (response === 'authorized' || response === 'denied') {
-            navigation.navigate('Search');
-          }
-        });
+        await requestPermission();
       }
-    });
-    await AsyncStorage.setItem('respondedToAccessContacts', 'true');
+      await AsyncStorage.setItem('respondedToAccessContacts', 'true');
+      navigation.navigate('Search');
+    } catch (err) {
+      console.log(
+        'Unable to check and request permission to get access to user contacts',
+      );
+    }
   };
 
   const handleDontAllowAccess = async () => {
-    await AsyncStorage.setItem('respondedToAccessContacts', 'true');
-    navigation.navigate('Search');
+    try {
+      await AsyncStorage.setItem('respondedToAccessContacts', 'true');
+      navigation.navigate('Search');
+    } catch (err) {
+      console.log(
+        'Unable to check and request permission to get access to user contacts',
+      );
+    }
   };
 
   return (