Fix hiding create/edit wallet modal

src/components/expanded-state/WalletProfileState.js

@@ -66,7 +66,7 @@ export default function WalletProfileState({
         navigate(Routes.CHANGE_WALLET_SHEET);
       }
     };
-    if (ios || actionType !== 'Create') {
+    if (actionType !== 'Create') {
       callback();
     } else {
       setCallbackAfterObtainingSeedsFromKeychainOrError(callback);

src/helpers/isKeyboardOpen.ts

@@ -1,8 +1,10 @@
-import { Keyboard } from 'react-native';
+import { RNKeyboard } from 'react-native-keyboard-area';
 let keyboardOpen = false;
 
-Keyboard.addListener('keyboardDidShow', () => (keyboardOpen = true));
-Keyboard.addListener('keyboardDidHide', () => (keyboardOpen = false));
+RNKeyboard.addKeyboardListener(height => {
+  keyboardOpen = height > 0;
+});
+
 export default function isKeyboardOpen() {
   return keyboardOpen;
 }

src/navigation/bottom-sheet/views/BottomSheetRoute.tsx

@@ -3,8 +3,9 @@ import BottomSheet, {
   BottomSheetBackdropProps,
 } from '@gorhom/bottom-sheet';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
-import { View } from 'react-native';
+import { Keyboard, View } from 'react-native';
 import type { ViewStyle } from 'react-native';
+import { isKeyboardOpen } from '../../../helpers';
 import {
   CONTAINER_HEIGHT,
   DEFAULT_BACKDROP_COLOR,
@@ -119,7 +120,14 @@ const BottomSheetRoute = ({
   //#region effects
   useEffect(() => {
     if (removing === true && ref.current) {
-      ref.current.close();
+      // close keyboard before closing the modal
+      if (isKeyboardOpen() && android) {
+        Keyboard.dismiss();
+
+        ref.current.close();
+      } else {
+        ref.current.close();
+      }
     }
   }, [removing]);
   //#endregion

src/navigation/onNavigationStateChange.js

@@ -130,7 +130,8 @@ export function onNavigationStateChange(currentState) {
       routeName === Routes.ENS_SEARCH_SHEET ||
       routeName === Routes.ENS_ASSIGN_RECORDS_SHEET ||
       (routeName === Routes.MODAL_SCREEN &&
-        Navigation.getActiveRoute().params?.type === 'contact_profile')
+        (Navigation.getActiveRoute().params?.type === 'contact_profile' ||
+          Navigation.getActiveRoute().params?.type === 'wallet_profile'))
     ) {
       AndroidKeyboardAdjust.setAdjustPan();
     } else {

src/screens/PinAuthenticationScreen.js

@@ -1,6 +1,7 @@
 import { useRoute } from '@react-navigation/core';
 import lang from 'i18n-js';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { Keyboard } from 'react-native';
 import RainbowLogo from '../assets/rainbows/light.png';
 import { Centered, Column, ColumnWithMargins } from '../components/layout';
 import { Numpad, PinValue } from '../components/numpad';
@@ -48,6 +49,10 @@ const PinAuthenticationScreen = () => {
 
   const finished = useRef(false);
 
+  useEffect(() => {
+    Keyboard.dismiss();
+  }, []);
+
   useEffect(() => {
     // See if the user previously tried and aborted
     // If that's the case, we need to update the default