fixup! Integrate new kav buttons to

Quote: I don't know if  is an awesome name. I would call it  or something like that.\nURL: #5837 (comment)

Author: Jon-edge

src/components/common/SceneWrapper.tsx

@@ -126,10 +126,11 @@ interface SceneWrapperProps {
   // True to make the scene scrolling (if avoidKeyboard is false):
   scroll?: boolean
 
-  // Optional KeyboardAccessoryView rendered as a sibling to the SceneWrapper content:
-  kavProps?: {
+  // Optional "dock" view rendered at the bottom of the scene, attached to the
+  // keyboard, tabs, footer, etc, whatever is highest:
+  dockProps?: {
     children: React.ReactNode
-    alwaysVisible?: boolean
+    keyboardVisibleOnly?: boolean
     contentContainerStyle?: ViewStyle
   }
 }
@@ -162,7 +163,7 @@ function SceneWrapperComponent(props: SceneWrapperProps): React.ReactElement {
     padding = 0,
     renderFooter,
     scroll = false,
-    kavProps
+    dockProps: kavProps
   } = props
 
   const notificationHeight = useSelector(state => state.ui.notificationHeight)
@@ -179,42 +180,23 @@ function SceneWrapperComponent(props: SceneWrapperProps): React.ReactElement {
     }
   })
 
-  // Local keyboard visible state for KAV parity (iOS willShow vs Android didShow):
+  // Local keyboard visibility and opening/closing state for dock parity:
   const [isKeyboardVisibleFull, setKeyboardVisibleKav] = useState(false)
-  useEffect(() => {
-    const keyboardDidShowListener = Keyboard.addListener(
-      isIos ? 'keyboardWillShow' : 'keyboardDidShow',
-      () => {
-        setKeyboardVisibleKav(true)
-      }
-    )
-    const keyboardDidHideListener = Keyboard.addListener(
-      isIos ? 'keyboardWillHide' : 'keyboardDidHide',
-      () => {
-        setKeyboardVisibleKav(false)
-      }
-    )
-    return () => {
-      keyboardDidShowListener.remove()
-      keyboardDidHideListener.remove()
-    }
-  }, [isIos])
-
   // Track closing/opening state explicitly for animation direction:
   const isClosingSv = useSharedValue(false)
   useEffect(() => {
-    const showListener = Keyboard.addListener(
-      isIos ? 'keyboardWillShow' : 'keyboardDidShow',
-      () => {
-        isClosingSv.value = false
-      }
-    )
-    const hideListener = Keyboard.addListener(
-      isIos ? 'keyboardWillHide' : 'keyboardDidHide',
-      () => {
-        isClosingSv.value = true
-      }
-    )
+    const showEvent = isIos ? 'keyboardWillShow' : 'keyboardDidShow'
+    const hideEvent = isIos ? 'keyboardWillHide' : 'keyboardDidHide'
+    const onShow = (): void => {
+      setKeyboardVisibleKav(true)
+      isClosingSv.value = false
+    }
+    const onHide = (): void => {
+      setKeyboardVisibleKav(false)
+      isClosingSv.value = true
+    }
+    const showListener = Keyboard.addListener(showEvent, onShow)
+    const hideListener = Keyboard.addListener(hideEvent, onHide)
     return () => {
       showListener.remove()
       hideListener.remove()
@@ -342,7 +324,7 @@ function SceneWrapperComponent(props: SceneWrapperProps): React.ReactElement {
   }, [children, sceneWrapperInfo])
 
   // Build Keyboard Accessory View element
-  const alwaysVisibleKav = kavProps?.alwaysVisible === true
+  const keyboardVisibleOnlyKav = kavProps?.keyboardVisibleOnly ?? true
   const kavBaseStyle = useMemo(
     () => ({
       position: 'absolute' as const,
@@ -380,7 +362,7 @@ function SceneWrapperComponent(props: SceneWrapperProps): React.ReactElement {
     return { bottom }
   })
   const shouldShowKav =
-    kavProps != null && (alwaysVisibleKav || isKeyboardVisibleFull)
+    kavProps != null && (!keyboardVisibleOnlyKav || isKeyboardVisibleFull)
   const kavElement = !shouldShowKav ? null : (
     <Reanimated.View
       style={[kavBaseStyle, kavAnimatedStyle, kavProps?.contentContainerStyle]}

src/components/scenes/RampCreateScene.tsx

@@ -776,8 +776,8 @@ export const RampCreateScene: React.FC<Props> = (props: Props) => {
     <SceneWrapper
       scroll
       hasTabs
-      kavProps={{
-        alwaysVisible: true,
+      dockProps={{
+        keyboardVisibleOnly: false,
         children: (
           <KavButtons
             primary={{

src/components/scenes/RampKycFormScene.tsx

@@ -193,8 +193,8 @@ export const RampKycFormScene = React.memo((props: Props) => {
       scroll
       hasTabs
       avoidKeyboard
-      kavProps={{
-        alwaysVisible: true,
+      dockProps={{
+        keyboardVisibleOnly: false,
         children: (
           <KavButtons
             primary={{

src/components/scenes/SwapCreateScene.tsx

@@ -517,8 +517,8 @@ export const SwapCreateScene: React.FC<Props> = props => {
       hasNotifications
       scroll
       keyboardShouldPersistTaps="handled"
-      kavProps={{
-        alwaysVisible: false,
+      dockProps={{
+        keyboardVisibleOnly: true,
         children: (
           <KavButtons
             primary={{

src/plugins/gui/scenes/FiatPluginEnterAmountScene.tsx

@@ -241,8 +241,8 @@ export const FiatPluginEnterAmountScene = React.memo((props: Props) => {
       keyboardShouldPersistTaps="handled"
       hasNotifications
       hasTabs
-      kavProps={{
-        alwaysVisible: true,
+      dockProps={{
+        keyboardVisibleOnly: false,
         children: (
           <KavButtons
             primary={{