From ff913f007f2ea192bac1e0883b9064807e273fb1 Mon Sep 17 00:00:00 2001
From: Justin <justinbuhl93@gmail.com>
Date: Tue, 6 Jul 2021 13:11:35 -0500
Subject: [PATCH] Rebase app and fix lint warnings

---
 .../authentication-check-screen.tsx           |  34 ++-
 .../authentication-screen.tsx                 |  47 ++--
 .../authentication-screen/pin-screen.tsx      | 144 +++++-----
 .../move-money-screen/money-money-screen.tsx  |   4 +-
 app/screens/phone-auth-screen/phone-auth.tsx  |   9 +-
 .../settings-screen/security-screen.tsx       | 153 +++--------
 .../settings-screen/settings-screen.tsx       | 151 +++++-----
 app/utils/biometricAuthentication.ts          |  13 +-
 app/utils/logout.ts                           |  19 +-
 app/utils/storage/secureStorage.ts            |  46 ++--
 yarn.lock                                     | 258 +-----------------
 11 files changed, 272 insertions(+), 606 deletions(-)

diff --git a/app/screens/authentication-screen/authentication-check-screen.tsx b/app/screens/authentication-screen/authentication-check-screen.tsx
index bffc93ede7..876614ff04 100644
--- a/app/screens/authentication-screen/authentication-check-screen.tsx
+++ b/app/screens/authentication-screen/authentication-check-screen.tsx
@@ -1,32 +1,30 @@
 import * as React from "react"
-
-import { Image } from "react-native"
-import EStyleSheet from "react-native-extended-stylesheet"
 import { useEffect } from "react"
 import { Image } from "react-native"
-import EStyleSheet from 'react-native-extended-stylesheet'
+import EStyleSheet from "react-native-extended-stylesheet"
 
 import { Screen } from "../../components/screen"
 import { palette } from "../../theme/palette"
 import KeyStoreWrapper from "../../utils/storage/secureStorage"
 import BiometricWrapper from "../../utils/biometricAuthentication"
