From 8ebc212456c78099bbcd2887286c5db7497d87c2 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Tue, 15 Jul 2025 13:31:51 +0200
Subject: [PATCH 1/3] Change currency modal to reanimated

---
 src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
index f7c3ca4e2b5e..fcbfa902b396 100644
--- a/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
+++ b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
@@ -58,6 +58,7 @@ function PaymentCardCurrencyModal({isVisible, currencies, currentCurrency = CONS
             innerContainerStyle={styles.RHPNavigatorContainer(shouldUseNarrowLayout)}
             onBackdropPress={Navigation.dismissModal}
             useNativeDriver
+            shouldUseReanimatedModal
         >
             <ScreenWrapper
                 style={styles.pb0}

From a9df595239dbd641c3eeeca001efd6a421ae5cc4 Mon Sep 17 00:00:00 2001
From: Olgierd <olgierd.smyka@swmansion.com>
Date: Wed, 16 Jul 2025 12:58:40 +0200
Subject: [PATCH 2/3] Remove redundant lines

---
 src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
index fcbfa902b396..c118919f5b5c 100644
--- a/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
+++ b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
@@ -6,9 +6,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import useLocalize from '@hooks/useLocalize';
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 
 type PaymentCardCurrencyModalProps = {
@@ -29,7 +27,6 @@ type PaymentCardCurrencyModalProps = {
 };
 
 function PaymentCardCurrencyModal({isVisible, currencies, currentCurrency = CONST.PAYMENT_CARD_CURRENCY.USD, onCurrencyChange, onClose}: PaymentCardCurrencyModalProps) {
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {sections} = useMemo(
@@ -55,8 +52,6 @@ function PaymentCardCurrencyModal({isVisible, currencies, currentCurrency = CONS
             onClose={() => onClose?.()}
             onModalHide={onClose}
             hideModalContentWhileAnimating
-            innerContainerStyle={styles.RHPNavigatorContainer(shouldUseNarrowLayout)}
-            onBackdropPress={Navigation.dismissModal}
             useNativeDriver
             shouldUseReanimatedModal
         >

From 6ec97d9c004444619cf2be1187bc9e9b31c4b400 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Thu, 17 Jul 2025 14:25:19 +0200
Subject: [PATCH 3/3] Bring back onBackdropPress and remove unused props

---
 src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
index c118919f5b5c..d5cfd384de26 100644
--- a/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
+++ b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
@@ -7,6 +7,7 @@ import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 
 type PaymentCardCurrencyModalProps = {
@@ -51,8 +52,10 @@ function PaymentCardCurrencyModal({isVisible, currencies, currentCurrency = CONS
             isVisible={isVisible}
             onClose={() => onClose?.()}
             onModalHide={onClose}
-            hideModalContentWhileAnimating
-            useNativeDriver
+            onBackdropPress={() => {
+                onClose?.();
+                Navigation.dismissModal();
+            }}
             shouldUseReanimatedModal
         >
             <ScreenWrapper