From c5aba7a8b24d8e1c26908576722c792781219c9f Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Mon, 14 Jul 2025 11:34:13 +0200
Subject: [PATCH 1/2] Migrate TimeModalPicker, PushRowModal,
 ValueSelectorModal, NetSuiteCustomListSelectorModal

---
 src/components/PushRowWithModal/PushRowModal.tsx                 | 1 +
 src/components/TimeModalPicker.tsx                               | 1 +
 src/components/ValuePicker/ValueSelectorModal.tsx                | 1 +
 .../NetSuiteCustomListSelectorModal.tsx                          | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/components/PushRowWithModal/PushRowModal.tsx b/src/components/PushRowWithModal/PushRowModal.tsx
index 47182462beb2d..43191e6f1fe31 100644
--- a/src/components/PushRowWithModal/PushRowModal.tsx
+++ b/src/components/PushRowWithModal/PushRowModal.tsx
@@ -78,6 +78,7 @@ function PushRowModal({isVisible, selectedOption, onOptionChange, onClose, optio
             onModalHide={handleClose}
             shouldUseCustomBackdrop
             useNativeDriver
+            shouldUseReanimatedModal
         >
             <ScreenWrapper
                 includePaddingTop={false}
diff --git a/src/components/TimeModalPicker.tsx b/src/components/TimeModalPicker.tsx
index 2f7ac982f8b9a..f0905451b2975 100644
--- a/src/components/TimeModalPicker.tsx
+++ b/src/components/TimeModalPicker.tsx
@@ -58,6 +58,7 @@ function TimeModalPicker({value, errorText, label, onInputChange = () => {}}: Ti
                 hideModalContentWhileAnimating
                 useNativeDriver
                 enableEdgeToEdgeBottomSafeAreaPadding
+                shouldUseReanimatedModal
             >
                 <ScreenWrapper
                     style={styles.pb0}
diff --git a/src/components/ValuePicker/ValueSelectorModal.tsx b/src/components/ValuePicker/ValueSelectorModal.tsx
index 9e08ce7e4b347..c15b27223a307 100644
--- a/src/components/ValuePicker/ValueSelectorModal.tsx
+++ b/src/components/ValuePicker/ValueSelectorModal.tsx
@@ -28,6 +28,7 @@ function ValueSelectorModal({
             onBackdropPress={onBackdropPress}
             shouldHandleNavigationBack
             enableEdgeToEdgeBottomSafeAreaPadding
+            shouldUseReanimatedModal
         >
             <ScreenWrapper
                 includePaddingTop={false}
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
index 251576dd17a82..7a246ff819f94 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
@@ -74,6 +74,7 @@ function NetSuiteCustomListSelectorModal({isVisible, currentCustomListValue, onC
             useNativeDriver
             onBackdropPress={onBackdropPress}
             enableEdgeToEdgeBottomSafeAreaPadding
+            shouldUseReanimatedModal
         >
             <ScreenWrapper
                 includePaddingTop={false}

From cd740b6d2e17f693ebc7c7192d7803478e81f334 Mon Sep 17 00:00:00 2001
From: mhawryluk <marcinhawrylukxx@gmail.com>
Date: Thu, 17 Jul 2025 15:50:08 +0200
Subject: [PATCH 2/2] Remove some unnecessary props + fix unrelated type error

---
 src/components/PushRowWithModal/PushRowModal.tsx                | 1 -
 src/components/TimeModalPicker.tsx                              | 2 --
 src/components/ValuePicker/ValueSelectorModal.tsx               | 2 --
 src/libs/TransactionUtils/index.ts                              | 2 +-
 .../NetSuiteCustomListSelectorModal.tsx                         | 2 --
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/PushRowWithModal/PushRowModal.tsx b/src/components/PushRowWithModal/PushRowModal.tsx
index 43191e6f1fe31..b2a42535ff987 100644
--- a/src/components/PushRowWithModal/PushRowModal.tsx
+++ b/src/components/PushRowWithModal/PushRowModal.tsx
@@ -77,7 +77,6 @@ function PushRowModal({isVisible, selectedOption, onOptionChange, onClose, optio
             type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
             onModalHide={handleClose}
             shouldUseCustomBackdrop
-            useNativeDriver
             shouldUseReanimatedModal
         >
             <ScreenWrapper
diff --git a/src/components/TimeModalPicker.tsx b/src/components/TimeModalPicker.tsx
index f0905451b2975..43c88da755ef1 100644
--- a/src/components/TimeModalPicker.tsx
+++ b/src/components/TimeModalPicker.tsx
@@ -55,8 +55,6 @@ function TimeModalPicker({value, errorText, label, onInputChange = () => {}}: Ti
                 isVisible={isPickerVisible}
                 onClose={hidePickerModal}
                 onModalHide={hidePickerModal}
-                hideModalContentWhileAnimating
-                useNativeDriver
                 enableEdgeToEdgeBottomSafeAreaPadding
                 shouldUseReanimatedModal
             >
diff --git a/src/components/ValuePicker/ValueSelectorModal.tsx b/src/components/ValuePicker/ValueSelectorModal.tsx
index c15b27223a307..b4519e84d4859 100644
--- a/src/components/ValuePicker/ValueSelectorModal.tsx
+++ b/src/components/ValuePicker/ValueSelectorModal.tsx
@@ -23,8 +23,6 @@ function ValueSelectorModal({
             isVisible={isVisible}
             onClose={() => onClose?.()}
             onModalHide={onClose}
-            hideModalContentWhileAnimating
-            useNativeDriver
             onBackdropPress={onBackdropPress}
             shouldHandleNavigationBack
             enableEdgeToEdgeBottomSafeAreaPadding
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index c665840d2f92c..5477f6840a556 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -998,7 +998,7 @@ function shouldShowBrokenConnectionViolationForMultipleTransactions(
  * Check if the user should see the violation
  */
 function shouldShowViolation(iouReport: OnyxEntry<Report>, policy: OnyxEntry<Policy>, violationName: ViolationName): boolean {
-    const isSubmitter = isCurrentUserSubmitter(iouReport?.reportID);
+    const isSubmitter = isCurrentUserSubmitter(iouReport);
     const isPolicyMember = isPolicyMemberPolicyUtils(currentUserEmail, policy?.id);
     const isReportOpen = isOpenExpenseReport(iouReport);
 
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
index 7a246ff819f94..b156d80a4cff6 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
@@ -70,8 +70,6 @@ function NetSuiteCustomListSelectorModal({isVisible, currentCustomListValue, onC
             isVisible={isVisible}
             onClose={onClose}
             onModalHide={onClose}
-            hideModalContentWhileAnimating
-            useNativeDriver
             onBackdropPress={onBackdropPress}
             enableEdgeToEdgeBottomSafeAreaPadding
             shouldUseReanimatedModal