Jon/fix/search keyboard dismiss

CHANGELOG.md

@@ -12,6 +12,8 @@
 - changed: Optimize login performance.
 - changed: Update Monero LWS server name to "Edge LWS"
 - fixed: ramps: Various Infinite UI/UX issues
+- fixed: Search keyboard not dismissing when submitting search
+- fixed: Auto-correct not disabled for search input
 
 ## 4.41.1 (2025-12-29)
 

src/components/scenes/CoinRankingScene.tsx

@@ -310,8 +310,8 @@ const CoinRankingComponent: React.FC<Props> = props => {
           isSearching={isSearching}
           searchText={searchText}
           sceneWrapperInfo={sceneWrapperInfo}
-          onStartSearching={handleStartSearching}
-          onDoneSearching={handleDoneSearching}
+          onFocus={handleStartSearching}
+          onCancel={handleDoneSearching}
           onChangeText={handleChangeText}
           onLayoutHeight={handleFooterLayoutHeight}
         />

src/components/scenes/GiftCardMarketScene.tsx

@@ -430,8 +430,8 @@ export const GiftCardMarketScene: React.FC<Props> = props => {
           isSearching={isSearching}
           searchText={searchText}
           sceneWrapperInfo={sceneWrapperInfo}
-          onStartSearching={handleStartSearching}
-          onDoneSearching={handleDoneSearching}
+          onFocus={handleStartSearching}
+          onCancel={handleDoneSearching}
           onChangeText={handleChangeText}
           onLayoutHeight={handleFooterLayoutHeight}
         />

src/components/scenes/Staking/EarnScene.tsx

@@ -456,8 +456,8 @@ export const EarnScene = (props: Props) => {
           isSearching={isSearching}
           searchText={searchText}
           sceneWrapperInfo={sceneWrapperInfo}
-          onStartSearching={handleStartSearching}
-          onDoneSearching={handleDoneSearching}
+          onFocus={handleStartSearching}
+          onCancel={handleDoneSearching}
           onChangeText={handleChangeText}
           onLayoutHeight={handleFooterLayoutHeight}
         />

src/components/scenes/TransactionListScene.tsx

@@ -257,8 +257,8 @@ const TransactionListComponent: React.FC<Props> = props => {
           searchText={searchText}
           noBackground
           sceneWrapperInfo={sceneWrapperInfo}
-          onStartSearching={handleStartSearching}
-          onDoneSearching={handleDoneSearching}
+          onFocus={handleStartSearching}
+          onCancel={handleDoneSearching}
           onChangeText={handleChangeText}
           onLayoutHeight={handleFooterLayoutHeight}
         />

src/components/scenes/WalletDetailsScene.tsx

@@ -325,8 +325,8 @@ const WalletDetailsComponent: React.FC<Props> = (props: Props) => {
           searchText={searchText}
           noBackground
           sceneWrapperInfo={sceneWrapperInfo}
-          onStartSearching={handleStartSearching}
-          onDoneSearching={handleDoneSearching}
+          onFocus={handleStartSearching}
+          onCancel={handleDoneSearching}
           onChangeText={handleChangeText}
           onLayoutHeight={handleFooterLayoutHeight}
         />

src/components/scenes/WalletListScene.tsx

@@ -227,8 +227,8 @@ export const WalletListScene: React.FC<Props> = props => {
           searchText={searchText}
           noBackground
           sceneWrapperInfo={sceneWrapperInfo}
-          onStartSearching={handleStartSearching}
-          onDoneSearching={handleDoneSearching}
+          onFocus={handleStartSearching}
+          onCancel={handleDoneSearching}
           onChangeText={handleChangeText}
           onLayoutHeight={handleFooterLayoutHeight}
         />

src/components/themed/SearchFooter.tsx

@@ -1,10 +1,10 @@
 import React, { useEffect } from 'react'
+import { Keyboard } from 'react-native'
 
 import { useHandler } from '../../hooks/useHandler'
 import { useSceneFooterState } from '../../state/SceneFooterState'
 import type { SceneWrapperInfo } from '../common/SceneWrapper'
 import { SearchIconAnimated } from '../icons/ThemedIcons'
-import { Space } from '../layout/Space'
 import { SceneFooterWrapper } from './SceneFooterWrapper'
 import { SimpleTextInput, type SimpleTextInputRef } from './SimpleTextInput'
 
@@ -21,12 +21,12 @@ interface SearchFooterProps {
   sceneWrapperInfo?: SceneWrapperInfo
 
   onChangeText: (value: string) => void
-  onDoneSearching: () => void
+  onCancel: () => void
   onLayoutHeight: (height: number) => void
-  onStartSearching: () => void
+  onFocus: () => void
 }
 
-export const SearchFooter = (props: SearchFooterProps) => {
+export const SearchFooter: React.FC<SearchFooterProps> = props => {
   const {
     name,
     placeholder,
@@ -36,9 +36,9 @@ export const SearchFooter = (props: SearchFooterProps) => {
     sceneWrapperInfo,
 
     onChangeText,
-    onDoneSearching,
+    onCancel,
     onLayoutHeight,
-    onStartSearching
+    onFocus
   } = props
 
   const textInputRef = React.useRef<SimpleTextInputRef>(null)
@@ -51,33 +51,29 @@ export const SearchFooter = (props: SearchFooterProps) => {
   // Handlers
   //
 
-  const handleSearchChangeText = useHandler((text: string) => {
+  const handleChangeText = useHandler((text: string) => {
     onChangeText(text)
   })
 
-  const handleSearchDone = useHandler(() => {
-    onDoneSearching()
-  })
-
-  const handleSearchFocus = useHandler(() => {
-    onStartSearching()
-  })
-
   const handleFooterLayoutHeight = useHandler((height: number) => {
     setFooterHeight(height)
     onLayoutHeight(height)
   })
 
+  const handleSubmitEditing = useHandler(() => {
+    Keyboard.dismiss()
+  })
+
   //
   // Effects
   //
 
   useEffect(() => {
     if (setKeepOpen != null) setKeepOpen(isSearching)
-    if (isSearching && textInputRef.current) {
+    if (isSearching && textInputRef.current != null) {
       textInputRef.current.focus()
     }
-    if (!isSearching && textInputRef.current) {
+    if (!isSearching && textInputRef.current != null) {
       textInputRef.current.blur()
     }
   }, [isSearching, setKeepOpen])
@@ -93,20 +89,22 @@ export const SearchFooter = (props: SearchFooterProps) => {
       sceneWrapperInfo={sceneWrapperInfo}
       onLayoutHeight={handleFooterLayoutHeight}
     >
-      <Space expand horizontalRem={1} verticalRem={0.5}>
-        <SimpleTextInput
-          returnKeyType="search"
-          placeholder={placeholder}
-          onChangeText={handleSearchChangeText}
-          value={searchText}
-          active={isSearching}
-          onCancel={handleSearchDone}
-          onFocus={handleSearchFocus}
-          ref={textInputRef}
-          iconComponent={SearchIconAnimated}
-          scale={footerHeight == null ? undefined : footerOpenRatio}
-        />
-      </Space>
+      <SimpleTextInput
+        returnKeyType="search"
+        placeholder={placeholder}
+        onChangeText={handleChangeText}
+        value={searchText}
+        active={isSearching}
+        onCancel={onCancel}
+        onFocus={onFocus}
+        onSubmitEditing={handleSubmitEditing}
+        ref={textInputRef}
+        iconComponent={SearchIconAnimated}
+        scale={footerHeight == null ? undefined : footerOpenRatio}
+        horizontalRem={1}
+        verticalRem={0.5}
+        autoCorrect={false}
+      />
     </SceneFooterWrapper>
   )
 }