Merge pull request Expensify#55047 from truph01/fix/54157

fix: Android - Create Chat - "You appear to be offline" is displayed floating on room creation
bernhardoj · Jan 17, 2025 · 57f544f · 57f544f
2 parents 894fbd0 + e3abe65
commit 57f544f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/components/ValuePicker/ValueSelectorModal.tsx b/src/components/ValuePicker/ValueSelectorModal.tsx
@@ -8,7 +8,17 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import type {ValueSelectorModalProps} from './types';
 
-function ValueSelectorModal({items = [], selectedItem, label = '', isVisible, onClose, onItemSelected, shouldShowTooltips = true, onBackdropPress}: ValueSelectorModalProps) {
+function ValueSelectorModal({
+    items = [],
+    selectedItem,
+    label = '',
+    isVisible,
+    onClose,
+    onItemSelected,
+    shouldShowTooltips = true,
+    onBackdropPress,
+    shouldEnableKeyboardAvoidingView = true,
+}: ValueSelectorModalProps) {
     const styles = useThemeStyles();
 
     const sections = useMemo(
@@ -31,6 +41,7 @@ function ValueSelectorModal({items = [], selectedItem, label = '', isVisible, on
                 includePaddingTop={false}
                 includeSafeAreaPaddingBottom
                 testID={ValueSelectorModal.displayName}
+                shouldEnableKeyboardAvoidingView={shouldEnableKeyboardAvoidingView}
             >
                 <HeaderWithBackButton
                     title={label}

diff --git a/src/components/ValuePicker/index.tsx b/src/components/ValuePicker/index.tsx
@@ -6,7 +6,6 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
-import KeyboardUtils from '@src/utils/keyboard';
 import type {ValuePickerItem, ValuePickerProps} from './types';
 import ValueSelectorModal from './ValueSelectorModal';
 
@@ -15,9 +14,7 @@ function ValuePicker({value, label, items, placeholder = '', errorText = '', onI
     const [isPickerVisible, setIsPickerVisible] = useState(false);
 
     const showPickerModal = () => {
-        KeyboardUtils.dismiss().then(() => {
-            setIsPickerVisible(true);
-        });
+        setIsPickerVisible(true);
     };
 
     const hidePickerModal = () => {
@@ -57,6 +54,7 @@ function ValuePicker({value, label, items, placeholder = '', errorText = '', onI
                 onItemSelected={updateInput}
                 shouldShowTooltips={shouldShowTooltips}
                 onBackdropPress={Navigation.dismissModal}
+                shouldEnableKeyboardAvoidingView={false}
             />
         </View>
     );

diff --git a/src/components/ValuePicker/types.ts b/src/components/ValuePicker/types.ts
@@ -34,6 +34,9 @@ type ValueSelectorModalProps = {
 
     /** Whether to show the tooltip text */
     shouldShowTooltips?: boolean;
+
+    /** Flag to indicate if the keyboard avoiding view should be enabled */
+    shouldEnableKeyboardAvoidingView?: boolean;
 };
 
 type ValuePickerProps = {