Merge pull request #56792 from FitseTLT/fix-previous-category-and-key…

…board-briefly-shown-bug Fix - Android - Categories - Previously selected category and keypad is shown briefly
Expensify · Feb 16, 2025 · ee29bcc · ee29bcc
2 parents d68deae + dfe9c4a
commit ee29bcc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -1,5 +1,5 @@
 import React, {useMemo, useState} from 'react';
-import {View} from 'react-native';
+import {InteractionManager, Keyboard, View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import CategorySelectorModal from '@components/CategorySelector/CategorySelectorModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -82,7 +82,11 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
         if (categoryID !== selectedCategory.keyForList) {
             setWorkspaceDefaultSpendCategory(policyID, groupID, selectedCategory.keyForList);
         }
-        setIsSelectorModalVisible(false);
+
+        Keyboard.dismiss();
+        InteractionManager.runAfterInteractions(() => {
+            setIsSelectorModalVisible(false);
+        });
     };
 
     return (