Merge branch 'main' into ts-migration/statePicker-component

# Conflicts: # src/components/StatePicker/index.tsx
Expensify · Jan 9, 2024 · 6082d43 · 6082d43
2 parents 46af5a2 + 56d732b
commit 6082d43
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/components/StatePicker/index.tsx b/src/components/StatePicker/index.tsx
@@ -22,9 +22,12 @@ type StatePickerProps = {
 
     /** Label to display on field */
     label?: string;
+
+    /**  Callback to call when the picker modal is dismissed */
+    onBlur?: () => void;
 };
 
-function StatePicker({value, onInputChange, label, errorText = ''}: StatePickerProps, ref: ForwardedRef<View>) {
+function StatePicker({value, onInputChange, label, onBlur, errorText = ''}: StatePickerProps, ref: ForwardedRef<View>) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [isPickerVisible, setIsPickerVisible] = useState(false);
@@ -34,15 +37,20 @@ function StatePicker({value, onInputChange, label, errorText = ''}: StatePickerP
         setIsPickerVisible(true);
     };
 
-    const hidePickerModal = () => {
+    const hidePickerModal = (shouldBlur = true) => {
+        if (shouldBlur) {
+            onBlur?.();
+        }
         setIsPickerVisible(false);
     };
 
     const updateStateInput = (state: CountryData) => {
         if (state.value !== value) {
             onInputChange?.(state.value);
         }
-        hidePickerModal();
+        // If the user selects any state, call the hidePickerModal function with shouldBlur = false
+        // to prevent the onBlur function from being called.
+        hidePickerModal(false);
     };
 
     const title = value && Object.keys(COMMON_CONST.STATES).includes(value) ? translate(`allStates.${value}.stateName`) : '';

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
@@ -14,10 +14,7 @@ type UnitRate = {rate: number};
  * These are policies that we can use to create reports with in NewDot.
  */
 function getActivePolicies(policies: OnyxCollection<Policy>): Policy[] | undefined {
-    return Object.values(policies ?? {}).filter<Policy>(
-        (policy): policy is Policy =>
-            policy !== null && policy && (policy.isPolicyExpenseChatEnabled || policy.areChatRoomsEnabled) && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-    );
+    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => policy !== null && policy && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 }
 
 /**

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
@@ -62,9 +62,6 @@ type Policy = {
     /** The custom units data for this policy */
     customUnits?: Record<string, CustomUnit>;
 
-    /** Whether chat rooms can be created and used on this policy. Enabled manually by CQ/JS snippet. Always true for free policies. */
-    areChatRoomsEnabled: boolean;
-
     /** Whether policy expense chats can be created and used on this policy. Enabled manually by CQ/JS snippet. Always true for free policies. */
     isPolicyExpenseChatEnabled: boolean;
 

diff --git a/tests/utils/LHNTestUtils.js b/tests/utils/LHNTestUtils.js
@@ -252,7 +252,6 @@ function getFakePolicy(id = 1, name = 'Workspace-Test-001') {
         avatar: '',
         employeeList: [],
         isPolicyExpenseChatEnabled: true,
-        areChatRoomsEnabled: true,
         lastModified: 1697323926777105,
         autoReporting: true,
         autoReportingFrequency: 'immediate',

diff --git a/tests/utils/collections/policies.ts b/tests/utils/collections/policies.ts
@@ -7,7 +7,6 @@ export default function createRandomPolicy(index: number): Policy {
         id: index.toString(),
         name: randWord(),
         type: rand(Object.values(CONST.POLICY.TYPE)),
-        areChatRoomsEnabled: randBoolean(),
         autoReporting: randBoolean(),
         isPolicyExpenseChatEnabled: randBoolean(),
         autoReportingFrequency: rand(Object.values(CONST.POLICY.AUTO_REPORTING_FREQUENCIES)),