Merge branch 'main' into feat/use-reanimated-modal-in-help-modal

mhawryluk · mhawryluk · commit 7d2ec506bbcf · 2025-07-17T17:04:58.000+02:00
diff --git a/src/components/CategorySelector/CategorySelectorModal.tsx b/src/components/CategorySelector/CategorySelectorModal.tsx
@@ -39,6 +39,7 @@ function CategorySelectorModal({policyID, isVisible, currentCategory, onCategory
             hideModalContentWhileAnimating
             useNativeDriver
             enableEdgeToEdgeBottomSafeAreaPadding
+            shouldUseReanimatedModal
         >
             <ScreenWrapper
                 style={[styles.pb0]}
diff --git a/src/components/Modal/ReanimatedModal/utils.ts b/src/components/Modal/ReanimatedModal/utils.ts
@@ -84,4 +84,4 @@ function getModalOutAnimation(animationType: AnimationOutType): ValidKeyframePro
     }
 }
 
-export {getModalInAnimation, getModalInAnimationStyle, getModalOutAnimation, easing};
+export {getModalInAnimation, getModalOutAnimation, getModalInAnimationStyle, easing};
diff --git a/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx b/src/pages/workspace/WorkspaceMemberRoleSelectionModal.tsx
@@ -45,6 +45,7 @@ function WorkspaceMemberDetailsRoleSelectionModal({isVisible, items, onRoleChang
             hideModalContentWhileAnimating
             useNativeDriver
             enableEdgeToEdgeBottomSafeAreaPadding
+            shouldUseReanimatedModal
         >
             <ScreenWrapper
                 testID={WorkspaceMemberDetailsRoleSelectionModal.displayName}
diff --git a/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx b/src/pages/workspace/categories/ExpenseLimitTypeSelector/ExpenseLimitTypeSelectorModal.tsx
@@ -47,6 +47,7 @@ function ExpenseLimitTypeSelectorModal({isVisible, currentExpenseLimitType, onEx
             hideModalContentWhileAnimating
             useNativeDriver
             enableEdgeToEdgeBottomSafeAreaPadding
+            shouldUseReanimatedModal
         >
             <ScreenWrapper
                 style={[styles.pb0]}
diff --git a/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx b/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
@@ -36,6 +36,7 @@ function UnitSelectorModal({isVisible, currentUnit, onUnitSelected, onClose, lab
             onModalHide={onClose}
             hideModalContentWhileAnimating
             useNativeDriver
+            shouldUseReanimatedModal
         >
             <ScreenWrapper
                 style={[styles.pb0]}

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ function CategorySelectorModal({policyID, isVisible, currentCategory, onCategory`
`39`	`39`	`hideModalContentWhileAnimating`
`40`	`40`	`useNativeDriver`
`41`	`41`	`enableEdgeToEdgeBottomSafeAreaPadding`
	`42`	`+ shouldUseReanimatedModal`
`42`	`43`	`>`
`43`	`44`	`<ScreenWrapper`
`44`	`45`	`style={[styles.pb0]}`
Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,4 @@ function getModalOutAnimation(animationType: AnimationOutType): ValidKeyframePro`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`-export {getModalInAnimation, getModalInAnimationStyle, getModalOutAnimation, easing};`
	`87`	`+export {getModalInAnimation, getModalOutAnimation, getModalInAnimationStyle, easing};`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ function WorkspaceMemberDetailsRoleSelectionModal({isVisible, items, onRoleChang`
`45`	`45`	`hideModalContentWhileAnimating`
`46`	`46`	`useNativeDriver`
`47`	`47`	`enableEdgeToEdgeBottomSafeAreaPadding`
	`48`	`+ shouldUseReanimatedModal`
`48`	`49`	`>`
`49`	`50`	`<ScreenWrapper`
`50`	`51`	`testID={WorkspaceMemberDetailsRoleSelectionModal.displayName}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ function ExpenseLimitTypeSelectorModal({isVisible, currentExpenseLimitType, onEx`
`47`	`47`	`hideModalContentWhileAnimating`
`48`	`48`	`useNativeDriver`
`49`	`49`	`enableEdgeToEdgeBottomSafeAreaPadding`
	`50`	`+ shouldUseReanimatedModal`
`50`	`51`	`>`
`51`	`52`	`<ScreenWrapper`
`52`	`53`	`style={[styles.pb0]}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ function UnitSelectorModal({isVisible, currentUnit, onUnitSelected, onClose, lab`
`36`	`36`	`onModalHide={onClose}`
`37`	`37`	`hideModalContentWhileAnimating`
`38`	`38`	`useNativeDriver`
	`39`	`+ shouldUseReanimatedModal`
`39`	`40`	`>`
`40`	`41`	`<ScreenWrapper`
`41`	`42`	`style={[styles.pb0]}`