-import type { ScreenType } from '../../types/screen'
+import type { ScreenType } from "../../types/screen"
 import { AuthenticationScreenPurpose, PinScreenPurpose } from "../../utils/enum"
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const BitcoinBeachLogo = require("../get-started-screen/bitcoinBeach3.png")
 
 const styles = EStyleSheet.create({
+  Logo: {
+    marginTop: 24,
+    maxHeight: "50%",
+    maxWidth: "50%",
+  },
+
   container: {
     alignItems: "center",
     flex: 1,
     width: "100%",
   },
-
-  Logo: {
-    maxHeight: "50%",
-    maxWidth: "50%",
-    marginTop: 24,
-  },
 })
 
 type Props = {
@@ -35,11 +33,17 @@ type Props = {
 
 export const AuthenticationCheckScreen: ScreenType = ({ navigation }: Props) => {
   useEffect(() => {
-    (async () => {
-      const isPinEnabled = (await KeyStoreWrapper.getIsPinEnabled())
+    ;(async () => {
+      const isPinEnabled = await KeyStoreWrapper.getIsPinEnabled()
 
-      if (await BiometricWrapper.isSensorAvailable() && await KeyStoreWrapper.getIsBiometricsEnabled()) {
-        navigation.replace("authentication", { screenPurpose: AuthenticationScreenPurpose.Authenticate, isPinEnabled })
+      if (
+        (await BiometricWrapper.isSensorAvailable()) &&
+        (await KeyStoreWrapper.getIsBiometricsEnabled())
+      ) {
+        navigation.replace("authentication", {
+          screenPurpose: AuthenticationScreenPurpose.Authenticate,
+          isPinEnabled,
+        })
       } else if (isPinEnabled) {
         navigation.replace("pin", { screenPurpose: PinScreenPurpose.AuthenticatePin })
       } else {
diff --git a/app/screens/authentication-screen/authentication-screen.tsx b/app/screens/authentication-screen/authentication-screen.tsx
index 209833e013..e053dcc19b 100644
--- a/app/screens/authentication-screen/authentication-screen.tsx
+++ b/app/screens/authentication-screen/authentication-screen.tsx
@@ -4,10 +4,6 @@ import { Alert, Image, View } from "react-native"
 import { Button } from "react-native-elements"
 import EStyleSheet from "react-native-extended-stylesheet"
 import { useApolloClient } from "@apollo/client"
-<<<<<<< HEAD
-import RNSecureKeyStore, { ACCESSIBLE } from "react-native-secure-key-store"
-=======
->>>>>>> Wrap SecureKeyStore and Biometric utility functions
 
 import { Screen } from "../../components/screen"
 import { color } from "../../theme"
@@ -16,15 +12,22 @@ import { translate } from "../../i18n"
 import KeyStoreWrapper from "../../utils/storage/secureStorage"
 import BiometricWrapper from "../../utils/biometricAuthentication"
 import { resetDataStore } from "../../utils/logout"
-import type { ScreenType } from '../../types/screen'
+import type { ScreenType } from "../../types/screen"
 import { AuthenticationScreenPurpose, PinScreenPurpose } from "../../utils/enum"
 
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const BitcoinBeachLogo = require("../get-started-screen/bitcoinBeach3.png")
 
 const styles = EStyleSheet.create({
+  Logo: {
+    marginTop: 24,
+    maxHeight: "50%",
+    maxWidth: "50%",
+  },
+
   bottom: {
-    flex: 1,
     alignItems: "center",
+    flex: 1,
     justifyContent: "flex-end",
     marginBottom: 36,
     width: "100%",
@@ -40,6 +43,10 @@ const styles = EStyleSheet.create({
     borderRadius: 24,
   },
 
+  buttonAlternateTitle: {
+    color: palette.white,
+  },
+
   buttonContainer: {
     marginVertical: 12,
     width: "80%",
@@ -50,21 +57,11 @@ const styles = EStyleSheet.create({
     fontWeight: "bold",
   },
 
-  buttonAlternateTitle: {
-    color: palette.white,
-  },
-
   container: {
     alignItems: "center",
     flex: 1,
     width: "100%",
   },
-
-  Logo: {
-    maxHeight: "50%",
-    maxWidth: "50%",
-    marginTop: 24,
-  },
 })
 
 type Props = {
@@ -73,8 +70,8 @@ type Props = {
       screenPurpose: AuthenticationScreenPurpose
       isPinEnabled: boolean
     }
-  },
-  navigation: any,
+  }
+  navigation: any
 }
 
 export const AuthenticationScreen: ScreenType = ({ route, navigation }: Props) => {
@@ -94,7 +91,11 @@ export const AuthenticationScreen: ScreenType = ({ route, navigation }: Props) =
       description = translate("AuthenticationScreen.setUpAuthenticationDescription")
     }
     // Presents the OS specific authentication prompt
-    BiometricWrapper.authenticate(description, handleAuthenticationSuccess, handleAuthenticationFailure)
+    BiometricWrapper.authenticate(
+      description,
+      handleAuthenticationSuccess,
+      handleAuthenticationFailure,
+    )
   }
 
   const handleAuthenticationSuccess = () => {
@@ -132,7 +133,9 @@ export const AuthenticationScreen: ScreenType = ({ route, navigation }: Props) =
         title={translate("AuthenticationScreen.usePin")}
         buttonStyle={styles.buttonAlternate}
         titleStyle={styles.buttonAlternateTitle}
-        onPress={() => navigation.navigate("pin", { screenPurpose: PinScreenPurpose.AuthenticatePin })}
+        onPress={() =>
+          navigation.navigate("pin", { screenPurpose: PinScreenPurpose.AuthenticatePin })
+        }
         containerStyle={styles.buttonContainer}
       />
     )
@@ -179,7 +182,9 @@ export const AuthenticationScreen: ScreenType = ({ route, navigation }: Props) =
           title={(() => {
             if (screenPurpose === AuthenticationScreenPurpose.Authenticate) {
               return translate("AuthenticationScreen.unlock")
-            } else if (screenPurpose === AuthenticationScreenPurpose.TurnOnAuthentication) {
+            } else if (
+              screenPurpose === AuthenticationScreenPurpose.TurnOnAuthentication
+            ) {
               return translate("AuthenticationScreen.setUp")
             } else {
               return ""
diff --git a/app/screens/authentication-screen/pin-screen.tsx b/app/screens/authentication-screen/pin-screen.tsx
index 5ecc9417d5..a6dd0238b1 100644
--- a/app/screens/authentication-screen/pin-screen.tsx
+++ b/app/screens/authentication-screen/pin-screen.tsx
@@ -11,22 +11,18 @@ import { palette } from "../../theme/palette"
 import { translate } from "../../i18n"
 import { resetDataStore } from "../../utils/logout"
 import KeyStoreWrapper from "../../utils/storage/secureStorage"
-import type { ScreenType } from '../../types/screen'
+import type { ScreenType } from "../../types/screen"
 import { PinScreenPurpose } from "../../utils/enum"
 
 const styles = EStyleSheet.create({
-  container: {
-    alignItems: "center",
-    flex: 1,
-    width: "100%",
-  },
-
-  topSpacer: {
+  bottomSpacer: {
     flex: 1,
   },
 
-  bottomSpacer: {
-    flex: 1,
+  circleContainer: {
+    alignItems: "center",
+    justifyContent: "center",
+    width: 32,
   },
 
   circles: {
@@ -34,75 +30,79 @@ const styles = EStyleSheet.create({
     flexDirection: "row",
   },
 
-  circleContainer: {
-    width: 32,
+  container: {
     alignItems: "center",
-    justifyContent: "center",
+    flex: 1,
+    width: "100%",
   },
 
   emptyCircle: {
-    width: 16,
-    height: 16,
-    borderRadius: 16 / 2,
     backgroundColor: palette.lightBlue,
     borderColor: palette.white,
+    borderRadius: 16 / 2,
     borderWidth: 2,
+    height: 16,
+    width: 16,
   },
 
   filledCircle: {
-    width: 16,
-    height: 16,
-    borderRadius: 16 / 2,
     backgroundColor: palette.white,
-  },
-
-  helperTextContainer: {
-    flex: 1,
+    borderRadius: 16 / 2,
+    height: 16,
+    width: 16,
   },
 
   helperText: {
-    fontSize: 20,
     color: palette.white,
+    fontSize: 20,
+  },
+
+  helperTextContainer: {
+    flex: 1,
   },
 
   pinPad: {
-    flex: 6,
     alignItems: "center",
     flexDirection: "column",
+    flex: 6,
   },
 
-  pinPadRow: {
-    marginLeft: 32,
-    marginRight: 32,
+  pinPadButton: {
+    backgroundColor: palette.lightBlue,
     flex: 1,
-    flexDirection: "row",
+    height: "95%",
+    width: "95%",
   },
 
   pinPadButtonContainer: {
-    width: 100,
     alignItems: "center",
     justifyContent: "center",
+    width: 100,
   },
 
-  pinPadButton: {
-    flex: 1,
-    width: "95%",
-    height: "95%",
-    backgroundColor: palette.lightBlue,
+  pinPadButtonIcon: {
+    color: palette.white,
+    fontSize: 32,
+    marginRight: "20%",
   },
 
   pinPadButtonTitle: {
-    marginLeft: "40%",
-    marginRight: "40%",
     color: palette.white,
     fontSize: 26,
     fontWeight: "bold",
+    marginLeft: "40%",
+    marginRight: "40%",
   },
 
-  pinPadButtonIcon: {
-    marginRight: "20%",
-    color: palette.white,
-    fontSize: 32,
+  pinPadRow: {
+    flex: 1,
+    flexDirection: "row",
+    marginLeft: 32,
+    marginRight: 32,
+  },
+
+  topSpacer: {
+    flex: 1,
   },
 })
 
@@ -111,8 +111,8 @@ type Props = {
     params: {
       screenPurpose: PinScreenPurpose
     }
-  },
-  navigation: any,
+  }
+  navigation: any
 }
 
 export const PinScreen: ScreenType = ({ route, navigation }: Props) => {
@@ -122,7 +122,7 @@ export const PinScreen: ScreenType = ({ route, navigation }: Props) => {
 
   const [enteredPIN, setEnteredPIN] = useState("")
   const [helperText, setHelperText] = useState(
-    screenPurpose === PinScreenPurpose.SetPin ? translate("PinScreen.setPin") : ""
+    screenPurpose === PinScreenPurpose.SetPin ? translate("PinScreen.setPin") : "",
   )
   const [previousPIN, setPreviousPIN] = useState("")
   const [pinAttempts, setPinAttempts] = useState(0)
@@ -130,26 +130,25 @@ export const PinScreen: ScreenType = ({ route, navigation }: Props) => {
   const MAX_PIN_ATTEMPTS = 3
 
   useEffect(() => {
-    (async () => {
+    ;(async () => {
       setPinAttempts(await KeyStoreWrapper.getPinAttemptsOrZero())
     })()
   }, [])
 
   const handleCompletedPinForAuthenticatePin = async (newEnteredPIN: string) => {
-    KeyStoreWrapper.setPinAttempts("0")
-    if (newEnteredPIN === await KeyStoreWrapper.getPinOrEmptyString()) {
+    if (newEnteredPIN === (await KeyStoreWrapper.getPinOrEmptyString())) {
       KeyStoreWrapper.resetPinAttempts()
       navigation.reset({
         index: 0,
         routes: [{ name: "Primary" }],
       })
     } else {
-      if (pinAttempts < (MAX_PIN_ATTEMPTS - 1)) {
+      if (pinAttempts < MAX_PIN_ATTEMPTS - 1) {
         const newPinAttempts = pinAttempts + 1
         KeyStoreWrapper.setPinAttempts(newPinAttempts.toString())
         setPinAttempts(newPinAttempts)
         setEnteredPIN("")
-        if (newPinAttempts === (MAX_PIN_ATTEMPTS - 1)) {
+        if (newPinAttempts === MAX_PIN_ATTEMPTS - 1) {
           setHelperText(translate("PinScreen.oneAttemptRemaining"))
         } else {
           const attemptsRemaining = MAX_PIN_ATTEMPTS - newPinAttempts
@@ -214,7 +213,9 @@ export const PinScreen: ScreenType = ({ route, navigation }: Props) => {
   const circleComponentForDigit = (digit: number) => {
     return (
       <View style={styles.circleContainer}>
-        <View style={enteredPIN.length > digit ? styles.filledCircle : styles.emptyCircle} />
+        <View
+          style={enteredPIN.length > digit ? styles.filledCircle : styles.emptyCircle}
+        />
       </View>
     )
   }
@@ -222,7 +223,12 @@ export const PinScreen: ScreenType = ({ route, navigation }: Props) => {
   const buttonComponentForDigit = (digit: string) => {
     return (
       <View style={styles.pinPadButtonContainer}>
-        <Button buttonStyle={styles.pinPadButton} titleStyle={styles.pinPadButtonTitle} title={digit} onPress={() => addDigit(digit)} />
+        <Button
+          buttonStyle={styles.pinPadButton}
+          titleStyle={styles.pinPadButtonTitle}
+          title={digit}
+          onPress={() => addDigit(digit)}
+        />
       </View>
     )
   }
@@ -232,41 +238,37 @@ export const PinScreen: ScreenType = ({ route, navigation }: Props) => {
       <StatusBar backgroundColor={palette.lightBlue} barStyle="light-content" />
       <View style={styles.topSpacer} />
       <View style={styles.circles}>
-        { circleComponentForDigit(0) }
-        { circleComponentForDigit(1) }
-        { circleComponentForDigit(2) }
-        { circleComponentForDigit(3) }
+        {circleComponentForDigit(0)}
+        {circleComponentForDigit(1)}
+        {circleComponentForDigit(2)}
+        {circleComponentForDigit(3)}
       </View>
       <View style={styles.helperTextContainer}>
         <Text style={styles.helperText}>{helperText}</Text>
       </View>
       <View style={styles.pinPad}>
         <View style={styles.pinPadRow}>
-          { buttonComponentForDigit("1") }
-          { buttonComponentForDigit("2") }
-          { buttonComponentForDigit("3") }
+          {buttonComponentForDigit("1")}
+          {buttonComponentForDigit("2")}
+          {buttonComponentForDigit("3")}
         </View>
         <View style={styles.pinPadRow}>
-          { buttonComponentForDigit("4") }
-          { buttonComponentForDigit("5") }
-          { buttonComponentForDigit("6") }
+          {buttonComponentForDigit("4")}
+          {buttonComponentForDigit("5")}
+          {buttonComponentForDigit("6")}
         </View>
         <View style={styles.pinPadRow}>
-          { buttonComponentForDigit("7") }
-          { buttonComponentForDigit("8") }
-          { buttonComponentForDigit("9") }
+          {buttonComponentForDigit("7")}
+          {buttonComponentForDigit("8")}
+          {buttonComponentForDigit("9")}
         </View>
         <View style={styles.pinPadRow}>
           <View style={styles.pinPadButtonContainer} />
-          { buttonComponentForDigit("0") }
+          {buttonComponentForDigit("0")}
           <View style={styles.pinPadButtonContainer}>
-            <Button 
+            <Button
               buttonStyle={styles.pinPadButton}
-              icon={
-                <Icon
-                  style={styles.pinPadButtonIcon}
-                  name="delete" />
-              }
+              icon={<Icon style={styles.pinPadButtonIcon} name="delete" />}
               onPress={() => setEnteredPIN(enteredPIN.slice(0, -1))}
             />
           </View>
diff --git a/app/screens/move-money-screen/money-money-screen.tsx b/app/screens/move-money-screen/money-money-screen.tsx
index 7ca5d258d5..7d49c3e4c7 100644
--- a/app/screens/move-money-screen/money-money-screen.tsx
+++ b/app/screens/move-money-screen/money-money-screen.tsx
@@ -289,9 +289,7 @@ export const MoveMoneyScreen = ({
 
   return (
     <Screen style={styles.screenStyle}>
-      <StatusBar
-        backgroundColor={palette.lighterGrey}
-        barStyle="dark-content" />
+      <StatusBar backgroundColor={palette.lighterGrey} barStyle="dark-content" />
       <Modal
         style={styles.modal}
         isVisible={modalVisible}
diff --git a/app/screens/phone-auth-screen/phone-auth.tsx b/app/screens/phone-auth-screen/phone-auth.tsx
index f73d0843c0..7ef5d1294e 100644
--- a/app/screens/phone-auth-screen/phone-auth.tsx
+++ b/app/screens/phone-auth-screen/phone-auth.tsx
@@ -35,7 +35,7 @@ import { addDeviceToken } from "../../utils/notifications"
 import BiometricWrapper from "../../utils/biometricAuthentication"
 
 // Types
-import type { ScreenType } from '../../types/screen'
+import type { ScreenType } from "../../types/screen"
 import { AuthenticationScreenPurpose } from "../../utils/enum"
 
 // Assets
@@ -263,10 +263,9 @@ export const WelcomePhoneValidationScreen: ScreenType = ({
       if (token) {
         await onSuccess({ token })
         if (await BiometricWrapper.isSensorAvailable()) {
-          navigation.replace(
-            "authentication",
-            { screenPurpose: AuthenticationScreenPurpose.TurnOnAuthentication }
-          )
+          navigation.replace("authentication", {
+            screenPurpose: AuthenticationScreenPurpose.TurnOnAuthentication,
+          })
         } else {
           navigation.navigate("moveMoney")
         }
diff --git a/app/screens/settings-screen/security-screen.tsx b/app/screens/settings-screen/security-screen.tsx
index a09d21f8ce..b0d7dc6444 100644
--- a/app/screens/settings-screen/security-screen.tsx
+++ b/app/screens/settings-screen/security-screen.tsx
@@ -3,71 +3,71 @@ import { useState } from "react"
 import { useFocusEffect } from "@react-navigation/native"
 import { Text, View } from "react-native"
 import { Button, Switch } from "react-native-elements"
-import EStyleSheet from 'react-native-extended-stylesheet'
+import EStyleSheet from "react-native-extended-stylesheet"
 
 import { Screen } from "../../components/screen"
 import { palette } from "../../theme/palette"
 import { translate } from "../../i18n"
 import BiometricWrapper from "../../utils/biometricAuthentication"
 import { toastShow } from "../../utils/toast"
-import type { ScreenType } from '../../types/screen'
+import type { ScreenType } from "../../types/screen"
 import { PinScreenPurpose } from "../../utils/enum"
 import KeyStoreWrapper from "../../utils/storage/secureStorage"
 
 const styles = EStyleSheet.create({
+  button: {
+    backgroundColor: palette.white,
+    paddingBottom: 16,
+    paddingLeft: 0,
+    paddingRight: 16,
+    paddingTop: 16,
+  },
+
+  buttonTitle: {
+    color: palette.black,
+    fontSize: 16,
+    fontWeight: "normal",
+  },
+
   container: {
-    minHeight: "100%",
     backgroundColor: palette.white,
+    minHeight: "100%",
     paddingLeft: 24,
     paddingRight: 24,
   },
 
+  description: {
+    color: palette.darkGrey,
+    fontSize: 14,
+    marginTop: 2,
+  },
+
   settingContainer: {
-    flexDirection: "row",
     borderBottomColor: palette.lightGrey,
     borderBottomWidth: 1,
-  },
-
-  textContainer: {
-    marginTop: 32,
-    marginRight: 40,
-    marginBottom: 12,
-  },
-
-  title: {
-    fontSize: 20,
-    fontWeight: "bold",
+    flexDirection: "row",
   },
 
   subtitle: {
-    marginTop: 16,
     fontSize: 16,
-  },
-
-  description: {
-    marginTop: 2,
-    fontSize: 14,
-    color: palette.darkGrey,
+    marginTop: 16,
   },
 
   switch: {
+    bottom: 18,
     position: "absolute",
     right: 0,
-    bottom: 18,
   },
 
-  button: {
-    paddingTop: 16,
-    paddingRight: 16,
-    paddingBottom: 16,
-    paddingLeft: 0,
-    backgroundColor: palette.white,
+  textContainer: {
+    marginBottom: 12,
+    marginRight: 40,
+    marginTop: 32,
   },
 
-  buttonTitle: {
-    fontSize: 16,
-    color: palette.black,
-    fontWeight: "normal",
+  title: {
+    fontSize: 20,
+    fontWeight: "bold",
   },
 })
 
@@ -83,74 +83,6 @@ export const SecurityScreen: ScreenType = ({ route, navigation }: Props) => {
   const [isPinEnabled, setIsPinEnabled] = useState(mIsPinEnabled)
 
   useFocusEffect(() => {
-<<<<<<< HEAD
-    RNSecureKeyStore.get("isBiometricsEnabled").then(
-      (res) => {
-        setIsBiometricsEnabled(true)
-      },
-      (err) => {
-        setIsBiometricsEnabled(false)
-      },
-    )
-
-    RNSecureKeyStore.get("PIN").then(
-      (res) => {
-        setIsPinEnabled(true)
-      },
-      (err) => {
-        setIsPinEnabled(false)
-      },
-    )
-  })
-
-  const onBiometricsValueChanged = (value) => {
-    if (value) {
-      isSensorAvailable(
-        handleBiometryAvailabilitySuccess,
-        handleBiometryAvailabilityFailure,
-      )
-    } else {
-      RNSecureKeyStore.remove("isBiometricsEnabled").then(
-        (res) => {
-          setIsBiometricsEnabled(false)
-        },
-        (err) => {
-          // unable to remove isBiometricsEnabled
-        },
-      )
-    }
-  }
-
-  const handleBiometryAvailabilitySuccess = (isBiometryAvailable: Boolean) => {
-    if (isBiometryAvailable) {
-      authenticate(
-        translate("AuthenticationScreen.setUpAuthenticationDescription"),
-        handleAuthenticationSuccess,
-        handleAuthenticationFailure,
-      )
-    } else {
-      toastShow("Biometric sensor is not available.")
-    }
-  }
-
-  const handleBiometryAvailabilityFailure = () => {
-    toastShow(
-      "Please register at least one biometric sensor in order to use biometric based authentication.",
-    )
-  }
-
-  const handleAuthenticationSuccess = () => {
-    RNSecureKeyStore.set("isBiometricsEnabled", "1", {
-      accessible: ACCESSIBLE.ALWAYS_THIS_DEVICE_ONLY,
-    }).then(
-      (res) => {
-        setIsBiometricsEnabled(true)
-      },
-      (err) => {
-        // unable to store isBiometricsEnabled
-      },
-    )
-=======
     getIsBiometricsEnabled()
     getIsPinEnabled()
   })
@@ -168,7 +100,11 @@ export const SecurityScreen: ScreenType = ({ route, navigation }: Props) => {
       try {
         if (await BiometricWrapper.isSensorAvailable()) {
           // Presents the OS specific authentication prompt
-          BiometricWrapper.authenticate(translate("AuthenticationScreen.setUpAuthenticationDescription"), handleAuthenticationSuccess, handleAuthenticationFailure)      
+          BiometricWrapper.authenticate(
+            translate("AuthenticationScreen.setUpAuthenticationDescription"),
+            handleAuthenticationSuccess,
+            handleAuthenticationFailure,
+          )
         } else {
           toastShow(translate("SecurityScreen.biometryNotAvailable"))
         }
@@ -186,7 +122,6 @@ export const SecurityScreen: ScreenType = ({ route, navigation }: Props) => {
     if (await KeyStoreWrapper.setIsBiometricsEnabled()) {
       setIsBiometricsEnabled(true)
     }
->>>>>>> Wrap SecureKeyStore and Biometric utility functions
   }
 
   const handleAuthenticationFailure = () => {
@@ -198,17 +133,6 @@ export const SecurityScreen: ScreenType = ({ route, navigation }: Props) => {
     if (value) {
       navigation.navigate("pin", { screenPurpose: PinScreenPurpose.SetPin })
     } else {
-<<<<<<< HEAD
-      RNSecureKeyStore.remove("PIN").then(
-        (res) => {
-          RNSecureKeyStore.remove("pinAttempts")
-          setIsPinEnabled(false)
-        },
-        (err) => {
-          // unable to remove PIN
-        },
-      )
-=======
       removePin()
     }
   }
@@ -217,7 +141,6 @@ export const SecurityScreen: ScreenType = ({ route, navigation }: Props) => {
     if (await KeyStoreWrapper.removePin()) {
       KeyStoreWrapper.removePinAttempts()
       setIsPinEnabled(false)
->>>>>>> Wrap SecureKeyStore and Biometric utility functions
     }
   }
 
diff --git a/app/screens/settings-screen/settings-screen.tsx b/app/screens/settings-screen/settings-screen.tsx
index 3561305cfc..50f9aef46d 100644
--- a/app/screens/settings-screen/settings-screen.tsx
+++ b/app/screens/settings-screen/settings-screen.tsx
@@ -66,7 +66,10 @@ export const SettingsScreen: ScreenType = ({ navigation }: Props) => {
     const isBiometricsEnabled = await KeyStoreWrapper.getIsBiometricsEnabled()
     const isPinEnabled = await KeyStoreWrapper.getIsPinEnabled()
 
-    navigation.navigate("security", { mIsBiometricsEnabled: isBiometricsEnabled, mIsPinEnabled: isPinEnabled })
+    navigation.navigate("security", {
+      mIsBiometricsEnabled: isBiometricsEnabled,
+      mIsPinEnabled: isPinEnabled,
+    })
   }
 
   const onGetCsvCallback = async (data) => {
@@ -134,75 +137,85 @@ export const SettingsScreen: ScreenType = ({ navigation }: Props) => {
 }
 
 export const SettingsScreenJSX = (params) => {
-  const { client, walletIsActive, navigation, username, notificationsEnabled, csvAction, securityAction, resetDataStore } = params
+  const {
+    client,
+    walletIsActive,
+    navigation,
+    username,
+    notificationsEnabled,
+    csvAction,
+    securityAction,
+    resetDataStore,
+  } = params
 
-  const list = [{
-    category: translate("common.phoneNumber"),
-    icon: 'call',
-    id: 'phone',
-    defaultValue: translate("SettingsScreen.tapLogIn"),
-    action: () => navigation.navigate("phoneValidation"),
-    enabled: !walletIsActive,
-    greyed: walletIsActive,
-  },
-  {
-    category: translate("common.username"),
-    icon: 'ios-person-circle',
-    id: 'username',
-    defaultValue: translate("SettingsScreen.tapUserName"),
-    action: () => navigation.navigate("setUsername"),
-    enabled: walletIsActive && !username,
-    greyed: !walletIsActive,
-  },
-  {
-    category: translate('common.language'),
-    icon: 'ios-language',
-    id: 'language',
-    action: () => navigation.navigate("language"),
-    enabled: walletIsActive,
-    greyed: !walletIsActive,
-  },
-  {
-    category: translate('common.notification'),
-    icon: 'ios-notifications-circle',
-    id: 'notifications',
-    action: () => requestPermission(client),
-    enabled: walletIsActive && notificationsEnabled,
-    greyed: !walletIsActive,
-  },
-  {
-    category: translate('common.security'),
-    icon: 'lock-closed-outline',
-    id: 'security',
-    action: securityAction,
-    enabled: walletIsActive,
-    greyed: !walletIsActive,
-  },
-  {
-    category: translate('common.csvExport'),
-    icon: 'ios-download',
-    id: 'csv',
-    action: () => csvAction(),
-    enabled: walletIsActive,
-    greyed: !walletIsActive,
-  },
-  {
-    category: translate('common.contactUs'),
-    icon: 'ios-logo-whatsapp',
-    id: 'contact-us',
-    action: () => openWhatsApp(WHATSAPP_CONTACT_NUMBER, WHATSAPP_DEFAULT_CONTACT_MESSAGE),
-    enabled: true,
-    greyed: false,
-    styleDivider: { backgroundColor: palette.lighterGrey, height: 18 },
-  },
-  {
-    category: translate('common.logout'),
-    id: "logout",
-    icon: 'ios-log-out',
-    action: async () => {
-      await resetDataStore()
-      Alert.alert("you have been logged out", "",
-        [
+  const list = [
+    {
+      category: translate("common.phoneNumber"),
+      icon: "call",
+      id: "phone",
+      defaultValue: translate("SettingsScreen.tapLogIn"),
+      action: () => navigation.navigate("phoneValidation"),
+      enabled: !walletIsActive,
+      greyed: walletIsActive,
+    },
+    {
+      category: translate("common.username"),
+      icon: "ios-person-circle",
+      id: "username",
+      defaultValue: translate("SettingsScreen.tapUserName"),
+      action: () => navigation.navigate("setUsername"),
+      enabled: walletIsActive && !username,
+      greyed: !walletIsActive,
+    },
+    {
+      category: translate("common.language"),
+      icon: "ios-language",
+      id: "language",
+      action: () => navigation.navigate("language"),
+      enabled: walletIsActive,
+      greyed: !walletIsActive,
+    },
+    {
+      category: translate("common.notification"),
+      icon: "ios-notifications-circle",
+      id: "notifications",
+      action: () => requestPermission(client),
+      enabled: walletIsActive && notificationsEnabled,
+      greyed: !walletIsActive,
+    },
+    {
+      category: translate("common.security"),
+      icon: "lock-closed-outline",
+      id: "security",
+      action: securityAction,
+      enabled: walletIsActive,
+      greyed: !walletIsActive,
+    },
+    {
+      category: translate("common.csvExport"),
+      icon: "ios-download",
+      id: "csv",
+      action: () => csvAction(),
+      enabled: walletIsActive,
+      greyed: !walletIsActive,
+    },
+    {
+      category: translate("common.contactUs"),
+      icon: "ios-logo-whatsapp",
+      id: "contact-us",
+      action: () =>
+        openWhatsApp(WHATSAPP_CONTACT_NUMBER, WHATSAPP_DEFAULT_CONTACT_MESSAGE),
+      enabled: true,
+      greyed: false,
+      styleDivider: { backgroundColor: palette.lighterGrey, height: 18 },
+    },
+    {
+      category: translate("common.logout"),
+      id: "logout",
+      icon: "ios-log-out",
+      action: async () => {
+        await resetDataStore()
+        Alert.alert("you have been logged out", "", [
           {
             text: translate("common.ok"),
             onPress: () => {
diff --git a/app/utils/biometricAuthentication.ts b/app/utils/biometricAuthentication.ts
index 976edf3799..5c729cf8dc 100644
--- a/app/utils/biometricAuthentication.ts
+++ b/app/utils/biometricAuthentication.ts
@@ -1,8 +1,7 @@
 import FingerprintScanner from "react-native-fingerprint-scanner"
 
 export default class BiometricWrapper {
-
-  public static async isSensorAvailable() : Promise<Boolean> {
+  public static async isSensorAvailable(): Promise<boolean> {
     try {
       const biometryType = await FingerprintScanner.isSensorAvailable()
       return biometryType !== null
@@ -13,11 +12,10 @@ export default class BiometricWrapper {
 
   public static async authenticate(description, handleSuccess, handleFailure) {
     await FingerprintScanner.release()
-    FingerprintScanner
-      .authenticate({ 
-        description: description,
-        fallbackEnabled: true
-      })
+    FingerprintScanner.authenticate({
+      description: description,
+      fallbackEnabled: true,
+    })
       .then(() => {
         handleSuccess()
       })
@@ -28,5 +26,4 @@ export default class BiometricWrapper {
         FingerprintScanner.release()
       })
   }
-
 }
diff --git a/app/utils/logout.ts b/app/utils/logout.ts
index 0d85b40734..186fa4ca7a 100644
--- a/app/utils/logout.ts
+++ b/app/utils/logout.ts
@@ -1,13 +1,8 @@
-<<<<<<< HEAD
 import AsyncStorage from "@react-native-async-storage/async-storage"
-import RNSecureKeyStore from "react-native-secure-key-store"
-=======
-import AsyncStorage from '@react-native-async-storage/async-storage'
->>>>>>> Wrap SecureKeyStore and Biometric utility functions
 import { BUILD_VERSION } from "../app"
 import { NETWORK_STRING } from "./network"
 import { Token, TOKEN_KEY } from "./token"
-import KeyStoreWrapper from './storage/secureStorage'
+import KeyStoreWrapper from "./storage/secureStorage"
 
 export const resetDataStore = async (client) => {
   try {
@@ -15,18 +10,10 @@ export const resetDataStore = async (client) => {
     await new Token().remove()
     // await AsyncStorage.clear()
     await AsyncStorage.multiRemove([NETWORK_STRING, TOKEN_KEY, BUILD_VERSION]) // use storage.ts wrapper
-<<<<<<< HEAD
-    await RNSecureKeyStore.remove("isBiometricsEnabled")
-    await RNSecureKeyStore.remove("PIN")
-    await RNSecureKeyStore.remove("pinAttempts")
-  } catch (err) {
-    console.log({ err }, "error resetting RootStore")
-=======
     await KeyStoreWrapper.removeIsBiometricsEnabled()
     await KeyStoreWrapper.removePin()
     await KeyStoreWrapper.removePinAttempts()
-  } catch(err) {
-    console.log({err}, `error resetting RootStore`)
->>>>>>> Wrap SecureKeyStore and Biometric utility functions
+  } catch (err) {
+    console.log({ err }, `error resetting RootStore`)
   }
 }
diff --git a/app/utils/storage/secureStorage.ts b/app/utils/storage/secureStorage.ts
index 9019d77d94..7b26331354 100644
--- a/app/utils/storage/secureStorage.ts
+++ b/app/utils/storage/secureStorage.ts
@@ -5,7 +5,7 @@ export default class KeyStoreWrapper {
   private static readonly PIN = "PIN"
   private static readonly PIN_ATTEMPTS = "pinAttempts"
 
-  public static async getIsBiometricsEnabled() : Promise<boolean> {
+  public static async getIsBiometricsEnabled(): Promise<boolean> {
     try {
       await RNSecureKeyStore.get(KeyStoreWrapper.IS_BIOMETRICS_ENABLED)
       return true
@@ -14,20 +14,18 @@ export default class KeyStoreWrapper {
     }
   }
 
-  public static async setIsBiometricsEnabled() : Promise<boolean> {
+  public static async setIsBiometricsEnabled(): Promise<boolean> {
     try {
-      await RNSecureKeyStore.set(
-        KeyStoreWrapper.IS_BIOMETRICS_ENABLED,
-        "1",
-        { accessible: ACCESSIBLE.ALWAYS_THIS_DEVICE_ONLY }
-      )
+      await RNSecureKeyStore.set(KeyStoreWrapper.IS_BIOMETRICS_ENABLED, "1", {
+        accessible: ACCESSIBLE.ALWAYS_THIS_DEVICE_ONLY,
+      })
       return true
     } catch {
       return false
     }
   }
 
-  public static async removeIsBiometricsEnabled() : Promise<boolean> {
+  public static async removeIsBiometricsEnabled(): Promise<boolean> {
     try {
       await RNSecureKeyStore.remove(KeyStoreWrapper.IS_BIOMETRICS_ENABLED)
       return true
@@ -36,7 +34,7 @@ export default class KeyStoreWrapper {
     }
   }
 
-  public static async getIsPinEnabled() : Promise<boolean> {
+  public static async getIsPinEnabled(): Promise<boolean> {
     try {
       await RNSecureKeyStore.get(KeyStoreWrapper.PIN)
       return true
@@ -45,7 +43,7 @@ export default class KeyStoreWrapper {
     }
   }
 
-  public static async getPinOrEmptyString() : Promise<string> {
+  public static async getPinOrEmptyString(): Promise<string> {
     try {
       return await RNSecureKeyStore.get(KeyStoreWrapper.PIN)
     } catch {
@@ -53,20 +51,18 @@ export default class KeyStoreWrapper {
     }
   }
 
-  public static async setPin(pin: string) : Promise<boolean> {
+  public static async setPin(pin: string): Promise<boolean> {
     try {
-      await RNSecureKeyStore.set(
-        KeyStoreWrapper.PIN,
-        pin,
-        { accessible: ACCESSIBLE.ALWAYS_THIS_DEVICE_ONLY }
-      )
+      await RNSecureKeyStore.set(KeyStoreWrapper.PIN, pin, {
+        accessible: ACCESSIBLE.ALWAYS_THIS_DEVICE_ONLY,
+      })
       return true
     } catch {
       return false
     }
   }
 
-  public static async removePin() : Promise<boolean> {
+  public static async removePin(): Promise<boolean> {
     try {
       await RNSecureKeyStore.remove(KeyStoreWrapper.PIN)
       return true
@@ -75,7 +71,7 @@ export default class KeyStoreWrapper {
     }
   }
 
-  public static async getPinAttemptsOrZero() : Promise<number> {
+  public static async getPinAttemptsOrZero(): Promise<number> {
     try {
       return Number(await RNSecureKeyStore.get(KeyStoreWrapper.PIN_ATTEMPTS))
     } catch {
@@ -83,24 +79,22 @@ export default class KeyStoreWrapper {
     }
   }
 
-  public static async setPinAttempts(pinAttempts: string) : Promise<boolean> {
+  public static async setPinAttempts(pinAttempts: string): Promise<boolean> {
     try {
-      await RNSecureKeyStore.set(
-        KeyStoreWrapper.PIN_ATTEMPTS,
-        pinAttempts,
-        { accessible: ACCESSIBLE.ALWAYS_THIS_DEVICE_ONLY }
-      )
+      await RNSecureKeyStore.set(KeyStoreWrapper.PIN_ATTEMPTS, pinAttempts, {
+        accessible: ACCESSIBLE.ALWAYS_THIS_DEVICE_ONLY,
+      })
       return true
     } catch {
       return false
     }
   }
 
-  public static async resetPinAttempts() : Promise<boolean> {
+  public static async resetPinAttempts(): Promise<boolean> {
     return await KeyStoreWrapper.setPinAttempts("0")
   }
 
-  public static async removePinAttempts() : Promise<boolean> {
+  public static async removePinAttempts(): Promise<boolean> {
     try {
       await RNSecureKeyStore.remove(KeyStoreWrapper.PIN_ATTEMPTS)
       return true
diff --git a/yarn.lock b/yarn.lock
index 3aa889ae49..991697b8c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -618,7 +618,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-async-to-generator@^7.0.0", "@babel/plugin-transform-async-to-generator@^7.14.5":
+"@babel/plugin-transform-async-to-generator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"
   integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
@@ -10823,20 +10823,6 @@ metro-babel-register@0.64.0:
     "@babel/register" "^7.0.0"
     escape-string-regexp "^1.0.5"
 
-metro-babel-register@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.66.0.tgz#4a2646a0197189d0e7f85b93f823bb57e5bcc28e"
-  integrity sha512-Al1fJquMISNsbjaHOYVFVYO5vxyw3gOvIf1ScdxNwzndCOA+5yersRO7JSUUoVfoQZAXEdtcj027BthPmHDjsw==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.0.0"
-    "@babel/plugin-syntax-class-properties" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/register" "^7.0.0"
-    escape-string-regexp "^1.0.5"
-
 metro-babel-transformer@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.64.0.tgz"
@@ -10846,25 +10832,11 @@ metro-babel-transformer@0.64.0:
     metro-source-map "0.64.0"
     nullthrows "^1.1.1"
 
-metro-babel-transformer@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.66.0.tgz#77b8f5fde576d35220caed5c17ba5e4e626304d2"
-  integrity sha512-IJCF4wILV4FT8xX4DHSntFKjYZFBi/3EJ+4TQlvcauZv89c7u4HEZ+Jjmg+M6L4pnv1m8GRNjRcgilnsY9N5nw==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    metro-source-map "0.66.0"
-    nullthrows "^1.1.1"
-
 metro-cache-key@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.64.0.tgz"
   integrity sha512-O9B65G8L/fopck45ZhdRosyVZdMtUQuX5mBWEC1NRj02iWBIUPLmYMjrunqIe8vHipCMp3DtTCm/65IlBmO8jg==
 
-metro-cache-key@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.66.0.tgz#e628445f2a17e6e3dec970a87a090b4ec876bd1d"
-  integrity sha512-qAHMC4Tpj3rUH8Pz5IEmT/fGgitCO86B6jndzKyXT+aDBr7BcNnRA8T25MoUMiBtsuRdxAeMHmBbhmvNK+tEEg==
-
 metro-cache@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-cache/-/metro-cache-0.64.0.tgz"
@@ -10874,15 +10846,6 @@ metro-cache@0.64.0:
     mkdirp "^0.5.1"
     rimraf "^2.5.4"
 
-metro-cache@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.66.0.tgz#65bfcf8a4bff559855c404220368866779216430"
-  integrity sha512-Yppsf28TLGZwQIpNkx/9c5xc9FWFglhaUH6Ovtbth8DmDauAwakvdoMklFvkYQGE9W8OceehQAvRW2D9YQn9Ew==
-  dependencies:
-    metro-core "0.66.0"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-
 metro-config@0.64.0, metro-config@^0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-config/-/metro-config-0.64.0.tgz"
@@ -10895,18 +10858,6 @@ metro-config@0.64.0, metro-config@^0.64.0:
     metro-core "0.64.0"
     metro-runtime "0.64.0"
 
-metro-config@0.66.0, metro-config@^0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.66.0.tgz#7755aa0323549e351670d50fda9df9702ec60b00"
-  integrity sha512-mzJ8bc/sAYSgQp72+0ZWeNEGqAdetLIWde+i5AMDfjFobgzrITjz5SwDGToDEKUgQWIt4BlJzbWNyKEId7TsPw==
-  dependencies:
-    cosmiconfig "^5.0.5"
-    jest-validate "^26.5.2"
-    metro "0.66.0"
-    metro-cache "0.66.0"
-    metro-core "0.66.0"
-    metro-runtime "0.66.0"
-
 metro-core@0.64.0, metro-core@^0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-core/-/metro-core-0.64.0.tgz"
@@ -10916,25 +10867,11 @@ metro-core@0.64.0, metro-core@^0.64.0:
     lodash.throttle "^4.1.1"
     metro-resolver "0.64.0"
 
-metro-core@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.66.0.tgz#e000cff338b072288146e166180095b272e0fbfa"
-  integrity sha512-F/U1qQl6LxHLn8P5pfyvW3S0BUiYdwgU23icmNgUx2GRFazOdtZUgR9EJAhISZAsoYsVpznftA6lS8Kok6pZOw==
-  dependencies:
-    jest-haste-map "^26.5.2"
-    lodash.throttle "^4.1.1"
-    metro-resolver "0.66.0"
-
 metro-hermes-compiler@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-hermes-compiler/-/metro-hermes-compiler-0.64.0.tgz"
   integrity sha512-CLAjVDWGAoGhbi2ZyPHnH5YDdfrDIx6+tzFWfHGIMTZkYBXsYta9IfYXBV8lFb6BIbrXLjlXZAOoosknetMPOA==
 
-metro-hermes-compiler@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-hermes-compiler/-/metro-hermes-compiler-0.66.0.tgz#8fd9c19c5ac581649f86e678f11e6b615efc8b2e"
-  integrity sha512-fiMNxQ3WDEmFNpZgWgGGBYP8Q3rIXmIBDq2GPepvbH5KLDTKgAsjGMS4VYGe9M2eCBKKmElewkzDNKL+Wu5ivQ==
-
 metro-inspector-proxy@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.64.0.tgz"
@@ -10945,16 +10882,6 @@ metro-inspector-proxy@0.64.0:
     ws "^1.1.5"
     yargs "^15.3.1"
 
-metro-inspector-proxy@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.66.0.tgz#77425ece4d42e06ff0a2af23c30049070035580f"
-  integrity sha512-lYC6LWfTT9bUh+MmZhzbBgCS1ztGAq1sEYrQKbIMJNZuTgGfXXsGSti/Qq0pbH4VoxXv5OAaL5um346XHfkqZQ==
-  dependencies:
-    connect "^3.6.5"
-    debug "^2.2.0"
-    ws "^1.1.5"
-    yargs "^15.3.1"
-
 metro-minify-uglify@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.64.0.tgz"
@@ -10962,13 +10889,6 @@ metro-minify-uglify@0.64.0:
   dependencies:
     uglify-es "^3.1.9"
 
-metro-minify-uglify@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.66.0.tgz#745887cf594ff8afad5521147d365f7660780dc3"
-  integrity sha512-7j47/YIUJjorDh4Sbz3toxxNBSG/dO7bFCvpF5gW1i5ORdLFjsC6Jdr2RN8mQU1bRkA6T2NaMO+q5t491tTMFw==
-  dependencies:
-    uglify-es "^3.1.9"
-
 metro-react-native-babel-preset@0.64.0, metro-react-native-babel-preset@^0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.64.0.tgz"
@@ -11014,52 +10934,6 @@ metro-react-native-babel-preset@0.64.0, metro-react-native-babel-preset@^0.64.0:
     "@babel/template" "^7.0.0"
     react-refresh "^0.4.0"
 
-metro-react-native-babel-preset@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.66.0.tgz#a4495df4b24a2eb9f82705e0a53f4cbbd36d983e"
-  integrity sha512-rO3yayxplLNxFDc7HyMShN+psgEb2mbw15EMreNvgV8QnXNYHmgU6e15tLbtEvC8LuftOLuSufEdSmR/ykm+aA==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-export-default-from" "^7.0.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.0.0"
-    "@babel/plugin-syntax-export-default-from" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.2.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-async-to-generator" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-for-of" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-object-assign" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
-    "@babel/plugin-transform-regenerator" "^7.0.0"
-    "@babel/plugin-transform-runtime" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-sticky-regex" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    "@babel/plugin-transform-typescript" "^7.5.0"
-    "@babel/plugin-transform-unicode-regex" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    react-refresh "^0.4.0"
-
 metro-react-native-babel-transformer@0.64.0, metro-react-native-babel-transformer@^0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.64.0.tgz"
@@ -11079,23 +10953,11 @@ metro-resolver@0.64.0, metro-resolver@^0.64.0:
   dependencies:
     absolute-path "^0.0.0"
 
-metro-resolver@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.66.0.tgz#068c1bb98cd80c239f051e7b0f43f00e763b889d"
-  integrity sha512-JUbkmznwgMSb5ViFpvau5sPD7uuZekToVsitrDLTAeMPruvjxjae2+XSIai9NmcGSprfvqyGYURlz0qXu1YnJQ==
-  dependencies:
-    absolute-path "^0.0.0"
-
 metro-runtime@0.64.0, metro-runtime@^0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.64.0.tgz"
   integrity sha512-m7XbWOaIOeFX7YcxUhmnOi6Pg8EaeL89xyZ+quZyZVF1aNoTr4w8FfbKxvijpjsytKHIZtd+43m2Wt5JrqyQmQ==
 
-metro-runtime@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.66.0.tgz#aff887fdcbcd202b18ae1c2a9d8572d0289fec00"
-  integrity sha512-oGkALjm248OGbPN0ivrI52gS6yEBnWH9Jr+rHZDSdldD/MZtpT77hBgwLj+fu0axkRgGF9xnBji0KZvozaDXKQ==
-
 metro-source-map@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.64.0.tgz"
@@ -11110,20 +10972,6 @@ metro-source-map@0.64.0:
     source-map "^0.5.6"
     vlq "^1.0.0"
 
-metro-source-map@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.66.0.tgz#3a61cd8d671842f54cb2863595d026bb1011ce7f"
-  integrity sha512-uutlmYb92uo/diHsbxk9RTi7e49PAfwMkw2RFPfDTUrjOr+DZICv1ltkQxs/dCgHaNm/nQ1T9hJpM/vuJavREA==
-  dependencies:
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    invariant "^2.2.4"
-    metro-symbolicate "0.66.0"
-    nullthrows "^1.1.1"
-    ob1 "0.66.0"
-    source-map "^0.5.6"
-    vlq "^1.0.0"
-
 metro-symbolicate@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.64.0.tgz"
@@ -11136,18 +10984,6 @@ metro-symbolicate@0.64.0:
     through2 "^2.0.1"
     vlq "^1.0.0"
 
-metro-symbolicate@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.66.0.tgz#cac5fd328bb63ae20f5c64b85d86a9c08097377a"
-  integrity sha512-OasmbRZQBJ36mYMF4T0ckXditMRrekKMG8qJezPxvizCpS3xILNTpkVyP6crCpDuMNdxbd9GcTwYKxM5YKOdLw==
-  dependencies:
-    invariant "^2.2.4"
-    metro-source-map "0.66.0"
-    nullthrows "^1.1.1"
-    source-map "^0.5.6"
-    through2 "^2.0.1"
-    vlq "^1.0.0"
-
 metro-transform-plugins@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.64.0.tgz"
@@ -11159,17 +10995,6 @@ metro-transform-plugins@0.64.0:
     "@babel/traverse" "^7.0.0"
     nullthrows "^1.1.1"
 
-metro-transform-plugins@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.66.0.tgz#d40cb1a88110b0033b5a870c497ce56a38ec5b1f"
-  integrity sha512-0jF27jozp4IYuzliM2R7NaXqbPXleiHQWVczECkHg3UjDroCKneCkkgeSeirVZ1TkBqu7KSLMiWdL2OOT+vVxQ==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/generator" "^7.5.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    nullthrows "^1.1.1"
-
 metro-transform-worker@0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.64.0.tgz"
@@ -11189,25 +11014,6 @@ metro-transform-worker@0.64.0:
     metro-transform-plugins "0.64.0"
     nullthrows "^1.1.1"
 
-metro-transform-worker@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.66.0.tgz#9a44545e3c1f91bb1cfca04d04c73920f61675d4"
-  integrity sha512-7M2ns0nI3f3vy6zrNE+gLMkWcvlMqSDnmuZShMjHHADbd1K/MmU1qkJEALnd7ns/Yzsoy81dwEPRy7fxq3cKTw==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/generator" "^7.5.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    babel-preset-fbjs "^3.3.0"
-    metro "0.66.0"
-    metro-babel-transformer "0.66.0"
-    metro-cache "0.66.0"
-    metro-cache-key "0.66.0"
-    metro-hermes-compiler "0.66.0"
-    metro-source-map "0.66.0"
-    metro-transform-plugins "0.66.0"
-    nullthrows "^1.1.1"
-
 metro@0.64.0, metro@^0.64.0:
   version "0.64.0"
   resolved "https://registry.npmjs.org/metro/-/metro-0.64.0.tgz"
@@ -11265,63 +11071,6 @@ metro@0.64.0, metro@^0.64.0:
     ws "^1.1.5"
     yargs "^15.3.1"
 
-metro@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/metro/-/metro-0.66.0.tgz#1218d55f4016edd5e47c3d50f6889f667aff2103"
-  integrity sha512-PZIV8IWZ0m3ceAIHGz/MmqrDlHJE6d5yur1VZldrQIVuzGCjNeCw/M+YT5ozo/fW0yI9pLpxA0E1vH1YtfEjWQ==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/core" "^7.0.0"
-    "@babel/generator" "^7.5.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    absolute-path "^0.0.0"
-    accepts "^1.3.7"
-    async "^2.4.0"
-    chalk "^4.0.0"
-    ci-info "^2.0.0"
-    connect "^3.6.5"
-    debug "^2.2.0"
-    denodeify "^1.2.1"
-    error-stack-parser "^2.0.6"
-    fs-extra "^1.0.0"
-    graceful-fs "^4.1.3"
-    image-size "^0.6.0"
-    invariant "^2.2.4"
-    jest-haste-map "^26.5.2"
-    jest-worker "^26.0.0"
-    lodash.throttle "^4.1.1"
-    metro-babel-register "0.66.0"
-    metro-babel-transformer "0.66.0"
-    metro-cache "0.66.0"
-    metro-cache-key "0.66.0"
-    metro-config "0.66.0"
-    metro-core "0.66.0"
-    metro-hermes-compiler "0.66.0"
-    metro-inspector-proxy "0.66.0"
-    metro-minify-uglify "0.66.0"
-    metro-react-native-babel-preset "0.66.0"
-    metro-resolver "0.66.0"
-    metro-runtime "0.66.0"
-    metro-source-map "0.66.0"
-    metro-symbolicate "0.66.0"
-    metro-transform-plugins "0.66.0"
-    metro-transform-worker "0.66.0"
-    mime-types "^2.1.27"
-    mkdirp "^0.5.1"
-    node-fetch "^2.2.0"
-    nullthrows "^1.1.1"
-    rimraf "^2.5.4"
-    serialize-error "^2.1.0"
-    source-map "^0.5.6"
-    strip-ansi "^6.0.0"
-    temp "0.8.3"
-    throat "^5.0.0"
-    ws "^1.1.5"
-    yargs "^15.3.1"
-
 microevent.ts@~0.1.1:
   version "0.1.1"
   resolved "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz"
@@ -11849,11 +11598,6 @@ ob1@0.64.0:
   resolved "https://registry.npmjs.org/ob1/-/ob1-0.64.0.tgz"
   integrity sha512-CO1N+5dhvy+MoAwxz8+fymEUcwsT4a+wHhrHFb02LppcJdHxgcBWviwEhUwKOD2kLMQ7ijrrzybOqpGcqEtvpQ==
 
-ob1@0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.66.0.tgz#e7d52b4c49ecae2e4831d127081131b7f050984b"
-  integrity sha512-7G2SpMAUKFTydtao80/5FD6uN5MTRXfVqly7NPbl7YpO0MBe3SNMLRQw0oDoefMjpt1f2pYfq/UG40Sdc59yqQ==
-
 object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"